From 19f068178164dde134e3e3ce878f4ecdba754604 Mon Sep 17 00:00:00 2001 From: Andreas Merkle Date: Fri, 8 Nov 2024 17:10:45 +0100 Subject: [PATCH 1/2] Integration of ArduinoNative v0.2.1, ZumoHALWebots v1.1.0, ZumoHALInterfaces v1.0.2 and SerialMuxProt v2.2.2 --- platformio.ini | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/platformio.ini b/platformio.ini index 7a4ab9a..3c77179 100644 --- a/platformio.ini +++ b/platformio.ini @@ -98,9 +98,10 @@ build_flags = -DTARGET_NATIVE -I./lib/Webots/include/c -I./lib/Webots/include/cpp + -D _USE_MATH_DEFINES lib_deps = MainNative - BlueAndi/ZumoHALWebots @ ~1.0.0 + BlueAndi/ZumoHALWebots @ ~1.1.0 Webots lib_ignore = HALTest @@ -126,8 +127,8 @@ build_flags = -Itest/common lib_deps = MainTestNative - BlueAndi/ArduinoNative @ ~0.1.1 - BlueAndi/ZumoHALInterfaces @ ~1.0.0 + BlueAndi/ArduinoNative @ ~0.2.1 + BlueAndi/ZumoHALInterfaces @ ~1.0.2 HALTest lib_ignore = Webots @@ -190,7 +191,7 @@ build_flags = lib_deps = APPConvoyLeader Service - gabryelreyes/SerialMuxProt @ ~2.2.0 + gabryelreyes/SerialMuxProt @ ~2.2.2 lib_ignore = APPCalib APPConvoyFollower @@ -239,7 +240,7 @@ build_flags = lib_deps = APPConvoyFollower Service - gabryelreyes/SerialMuxProt @ ~2.2.0 + gabryelreyes/SerialMuxProt @ ~2.2.2 lib_ignore = APPCalib APPConvoyLeader @@ -355,7 +356,7 @@ build_flags = lib_deps = APPRemoteControl Service - gabryelreyes/SerialMuxProt @ ~2.2.0 + gabryelreyes/SerialMuxProt @ ~2.2.2 lib_ignore = APPCalib APPConvoyFollower @@ -404,7 +405,7 @@ build_flags = lib_deps = APPSensorFusion Service - gabryelreyes/SerialMuxProt @ ~2.2.0 + gabryelreyes/SerialMuxProt @ ~2.2.2 lib_ignore = APPCalib APPConvoyFollower From 175dee55dd4a1d31cd0220efc085fa3d195d84cc Mon Sep 17 00:00:00 2001 From: BlueAndi Date: Fri, 8 Nov 2024 18:59:05 +0100 Subject: [PATCH 2/2] Add "_USE_MATH_DEFINES" to test HAL too. --- platformio.ini | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platformio.ini b/platformio.ini index 3c77179..730a929 100644 --- a/platformio.ini +++ b/platformio.ini @@ -95,9 +95,9 @@ test_port = com9 platform = native @ ~1.2.1 build_flags = -std=c++11 - -DTARGET_NATIVE -I./lib/Webots/include/c -I./lib/Webots/include/cpp + -D TARGET_NATIVE -D _USE_MATH_DEFINES lib_deps = MainNative @@ -122,9 +122,10 @@ webots_robot_serial_tx_channel = 2 platform = native @ ~1.2.1 build_flags = -std=c++11 - -DTARGET_NATIVE - -DUNIT_TEST -Itest/common + -D TARGET_NATIVE + -D UNIT_TEST + -D _USE_MATH_DEFINES lib_deps = MainTestNative BlueAndi/ArduinoNative @ ~0.2.1