fixed current sensing formula + correct adc address

JPGC04 · JPGC04 · commit 8c2c1c67c68a · 2024-12-16T19:24:37.000-05:00
diff --git a/pio_workspace/lib/power_custom/adc_sensors.cpp b/pio_workspace/lib/power_custom/adc_sensors.cpp
@@ -87,5 +87,5 @@ float ADCSensors::convertVoltage(float adcVoltage) {
 }
 
 float ADCSensors::convertCurrent(float adcCurrent) {
-  return ((adcCurrent / 1024.0) * 3.3) / (0.005 * 50);
+  return (((adcCurrent * 2 ) / 50 ) / 0.005);
 }
diff --git a/pio_workspace/lib/power_custom/adc_sensors.h b/pio_workspace/lib/power_custom/adc_sensors.h
@@ -5,9 +5,9 @@
 #include "Wire.h"
 #include "Adafruit_ADS1X15.h"
 
-#define ADC_VOLTAGE_ADDR  0x48
-#define ADC_CURRENT1_ADDR 0x49
-#define ADC_CURRENT2_ADDR 0x4B
+#define ADC_VOLTAGE_ADDR  0x4B
+#define ADC_CURRENT1_ADDR 0x48
+#define ADC_CURRENT2_ADDR 0x49
 
 class ADCSensors {
   public:

Original file line number	Diff line number	Diff line change
`@@ -87,5 +87,5 @@ float ADCSensors::convertVoltage(float adcVoltage) {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`float ADCSensors::convertCurrent(float adcCurrent) {`
`90`		`- return ((adcCurrent / 1024.0) * 3.3) / (0.005 * 50);`
	`90`	`+ return (((adcCurrent * 2 ) / 50 ) / 0.005);`
`91`	`91`	`}`