From 956aa8a712a70094842e3b4d15dffd82ffe211da Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 27 Nov 2023 21:21:50 +0200 Subject: [PATCH] Add sending inverter values back --- .../src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp | 10 ++++------ .../src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.h | 3 ++- .../src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp | 10 ++++------ .../src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.h | 3 ++- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp b/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp index 0f82a5af..14e70589 100644 --- a/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp +++ b/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp @@ -2,7 +2,7 @@ #include "SERIAL-LINK-RECEIVER-FROM-BATTERY.h" -//#define INVERTER_SEND_NUM_VARIABLES 3 //--- comment out if nothing to send +#define INVERTER_SEND_NUM_VARIABLES 1 #define INVERTER_RECV_NUM_VARIABLES 16 #ifdef INVERTER_SEND_NUM_VARIABLES @@ -36,11 +36,9 @@ void __getData() { void updateData() { // --- update with fresh data - /* - dataLinkReceive.updateData(0,var1); - dataLinkReceive.updateData(1,var2); - dataLinkReceive.updateData(2,var3); - */ + dataLinkReceive.updateData(0, inverterAllowsContactorClosing); + //dataLinkReceive.updateData(1,var2); + //dataLinkReceive.updateData(2,var3); } /* diff --git a/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.h b/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.h index 99818c8d..ab0581b6 100644 --- a/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.h +++ b/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.h @@ -31,7 +31,8 @@ extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 funct extern uint16_t cell_max_voltage; //mV, 0-4350 extern uint16_t cell_min_voltage; //mV, 0-4350 extern uint8_t LEDcolor; //Enum, 0-10 -extern bool batteryAllowsContactorClosing; //Bool, 1=true, 0=false +extern bool batteryAllowsContactorClosing; //Bool, 1=true, 0=false +extern bool inverterAllowsContactorClosing; //Bool, 1=true, 0=false void manageSerialLinkReceiver(); diff --git a/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp b/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp index 77c5df16..1f06be2a 100644 --- a/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp +++ b/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp @@ -9,7 +9,7 @@ */ #define BATTERY_SEND_NUM_VARIABLES 16 -//#define BATTERY_RECV_NUM_VARIABLES 3 //--- comment out if nothing to receive +#define BATTERY_RECV_NUM_VARIABLES 1 #ifdef BATTERY_RECV_NUM_VARIABLES const uint8_t receivingNumVariables = BATTERY_RECV_NUM_VARIABLES; @@ -21,11 +21,9 @@ const uint8_t receivingNumVariables = 0; SerialDataLink dataLinkTransmit(Serial2, 0x01, 0, BATTERY_SEND_NUM_VARIABLES, receivingNumVariables); void _getData() { - /* - var1 = dataLinkTransmit.getReceivedData(0); - var2 = dataLinkTransmit.getReceivedData(1); - var3 = dataLinkTransmit.getReceivedData(2); - */ + inverterAllowsContactorClosing = dataLinkTransmit.getReceivedData(0); + //var2 = dataLinkTransmit.getReceivedData(1); + //var3 = dataLinkTransmit.getReceivedData(2); } void manageSerialLinkTransmitter() { diff --git a/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.h b/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.h index f1a9e7ec..f1544cde 100644 --- a/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.h +++ b/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.h @@ -25,7 +25,8 @@ extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 funct extern uint16_t cell_max_voltage; //mV, 0-4350 extern uint16_t cell_min_voltage; //mV, 0-4350 extern uint8_t LEDcolor; //Enum, 0-10 -extern bool batteryAllowsContactorClosing; //Bool, 1=true, 0=false +extern bool batteryAllowsContactorClosing; //Bool, 1=true, 0=false +extern bool inverterAllowsContactorClosing; //Bool, 1=true, 0=false void manageSerialLinkTransmitter();