fix: voltage and current in CurrentDemandReq

doc/todo.md

@@ -1,8 +1,8 @@
 # Todos
 
-- [ ] PevMode: PreChargeReq: Fill EVRESSSOC, EVTargetVoltage, EVTargetCurrent
-- [ ] PevMode: PowerDeliveryReq: Fill EVRESSSOC, Stop/Start
-- [ ] PevMode: CurrentDemandReq: Fill EVRESSSOC, EVTargetCurrent, EVTargetVoltage
+- [x] PevMode: PreChargeReq: Fill EVRESSSOC, EVTargetVoltage, EVTargetCurrent
+- [x] PevMode: PowerDeliveryReq: Fill EVRESSSOC, Stop/Start
+- [x] PevMode: CurrentDemandReq: Fill EVRESSSOC, EVTargetCurrent, EVTargetVoltage
 - [ ] EvseMode: CurrentDemandRes: Fill EVSEPresentVoltage, EVSEPresentCurrent, EVSEMaximumVoltageLimit, ...LimitAchieved
 - [ ] EvseMode: Fill V2G messages as far as needed, to convince the car to accept it.
 - [ ] PevMode: Fill V2G messages as far as needed, to convince the charger to accept it.
@@ -12,4 +12,5 @@
 - [ ] improve docu (update layer diagram, improve hardware docu, add link to evse which provides the 5% PWM)
 - [ ] in addressManager, replace the print by addToTrace
 - [ ] Resolve the todo-markers in the code
+- [ ] Still fixed addresses (MAC, IP) used somewhere?
 - [ ] (and much more)

fsmPev.py

@@ -65,8 +65,8 @@ class fsmPev():
     
     def sendCurrentDemandReq(self):
         soc = str(self.hardwareInterface.getSoc())
-        EVTargetCurrent = str(self.hardwareInterface.getAccuMaxCurrent)
-        EVTargetVoltage = str(self.hardwareInterface.getAccuMaxVoltage)
+        EVTargetCurrent = str(self.hardwareInterface.getAccuMaxCurrent())
+        EVTargetVoltage = str(self.hardwareInterface.getAccuMaxVoltage())
         msg = addV2GTPHeader(self.exiEncode("EDI_"+self.sessionId + "_" + soc + "_" + EVTargetCurrent + "_" + EVTargetVoltage )) # EDI for Encode, Din, CurrentDemandReq
         self.addToTrace("responding " + prettyHexMessage(msg))
         self.Tcp.transmit(msg)

hardwareInterface.py

@@ -96,7 +96,7 @@ class hardwareInterface():
         if (self.simulatedSoc<100):
             if ((self.outvalue & 2)!=0):
                 # while the relay is closes, simulate increasing SOC
-                self.simulatedSoc = self.simulatedSoc + 0.2
+                self.simulatedSoc = self.simulatedSoc + 1.0
         self.loopcounter+=1
         if (self.isInterfaceOk):
             if (self.loopcounter>15):