From 21f7ee25fed4163b46f0cfd30ddc90b16c9d8a50 Mon Sep 17 00:00:00 2001 From: Vsevolod Merenkov Date: Tue, 14 Apr 2020 22:22:39 +0300 Subject: [PATCH] Added VCC switch to I2C --- firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_i2c.cpp | 2 ++ .../AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_i2c_config.h | 3 ++- firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_serial.h | 3 ++- firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/src/i2c.h | 1 + firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/src/pP_serial.h | 4 ++++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_i2c.cpp b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_i2c.cpp index 26758a3..7edbb5a 100644 --- a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_i2c.cpp +++ b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_i2c.cpp @@ -120,6 +120,8 @@ void i2cInput(int bytesReceived) { break; case CMD_STATE: break; + case CMD_VCCSW: + updateVccSwitch(value); default: return; } diff --git a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_i2c_config.h b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_i2c_config.h index 62b4f09..cd286e5 100644 --- a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_i2c_config.h +++ b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_i2c_config.h @@ -9,4 +9,5 @@ #define CMD_CONST 0x08 #define CMD_CONFIG 0x09 #define CMD_ERASE 0x0a -#define CMD_STATE 0x0b \ No newline at end of file +#define CMD_STATE 0x0b +#define CMD_VCCSW 0x0c \ No newline at end of file diff --git a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_serial.h b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_serial.h index 37504a7..60b94f8 100644 --- a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_serial.h +++ b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_serial.h @@ -168,7 +168,8 @@ void updateParams() { Serial.println(" (0 for active low, 1 for active high)"); Serial.println("To enable piezo plugged detection: PZDET [0|1]"); Serial.println(" (0 for disabled, 1 for enabled)"); - Serial.println("To change the main voltage of the circuit: VCCSW [0|1]") Serial.println(" (0 for 3.3v, 1 for 5v)"); + Serial.println("To change the main voltage of the circuit: VCCSW [0|1]"); + Serial.println(" (0 for 3.3v, 1 for 5v)"); Serial.println("To change ADC hysteresis value: HYST [integer in millivolts]"); Serial.println("To enable or disable debug output: DEBUG [0|1]"); Serial.println("To print current config: CONFIG"); diff --git a/firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/src/i2c.h b/firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/src/i2c.h index 13ab362..b976fd9 100644 --- a/firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/src/i2c.h +++ b/firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/src/i2c.h @@ -15,6 +15,7 @@ #define CMD_CONFIG 0x09 #define CMD_ERASE 0x0a #define CMD_STATE 0x0b +#define CMD_VCCSW 0x0c #include "WString.h" diff --git a/firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/src/pP_serial.h b/firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/src/pP_serial.h index 24f118f..4604178 100644 --- a/firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/src/pP_serial.h +++ b/firmware/AVR-Source/Pyr0_Piezo_i2c_Bridge/src/pP_serial.h @@ -141,6 +141,8 @@ void updateParams() { write(CMD_LOGIC, (uint16_t)serialLong); } else if (strcmp(serialMessageIn, "PZDET") == 0) { write(CMD_PZDET, (uint16_t)serialLong); + } else if (strcmp(serialMessageIn, "VCCSW") == 0) { + write(CMD_VCCSW, (uint16_t)serialLong); } else if (strcmp(serialMessageIn, "CONST") == 0) { write(CMD_CONST, serialLong); } else if (strcmp(serialMessageIn, "CONFIG") == 0) { @@ -161,6 +163,8 @@ void updateParams() { Serial.println(" (0 for active low, 1 for active high)"); Serial.println("To enable piezo plugged detection: PZDET [0|1]"); Serial.println(" (0 for disabled, 1 for enabled)"); + Serial.println("To change the main voltage of the circuit: VCCSW [0|1]"); + Serial.println(" (0 for 3.3v, 1 for 5v)"); Serial.println("To change ADC hysteresis value: HYST [integer in millivolts]"); Serial.println("To enable or disable debug output: DEBUG [0|1]"); Serial.println("To print current config: CONFIG");