Skip to content

Commit

Permalink
Add error handling write values to 0
Browse files Browse the repository at this point in the history
  • Loading branch information
dalathegreat committed Nov 25, 2023
1 parent 44fa2ba commit 4f6aecf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
22 changes: 7 additions & 15 deletions Software/Software.ino
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

// Interval settings
int intervalUpdateValues = 4800; // Interval at which to update inverter values / Modbus registers
const int interval1 = 1; // Interval for 1ms tasks
const int interval10 = 10; // Interval for 10ms tasks
unsigned long previousMillis1ms = 0;
unsigned long previousMillis10ms = 50;
unsigned long previousMillisUpdateVal = 0;

Expand Down Expand Up @@ -128,12 +130,9 @@ void loop() {
#ifdef DUAL_CAN
receive_can2();
#endif
<<<<<<< HEAD
#ifdef SERIAL_LINK_RECEIVER
receive_serial();
#endif
=======
>>>>>>> main

// Process
if (millis() - previousMillis10ms >= interval10) // Every 10ms
Expand All @@ -156,12 +155,9 @@ void loop() {
#ifdef DUAL_CAN
send_can2();
#endif
<<<<<<< HEAD
#ifdef SERIAL_LINK_TRANSMITTER
send_serial();
#endif
=======
>>>>>>> main
}

// Initialization functions
Expand Down Expand Up @@ -229,16 +225,13 @@ void init_modbus() {
pinMode(PIN_5V_EN, OUTPUT);
digitalWrite(PIN_5V_EN, HIGH);

<<<<<<< HEAD
#if defined(SERIAL_LINK_RECEIVER) || defined(SERIAL_LINK_TRANSMITTER)
Serial2.begin(9600, SERIAL_8N1, RS485_RX_PIN, RS485_TX_PIN); // If the Modbus RTU port will be used for serial link
#if defined(BYD_MODBUS) || defined(LUNA2000_MODBUS)
#error Modbus pins cannot be used for Serial and Modbus at the same time!
#endif
#endif

=======
>>>>>>> main
#ifdef BYD_MODBUS
// Init Static data to the RTU Modbus
handle_static_data_modbus_byd();
Expand Down Expand Up @@ -408,7 +401,6 @@ void send_can() {
#endif
}

<<<<<<< HEAD
#ifdef SERIAL_LINK_RECEIVER
//---- Receives serial data and transfers to the Inverter
void receive_serial() {
Expand All @@ -424,15 +416,15 @@ void receive_serial() {
//---- Gets data from Battery and serial Transmits the data to the Receiver
void send_serial() {
static unsigned long currentMillis = millis();
if (currentMillis - previousMillis1ms > interval1) { //--- try 2 second
previousMillis1ms = currentMillis;
manageSerialLinkTransmitter();
if (bms_status == ACTIVE) {
if (currentMillis - previousMillis1ms > interval1) { //--- try 2 second
previousMillis1ms = currentMillis;
manageSerialLinkTransmitter();
}
}
}
#endif

=======
>>>>>>> main
#ifdef DUAL_CAN
void receive_can2() { // This function is similar to receive_can, but just takes care of inverters in the 2nd bus.
// Depending on which inverter is selected, we forward this to their respective CAN routines
Expand Down
2 changes: 2 additions & 0 deletions Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ void manageSerialLinkTransmitter() {
Serial.print(currentTime);
Serial.println(" - Transmit Failed : 60 seconds");
bms_status = 4; //FAULT
max_target_discharge_power = 0;
max_target_charge_power = 0;
LEDcolor = RED;
// throw error
}
Expand Down

0 comments on commit 4f6aecf

Please sign in to comment.