Add Arduino.h back #63

ant32 · 2021-05-26T18:51:18Z

Removing Arduino.h causes compile issues on stm32duino so adding back just the needed dependency.

Here is the definition of delayMicroseconds in stm32duino https://github.com/stm32duino/Arduino_Core_STM32/blob/a7283739a4d8bafe95c9f9b9156e6f82a1ebbd75/cores/arduino/wiring_time.h#L64

this breaking change was introduced on #58 pull request

Compiling .pio/build/universal/lib640/ArduinoModbus/libmodbus/modbus.c.o
.pio/libdeps/universal/ArduinoModbus/src/libmodbus/modbus.c: In function '_sleep_response_timeout':
.pio/libdeps/universal/ArduinoModbus/src/libmodbus/modbus.c:156:5: warning: implicit declaration of function 'delay' [-Wimplicit-function-declaration]
  156 |     delay(ctx->response_timeout.tv_sec * 1000);
      |     ^~~~~
.pio/libdeps/universal/ArduinoModbus/src/libmodbus/modbus.c:157:5: warning: implicit declaration of function 'delayMicroseconds' [-Wimplicit-function-declaration]
  157 |     delayMicroseconds(ctx->response_timeout.tv_usec);
      |     ^~~~~~~~~~~~~~~~~
Archiving .pio/build/universal/lib640/libArduinoModbus.a
Indexing .pio/build/universal/lib640/libArduinoModbus.a
Linking .pio/build/universal/firmware.elf
/home/user/.platformio/packages/toolchain-gccarmnoneeabi/bin/../lib/gcc/arm-none-eabi/9.2.1/../../../../arm-none-eabi/bin/ld: .pio/build/universal/lib640/libArduinoModbus.a(modbus.c.o): in function `_sleep_response_timeout':
modbus.c:(.text._sleep_response_timeout+0x1e): undefined reference to `delayMicroseconds'
collect2: error: ld returned 1 exit status
*** [.pio/build/universal/firmware.elf] Error 1

ant32 · 2021-05-26T18:53:53Z

@aentinger @facchinm please review

github-actions · 2021-05-26T19:39:06Z

Memory usage change @ eee9c5b

Board	flash	%	RAM for global variables	%
arduino:avr:leonardo	💚 -8 - -8	-0.03 - -0.03	0 - 0	0.0 - 0.0
arduino:megaavr:uno2018:mode=off	❔ -8 - +18	-0.02 - +0.04	0 - 0	0.0 - 0.0
arduino:samd:mkrwifi1010	💚 -88 - -88	-0.03 - -0.03	0 - 0	0.0 - 0.0

Click for full report table

Board	examples/RTU/ModbusRTUClientKitchenSink flash	%	examples/RTU/ModbusRTUClientToggle flash	%	examples/RTU/ModbusRTUServerKitchenSink flash	%	examples/RTU/ModbusRTUServerLED flash	%	examples/RTU/ModbusRTUTemperatureSensor flash	%	examples/TCP/EthernetModbusClientToggle flash	%	examples/TCP/EthernetModbusServerLED flash	%	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	-8	-0.03	-8	-0.03	-8	-0.03	-8	-0.03	-8	-0.03	-8	-0.03	-8	-0.03
arduino:megaavr:uno2018:mode=off	-8	-0.02	-8	-0.02	18	0.04	18	0.04	-8	-0.02	-8	-0.02	-8	-0.02	-8	-0.02	0	0.0	-8	-0.02	0	0.0
arduino:samd:mkrwifi1010	-88	-0.03	-88	-0.03	-88	-0.03	-88	-0.03	-88	-0.03	-88	-0.03	-88	-0.03	-88	-0.03	0	0.0	-88	-0.03	0	0.0

Click for full report CSV

Board,examples/RTU/ModbusRTUClientKitchenSink<br>flash,%,examples/RTU/ModbusRTUClientKitchenSink<br>RAM for global variables,%,examples/RTU/ModbusRTUClientToggle<br>flash,%,examples/RTU/ModbusRTUClientToggle<br>RAM for global variables,%,examples/RTU/ModbusRTUServerKitchenSink<br>flash,%,examples/RTU/ModbusRTUServerKitchenSink<br>RAM for global variables,%,examples/RTU/ModbusRTUServerLED<br>flash,%,examples/RTU/ModbusRTUServerLED<br>RAM for global variables,%,examples/RTU/ModbusRTUTemperatureSensor<br>flash,%,examples/RTU/ModbusRTUTemperatureSensor<br>RAM for global variables,%,examples/TCP/EthernetModbusClientToggle<br>flash,%,examples/TCP/EthernetModbusClientToggle<br>RAM for global variables,%,examples/TCP/EthernetModbusServerLED<br>flash,%,examples/TCP/EthernetModbusServerLED<br>RAM for global variables,%,examples/TCP/WiFiModbusClientToggle<br>flash,%,examples/TCP/WiFiModbusClientToggle<br>RAM for global variables,%,examples/TCP/WiFiModbusServerLED<br>flash,%,examples/TCP/WiFiModbusServerLED<br>RAM for global variables,%
arduino:avr:leonardo,-8,-0.03,0,0.0,-8,-0.03,0,0.0,-8,-0.03,0,0.0,-8,-0.03,0,0.0,-8,-0.03,0,0.0,-8,-0.03,0,0.0,-8,-0.03,0,0.0
arduino:megaavr:uno2018:mode=off,-8,-0.02,0,0.0,-8,-0.02,0,0.0,18,0.04,0,0.0,18,0.04,0,0.0,-8,-0.02,0,0.0,-8,-0.02,0,0.0,-8,-0.02,0,0.0,-8,-0.02,0,0.0,-8,-0.02,0,0.0
arduino:samd:mkrwifi1010,-88,-0.03,0,0.0,-88,-0.03,0,0.0,-88,-0.03,0,0.0,-88,-0.03,0,0.0,-88,-0.03,0,0.0,-88,-0.03,0,0.0,-88,-0.03,0,0.0,-88,-0.03,0,0.0,-88,-0.03,0,0.0

facchinm · 2021-05-27T07:42:27Z

Hi @ant32 ,
readding the include breaks the compilation on mbed platform; since the error is due to delay being declared static inline in a .h, I'd rather add the correct include between #ifdef STM32DUINO or similar

CLAassistant · 2021-05-27T16:47:58Z

All committers have signed the CLA.

ant32 · 2021-05-27T16:53:34Z

@facchinm
Made the changes and included only the header that contains delay and delayMicroseconds code. Did some research and it looks like the correct define is ARDUINO_ARCH_STM32 let me know if you'd like me to rebase and or create a new pull request

github-actions · 2021-05-28T04:41:40Z

Memory usage change @ 8495ab5

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/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
arduino:mbed:envie_m7
arduino:mbed:nano33ble
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
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

Click for full report CSV

Board,examples/RTU/ModbusRTUClientKitchenSink<br>flash,%,examples/RTU/ModbusRTUClientKitchenSink<br>RAM for global variables,%,examples/RTU/ModbusRTUClientToggle<br>flash,%,examples/RTU/ModbusRTUClientToggle<br>RAM for global variables,%,examples/RTU/ModbusRTUServerKitchenSink<br>flash,%,examples/RTU/ModbusRTUServerKitchenSink<br>RAM for global variables,%,examples/RTU/ModbusRTUServerLED<br>flash,%,examples/RTU/ModbusRTUServerLED<br>RAM for global variables,%,examples/RTU/ModbusRTUTemperatureSensor<br>flash,%,examples/RTU/ModbusRTUTemperatureSensor<br>RAM for global variables,%,examples/TCP/EthernetModbusClientToggle<br>flash,%,examples/TCP/EthernetModbusClientToggle<br>RAM for global variables,%,examples/TCP/EthernetModbusServerLED<br>flash,%,examples/TCP/EthernetModbusServerLED<br>RAM for global variables,%,examples/TCP/WiFiModbusClientToggle<br>flash,%,examples/TCP/WiFiModbusClientToggle<br>RAM for global variables,%,examples/TCP/WiFiModbusServerLED<br>flash,%,examples/TCP/WiFiModbusServerLED<br>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

facchinm · 2021-05-28T08:03:07Z

LGTM! I'll squash and merge 😉

Add Arduino.h back

eee9c5b

Update modbus.c

8495ab5

facchinm merged commit 609eba3 into arduino-libraries:master May 28, 2021

per1234 referenced this pull request May 31, 2021

Remove useless Arduino.h include

629884d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add Arduino.h back #63

Add Arduino.h back #63

Uh oh!

ant32 commented May 26, 2021

Uh oh!

ant32 commented May 26, 2021

Uh oh!

github-actions bot commented May 26, 2021

Uh oh!

facchinm commented May 27, 2021

Uh oh!

CLAassistant commented May 27, 2021 •

edited

Loading

Uh oh!

ant32 commented May 27, 2021

Uh oh!

github-actions bot commented May 28, 2021

Uh oh!

facchinm commented May 28, 2021

Uh oh!

Uh oh!

Add Arduino.h back #63

Add Arduino.h back #63

Uh oh!

Conversation

ant32 commented May 26, 2021

Uh oh!

ant32 commented May 26, 2021

Uh oh!

github-actions bot commented May 26, 2021

Uh oh!

facchinm commented May 27, 2021

Uh oh!

CLAassistant commented May 27, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ant32 commented May 27, 2021

Uh oh!

github-actions bot commented May 28, 2021

Uh oh!

facchinm commented May 28, 2021

Uh oh!

Uh oh!

CLAassistant commented May 27, 2021 •

edited

Loading