From e8f2b395542f563f9641de9666a8c91314c02c9e Mon Sep 17 00:00:00 2001
From: Denis Denisov <ftc.denis@gmail.com>
Date: Sun, 25 Feb 2024 18:02:13 +0300
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=B8=D0=B9=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B4=D0=B0=D1=91=D0=BC=20=D0=BD=D0=B0=D0=B2=D0=B5=D1=80=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 charger/charger.ino | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/charger/charger.ino b/charger/charger.ino
index 25e8ce5..d107cad 100644
--- a/charger/charger.ino
+++ b/charger/charger.ino
@@ -10,6 +10,10 @@ ModbusRTU mb;
 #define I_LAMP_HIGH_REGISTER 3
 #define ACC_STATE_REGISTER 4
 #define LAMP_STATE_REGISTER 5
+#define U_ACC_LOW_REGISTER 6
+#define U_ACC_HIGH_REGISTER 7
+#define U_LAMP_LOW_REGISTER 8
+#define U_LAMP_HIGH_REGISTER 9
 
 #define ACC_PIN 2
 #define LAMP_PIN 3
@@ -41,10 +45,16 @@ void setup()
   mb.addHreg(I_LAMP_HIGH_REGISTER);
   mb.addHreg(ACC_STATE_REGISTER);
   mb.addHreg(LAMP_STATE_REGISTER);
+  mb.addHreg(U_ACC_LOW_REGISTER);
+  mb.addHreg(U_ACC_HIGH_REGISTER);
+  mb.addHreg(U_LAMP_LOW_REGISTER);
+  mb.addHreg(U_LAMP_HIGH_REGISTER);
 }
 
 float I_lamp;
 float I_acc;
+float U_lamp;
+float U_acc;
 
 void ReadLamp()
 {
@@ -55,6 +65,7 @@ void ReadLamp()
   float v1 = a4 / 1023.0 * 5 * 3;
   float v2 = a5 / 1023.0 * 5 * 3;
   I_lamp = (v1 - v2) / R_lamp;
+  U_lamp = v1;
 }
 
 void ReadAcc()
@@ -66,6 +77,7 @@ void ReadAcc()
   float v1 = a2 / 1023.0 * 5 * 3;
   float v2 = a3 / 1023.0 * 5 * 3;
   I_acc = (v1 - v2) / R_LIMITER;
+  U_acc = v1;
 }
 
 void WriteFloatReg(int start, float val)
@@ -83,12 +95,9 @@ void loop()
   ReadLamp();
   ReadAcc();
   WriteFloatReg(I_ACC_LOW_REGISTER, I_acc);
+  WriteFloatReg(U_ACC_LOW_REGISTER, U_acc);
   WriteFloatReg(I_LAMP_LOW_REGISTER, I_lamp);
-  Serial.print("I_acc = ");
-  Serial.print(I_acc);
-  Serial.print(" I_lamp = ");
-  Serial.print(I_lamp);
-  Serial.println();
+  WriteFloatReg(U_LAMP_LOW_REGISTER, U_lamp);
   mb.task();
   lamp_state = mb.Hreg(lamp_state);
   acc_state = mb.Hreg(acc_state);