change esp and nano averaging

SK21 · Aug 10, 2024 · a426cd4 · a426cd4
1 parent c39d076
commit a426cd4
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 15 deletions.
diff --git a/Modules/ESP32 Rate/RC_ESP32/RC_ESP32.ino b/Modules/ESP32 Rate/RC_ESP32/RC_ESP32.ino
@@ -29,8 +29,8 @@
 #include <EthernetUdp.h>
 
 // rate control with ESP32	board: DOIT ESP32 DEVKIT V1
-# define InoDescription "RC_ESP32 :  01-Jul-2024"
-const uint16_t InoID = 1074;	// change to send defaults to eeprom, ddmmy, no leading 0
+# define InoDescription "RC_ESP32 :  10-Aug-2024"
+const uint16_t InoID = 10084;	// change to send defaults to eeprom, ddmmy, no leading 0
 const uint8_t InoType = 4;		// 0 - Teensy AutoSteer, 1 - Teensy Rate, 2 - Nano Rate, 3 - Nano SwitchBox, 4 - ESP Rate
 const uint8_t Processor = 0;	// 0 - ESP32-Wroom-32U
 

diff --git a/Modules/ESP32 Rate/RC_ESP32/RC_ESP32.vcxproj b/Modules/ESP32 Rate/RC_ESP32/RC_ESP32.vcxproj
diff --git a/Modules/ESP32 Rate/RC_ESP32/Rate.ino b/Modules/ESP32 Rate/RC_ESP32/Rate.ino
@@ -1,5 +1,9 @@
+
+const uint16_t Debounce = 500;	// micros
+const uint16_t avgPulses = 24;
+
 volatile unsigned long Duration[MaxProductCount];
-volatile unsigned long Durations[2][12];
+volatile unsigned long Durations[2][avgPulses];
 volatile int FilledCount[2];
 volatile unsigned long PulseCount[MaxProductCount];
 
@@ -15,9 +19,6 @@ double Omin[MaxProductCount];
 double Oave[MaxProductCount];
 byte Ocount[MaxProductCount];
 
-const uint16_t Debounce = 500;	// micros
-const uint16_t avgPulses = 12;
-
 void IRAM_ATTR ISR0()
 {
 	static unsigned long PulseTime;

diff --git a/Modules/Nano/RCnano/RCnano.ino b/Modules/Nano/RCnano/RCnano.ino
@@ -15,8 +15,8 @@
 #include "PCA95x5_RC.h"		// modified from https://github.com/hideakitai/PCA95x5
 
 // rate control with nano
-# define InoDescription "RCnano :  01-Jul-2024"
-const uint16_t InoID = 1074;	// change to send defaults to eeprom, ddmmy, no leading 0
+# define InoDescription "RCnano :  10-Aug-2024"
+const uint16_t InoID = 10084;	// change to send defaults to eeprom, ddmmy, no leading 0
 const uint8_t InoType = 2;		// 0 - Teensy AutoSteer, 1 - Teensy Rate, 2 - Nano Rate, 3 - Nano SwitchBox, 4 - ESP Rate
 
 #define MaxProductCount 2

diff --git a/Modules/Nano/RCnano/RCnano.vcxproj b/Modules/Nano/RCnano/RCnano.vcxproj
diff --git a/Modules/Nano/RCnano/Rate.ino b/Modules/Nano/RCnano/Rate.ino
@@ -1,5 +1,9 @@
+
+const uint16_t Debounce = 500;	// micros
+const uint16_t avgPulses = 24;
+
 volatile unsigned long Duration[MaxProductCount];
-volatile unsigned long Durations[2][12];
+volatile unsigned long Durations[2][avgPulses];
 volatile int FilledCount[2];
 volatile unsigned long PulseCount[MaxProductCount];
 
@@ -15,9 +19,6 @@ double Omin[MaxProductCount];
 double Oave[MaxProductCount];
 byte Ocount[MaxProductCount];
 
-const uint16_t Debounce = 500;	// micros
-const uint16_t avgPulses = 12;
-
 void ISR0()
 {
 	static unsigned long PulseTime;

diff --git a/Modules/Nano/RCnano/__vm/Compile.vmps.xml b/Modules/Nano/RCnano/__vm/Compile.vmps.xml