From 6976b3908d76636679a2723dab972102adaba23f Mon Sep 17 00:00:00 2001 From: Vsevolod Merenkov Date: Mon, 30 Sep 2019 03:02:14 +0300 Subject: [PATCH] Removed old debug output define and sensor trigger debug output, modified VComp and VFol output to mV instead of 10-bit number #changelog --- .../AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_function.h | 3 --- firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_serial.h | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_function.h b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_function.h index a1ef24d..2c0979c 100644 --- a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_function.h +++ b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_function.h @@ -17,9 +17,6 @@ void digitalWriteFast(uint8_t pin, uint8_t x) { void pulse() { digitalWriteFast(TRG_OUT, LOW); sensorHReading = 1; - #ifdef DEBUG - Serial.println("Trig!"); - #endif delay(TRG_DUR); digitalWriteFast(TRG_OUT, HIGH); } 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 88c0b39..5bff6c2 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 @@ -193,11 +193,11 @@ void serialPrintState() Serial.print(","); Serial.print("\"VComp\":"); - Serial.print(VComp); + Serial.print((long) VComp * Vin / 1023); Serial.print(","); Serial.print("\"VFol\":"); - Serial.print(VFol); + Serial.print((long) VFol * Vin / 1023); Serial.print(","); Serial.print("\"Err\":");