From 3aaeb0f29c53682e2194373c5050f17f9f235c58 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 7 Jun 2023 15:56:50 +1000 Subject: [PATCH] AP_HAL_ChibiOS: allow AP_SCRIPTING_ENABLED to come from hwdef files --- libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef.dat | 3 +-- .../AP_HAL_ChibiOS/hwdef/CubeOrange-periph-heavy/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/CubeRedSecondary/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/FoxeerH743v1/hwdef.dat | 2 ++ libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat | 2 ++ libraries/AP_HAL_ChibiOS/hwdef/KakuteH7v2/hwdef.dat | 2 ++ libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat | 2 ++ libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat | 2 ++ libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py | 5 ++++- libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat | 3 +++ 15 files changed, 28 insertions(+), 7 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat index 34fc186a44..183b3eb52f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat @@ -138,3 +138,7 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin define STM32_PWM_USE_ADVANCED TRUE define DEFAULT_NTF_LED_TYPES 257 + + +// disable scripting - no SD card +define AP_SCRIPTING_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef.dat index 5dd1c6ac88..4149711b48 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef.dat @@ -51,8 +51,7 @@ define HAL_PERIPH_ENABLE_BATTERY define CAN_APP_NODE_NAME "org.ardupilot.CubeBlack-periph" - -env DISABLE_SCRIPTING 1 +define AP_SCRIPTING_ENABLED 0 # use blue LED define HAL_GPIO_PIN_LED HAL_GPIO_PIN_FMU_LED_AMBER diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph-heavy/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph-heavy/hwdef.dat index a6125a4cc8..8dbf005aa8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph-heavy/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph-heavy/hwdef.dat @@ -50,7 +50,7 @@ define HAL_BARO_ALLOW_INIT_NO_BARO define CAN_APP_NODE_NAME "org.ardupilot.CubeOrange-periph" -env DISABLE_SCRIPTING 1 +define AP_SCRIPTING_ENABLED 0 # use blue LED define HAL_GPIO_PIN_LED HAL_GPIO_PIN_FMU_LED_AMBER diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef.dat index 4a14f9b6a2..6da1f6c095 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef.dat @@ -46,7 +46,7 @@ define HAL_BARO_ALLOW_INIT_NO_BARO define CAN_APP_NODE_NAME "org.ardupilot.CubeOrange-periph" -env DISABLE_SCRIPTING 1 +define AP_SCRIPTING_ENABLED 0 # use blue LED define HAL_GPIO_PIN_LED HAL_GPIO_PIN_FMU_LED_AMBER diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeRedSecondary/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeRedSecondary/hwdef.dat index e44d3e1fe0..1008524837 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeRedSecondary/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeRedSecondary/hwdef.dat @@ -151,6 +151,7 @@ define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_RCIN define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_Sbus1 define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_RCIN +define AP_SCRIPTING_ENABLED 0 # only use pulse input for PPM, other protocols # are on serial diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FoxeerH743v1/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FoxeerH743v1/hwdef.dat index 93cb9a299d..db9ea7f579 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FoxeerH743v1/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FoxeerH743v1/hwdef.dat @@ -172,3 +172,5 @@ define HAL_COMPASS_AUTO_ROT_DEFAULT 2 define HAL_DEFAULT_INS_FAST_SAMPLE 1 # Motor order implies Betaflight/X for standard ESCs define HAL_FRAME_TYPE_DEFAULT 12 + +define AP_SCRIPTING_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat index 977a1be132..c6d226991b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat @@ -210,6 +210,7 @@ define HAL_DEFAULT_CPORT 1 define CONFIGURE_PPS_PIN TRUE define AP_PERIPH_HAVE_LED TRUE +define AP_SCRIPTING_ENABLED 1 define SCRIPTING_HEAP_SIZE (64*1024) define GPS_MOVING_BASELINE 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat index 58405b8711..5182038ebd 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat @@ -160,3 +160,5 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin define STM32_PWM_USE_ADVANCED TRUE define DEFAULT_NTF_LED_TYPES 257 + +define AP_SCRIPTING_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7v2/hwdef.dat index 3165fb84c1..088e764034 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7v2/hwdef.dat @@ -70,3 +70,5 @@ define HAL_LOGGING_DATAFLASH_ENABLED 1 define HAL_LOGGING_DATAFLASH_DRIVER AP_Logger_W25N01GV define DEFAULT_NTF_LED_TYPES 257 + +define AP_SCRIPTING_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat index 3f0d57058d..addcbbbcee 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat @@ -194,3 +194,5 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin define STM32_PWM_USE_ADVANCED TRUE define DEFAULT_NTF_LED_TYPES 257 + +define AP_SCRIPTING_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef.dat index 4d0db1ed72..ef7bcef973 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef.dat @@ -49,7 +49,7 @@ define HAL_USE_RTC FALSE define HAL_NO_RCIN_THREAD -env DISABLE_SCRIPTING 1 +define AP_SCRIPTING_ENABLED 0 MAIN_STACK 0x2000 PROCESS_STACK 0x6000 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat index be7f3b1b10..5b1a2781f9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat @@ -54,7 +54,7 @@ define HAL_DISABLE_ADC_DRIVER FALSE define CAN_APP_NODE_NAME "org.ardupilot.Pixracer_periph" -env DISABLE_SCRIPTING 1 +define AP_SCRIPTING_ENABLED 0 MAIN_STACK 0x2000 PROCESS_STACK 0x6000 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat index 150169fd89..7668e12020 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat @@ -196,3 +196,5 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin define STM32_PWM_USE_ADVANCED TRUE define DEFAULT_NTF_LED_TYPES 257 + +define AP_SCRIPTING_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py index 9c09113a6a..ce6d9b9e52 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py +++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py @@ -919,7 +919,6 @@ class ChibiOSHWDef(object): else: f.write('#define HAL_USE_SDC FALSE\n') self.build_flags.append('USE_FATFS=no') - self.env_vars['DISABLE_SCRIPTING'] = True if 'OTG1' in self.bytype: if self.get_mcu_config('STM32_OTG2_IS_OTG1', False) is not None: f.write('#define STM32_USB_USE_OTG2 TRUE\n') @@ -3262,6 +3261,10 @@ INCLUDE common.ld #define HAL_PROXIMITY_ENABLED 0 #endif +#ifndef AP_SCRIPTING_ENABLED +#define AP_SCRIPTING_ENABLED 0 +#endif + // end AP_Periph defaults ''') diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat index c51b54aa88..2db25bb7b3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat @@ -205,4 +205,7 @@ define AP_LTM_TELEM_ENABLED 0 // no buttons on SkyViper: define HAL_BUTTON_ENABLED 0 +// disable scripting on SkyViper (should we enable this?) +define AP_SCRIPTING_ENABLED 0 + AUTOBUILD_TARGETS Copter