|
@@ -53,7 +53,7 @@ void loop() {
|
|
|
|
|
|
//Convert them to actual voltage / current value
|
|
|
voltageReading = map(voltageReading, 0, 255, 0, 500) * 4; //30k - 10k voltage divider
|
|
|
- currentReading = map(currentReading, 0, 255, 0, 500); //Max range 0 to 5A
|
|
|
+ currentReading = (2.5 - (currentReading * (5.0 / 255)) )/0.185; //Max range 0 to 5A
|
|
|
|
|
|
//Cap the range of digits to make sure it won't overflow
|
|
|
voltageReading = min(voltageReading, 9999);
|
|
@@ -62,8 +62,7 @@ void loop() {
|
|
|
//Print result on USB Serial
|
|
|
USBSerial_print(((float)voltageReading/100));
|
|
|
USBSerial_print(",");
|
|
|
- USBSerial_print(((float)currentReading/100));
|
|
|
- USBSerial_println("\n");
|
|
|
+ USBSerial_println(((float)currentReading/100));
|
|
|
|
|
|
//Update OLED display
|
|
|
PS_Screen(voltageReading, currentReading, isCCMode);
|