diff --git a/Software/Software.ino b/Software/Software.ino index bf011743..0a139cba 100644 --- a/Software/Software.ino +++ b/Software/Software.ino @@ -242,10 +242,10 @@ void init_modbus() { handle_static_data_modbus_byd(); #endif #if defined(BYD_MODBUS) || defined(LUNA2000_MODBUS) - #if defined(SERIAL_LINK_RECEIVER) || defined(SERIAL_LINK_TRANSMITTER) - // Check that Dual LilyGo via RS485 option isn't enabled, this collides with Modbus! - #error MODBUS CANNOT BE USED IN DOUBLE LILYGO SETUPS! CHECK USER SETTINGS! - #endif +#if defined(SERIAL_LINK_RECEIVER) || defined(SERIAL_LINK_TRANSMITTER) +// Check that Dual LilyGo via RS485 option isn't enabled, this collides with Modbus! +#error MODBUS CANNOT BE USED IN DOUBLE LILYGO SETUPS! CHECK USER SETTINGS! +#endif // Init Serial2 connected to the RTU Modbus RTUutils::prepareHardwareSerial(Serial2); diff --git a/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp b/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp index e4ddf207..0377766b 100644 --- a/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp +++ b/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp @@ -53,7 +53,7 @@ void __getData() { void updateData() { // --- update with fresh data dataLinkReceive.updateData(0, inverterAllowsContactorClosing); - //dataLinkReceive.updateData(1,var2); // For future expansion, + //dataLinkReceive.updateData(1,var2); // For future expansion, //dataLinkReceive.updateData(2,var3); // if inverter needs to send data to battery } diff --git a/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp b/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp index ccf07c8f..119398f2 100644 --- a/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp +++ b/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp @@ -24,7 +24,7 @@ void printSendingValues(); void _getData() { inverterAllowsContactorClosing = dataLinkTransmit.getReceivedData(0); - //var2 = dataLinkTransmit.getReceivedData(1); // For future expansion, + //var2 = dataLinkTransmit.getReceivedData(1); // For future expansion, //var3 = dataLinkTransmit.getReceivedData(2); // if inverter needs to send data to battery }