synced nomenclature for vfollower variables #bugfix

pyr0ball · Sep 25, 2019 · 9f172f1 · 9f172f1
1 parent 6d471fd
commit 9f172f1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/Pyr0_Piezo_Sensor_v2.x.x.ino b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/Pyr0_Piezo_Sensor_v2.x.x.ino
@@ -130,7 +130,7 @@ void loop() {
     // Check voltage of first and second stages and compare against thresholds
     adjustVin();
     VComp = analogRead(VCOMP_SENSE_PIN);
-    VAdj = analogRead(V_FOLLOW_PIN);
+    VFol = analogRead(V_FOLLOW_PIN);
 
     // Voltage Follower adjustment
     if (VLast > Hyst || VLast < -Hyst) {

diff --git a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/pP_function.h b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/pP_function.h
@@ -57,7 +57,7 @@ update the voltMeterConstant variable in pP_config.h with the correct value*/
 
 /*------------------------------------------------*/
 
- void adjustVin() {
+ void readVin() {
    VOld = Vin;
 	 Vin = readVcc(), DEC;
    senseLong = senseThrs * 1024L;

diff --git a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/pP_i2c.cpp b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/pP_i2c.cpp
@@ -31,7 +31,7 @@ void pP_i2c::i2cInput(int bytesReceived) {
   }
   switch (cmdRcvd[0]) {
     case 0x00:
-      senseInt = (long) cmdRcvd[1];
+      followerInt = (long) cmdRcvd[1];
       return;
       break;
     case 0x01:

diff --git a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/pP_volatile.h b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/pP_volatile.h
@@ -17,8 +17,6 @@ long compInt;
 
 // Voltage Comparator Adjustment parameters
 int VComp = 0;
-int diffCompL = VComp - compInt;
-int diffCompH = compInt - VComp;
 
 // Voltage Follower Adjustment parameters
 int VAdj = 0;