Fix define ON OFF conflict with other libraries

jahartley commented 2 years ago

The #define ON and #define OFF in modbus.h creates a conflict with Arduino Menu 4 library. It is only used once in modbus.c and can be substituted for TRUE FALSE, also defined in modbus.h

CLAassistant commented 2 years ago

All committers have signed the CLA.

github-actions[bot] commented 2 years ago

Memory usage change @ 5c7ecf58b45b5a0e2463d305b414f0b9421bec5b

Board	flash	%	RAM for global variables	%
arduino:avr:leonardo	0 - 0	0.0 - 0.0	0 - 0	0.0 - 0.0
arduino:mbed:envie_m7	0 - 0	0.0 - 0.0	0 - 0	0.0 - 0.0
arduino:mbed:nano33ble	0 - 0	0.0 - 0.0	0 - 0	0.0 - 0.0
arduino:megaavr:uno2018:mode=off	0 - 0	0.0 - 0.0	0 - 0	0.0 - 0.0
arduino:samd:mkrwifi1010	0 - 0	0.0 - 0.0	0 - 0	0.0 - 0.0

Click for full report table

Board|examples/RTU/ModbusRTUClientKitchenSink
flash|%|examples/RTU/ModbusRTUClientKitchenSink
RAM for global variables|%|examples/RTU/ModbusRTUClientToggle
flash|%|examples/RTU/ModbusRTUClientToggle
RAM for global variables|%|examples/RTU/ModbusRTUServerKitchenSink
flash|%|examples/RTU/ModbusRTUServerKitchenSink
RAM for global variables|%|examples/RTU/ModbusRTUServerLED
flash|%|examples/RTU/ModbusRTUServerLED
RAM for global variables|%|examples/RTU/ModbusRTUTemperatureSensor
flash|%|examples/RTU/ModbusRTUTemperatureSensor
RAM for global variables|%|examples/TCP/EthernetModbusClientToggle
flash|%|examples/TCP/EthernetModbusClientToggle
RAM for global variables|%|examples/TCP/EthernetModbusServerLED
flash|%|examples/TCP/EthernetModbusServerLED
RAM for global variables|%|examples/TCP/WiFiModbusClientToggle
flash|%|examples/TCP/WiFiModbusClientToggle
RAM for global variables|%|examples/TCP/WiFiModbusServerLED
flash|%|examples/TCP/WiFiModbusServerLED
RAM for global variables|% -|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|- arduino:avr:leonardo|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0 arduino:mbed:envie_m7|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|||||||| arduino:mbed:nano33ble|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|||||||| arduino:megaavr:uno2018:mode=off|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0 arduino:samd:mkrwifi1010|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0

Click for full report CSV

``` Board,examples/RTU/ModbusRTUClientKitchenSink
flash,%,examples/RTU/ModbusRTUClientKitchenSink
RAM for global variables,%,examples/RTU/ModbusRTUClientToggle
flash,%,examples/RTU/ModbusRTUClientToggle
RAM for global variables,%,examples/RTU/ModbusRTUServerKitchenSink
flash,%,examples/RTU/ModbusRTUServerKitchenSink
RAM for global variables,%,examples/RTU/ModbusRTUServerLED
flash,%,examples/RTU/ModbusRTUServerLED
RAM for global variables,%,examples/RTU/ModbusRTUTemperatureSensor
flash,%,examples/RTU/ModbusRTUTemperatureSensor
RAM for global variables,%,examples/TCP/EthernetModbusClientToggle
flash,%,examples/TCP/EthernetModbusClientToggle
RAM for global variables,%,examples/TCP/EthernetModbusServerLED
flash,%,examples/TCP/EthernetModbusServerLED
RAM for global variables,%,examples/TCP/WiFiModbusClientToggle
flash,%,examples/TCP/WiFiModbusClientToggle
RAM for global variables,%,examples/TCP/WiFiModbusServerLED
flash,%,examples/TCP/WiFiModbusServerLED
RAM for global variables,% arduino:avr:leonardo,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0 arduino:mbed:envie_m7,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,,,,,,,, arduino:mbed:nano33ble,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,,,,,,,, arduino:megaavr:uno2018:mode=off,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0 arduino:samd:mkrwifi1010,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0 ```

jahartley commented 2 years ago

Updated per request.

github-actions[bot] commented 2 years ago

Memory usage change @ 0a4dce7f170553fc7b4afacc65ba265f5b5c04ee

Board	flash	%	RAM for global variables	%
arduino:avr:leonardo	0 - 0	0.0 - 0.0	0 - 0	0.0 - 0.0
arduino:mbed:envie_m7	0 - 0	0.0 - 0.0	0 - 0	0.0 - 0.0
arduino:mbed:nano33ble	0 - 0	0.0 - 0.0	0 - 0	0.0 - 0.0
arduino:megaavr:uno2018:mode=off	0 - 0	0.0 - 0.0	0 - 0	0.0 - 0.0
arduino:samd:mkrwifi1010	0 - 0	0.0 - 0.0	0 - 0	0.0 - 0.0

Click for full report table

Board|examples/RTU/ModbusRTUClientKitchenSink
flash|%|examples/RTU/ModbusRTUClientKitchenSink
RAM for global variables|%|examples/RTU/ModbusRTUClientToggle
flash|%|examples/RTU/ModbusRTUClientToggle
RAM for global variables|%|examples/RTU/ModbusRTUServerKitchenSink
flash|%|examples/RTU/ModbusRTUServerKitchenSink
RAM for global variables|%|examples/RTU/ModbusRTUServerLED
flash|%|examples/RTU/ModbusRTUServerLED
RAM for global variables|%|examples/RTU/ModbusRTUTemperatureSensor
flash|%|examples/RTU/ModbusRTUTemperatureSensor
RAM for global variables|%|examples/TCP/EthernetModbusClientToggle
flash|%|examples/TCP/EthernetModbusClientToggle
RAM for global variables|%|examples/TCP/EthernetModbusServerLED
flash|%|examples/TCP/EthernetModbusServerLED
RAM for global variables|%|examples/TCP/WiFiModbusClientToggle
flash|%|examples/TCP/WiFiModbusClientToggle
RAM for global variables|%|examples/TCP/WiFiModbusServerLED
flash|%|examples/TCP/WiFiModbusServerLED
RAM for global variables|% -|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|- arduino:avr:leonardo|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0 arduino:mbed:envie_m7|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|||||||| arduino:mbed:nano33ble|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|||||||| arduino:megaavr:uno2018:mode=off|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0 arduino:samd:mkrwifi1010|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0|0|0.0

Click for full report CSV

``` Board,examples/RTU/ModbusRTUClientKitchenSink
flash,%,examples/RTU/ModbusRTUClientKitchenSink
RAM for global variables,%,examples/RTU/ModbusRTUClientToggle
flash,%,examples/RTU/ModbusRTUClientToggle
RAM for global variables,%,examples/RTU/ModbusRTUServerKitchenSink
flash,%,examples/RTU/ModbusRTUServerKitchenSink
RAM for global variables,%,examples/RTU/ModbusRTUServerLED
flash,%,examples/RTU/ModbusRTUServerLED
RAM for global variables,%,examples/RTU/ModbusRTUTemperatureSensor
flash,%,examples/RTU/ModbusRTUTemperatureSensor
RAM for global variables,%,examples/TCP/EthernetModbusClientToggle
flash,%,examples/TCP/EthernetModbusClientToggle
RAM for global variables,%,examples/TCP/EthernetModbusServerLED
flash,%,examples/TCP/EthernetModbusServerLED
RAM for global variables,%,examples/TCP/WiFiModbusClientToggle
flash,%,examples/TCP/WiFiModbusClientToggle
RAM for global variables,%,examples/TCP/WiFiModbusServerLED
flash,%,examples/TCP/WiFiModbusServerLED
RAM for global variables,% arduino:avr:leonardo,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0 arduino:mbed:envie_m7,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,,,,,,,, arduino:mbed:nano33ble,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,,,,,,,, arduino:megaavr:uno2018:mode=off,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0 arduino:samd:mkrwifi1010,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0 ```

arduino-libraries / ArduinoModbus

Fix define ON OFF conflict with other libraries #77