From 95281e5c17bf1caf330b37d5240be283bd4a125d Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 3 Apr 2024 20:01:28 +1100 Subject: [PATCH] hwdef: turn monior thread back on on some boards most of these boards probably don't need it, but to make a PR no-binary-output... --- libraries/AP_HAL_ChibiOS/hwdef/ARK_CANNODE/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/BotBloxSwitch/hwdef.dat | 2 ++ libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef.dat | 2 ++ libraries/AP_HAL_ChibiOS/hwdef/CubePilot-PPPGW/hwdef.dat | 2 ++ libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/Nucleo-G491/hwdef.dat | 1 + .../AP_HAL_ChibiOS/hwdef/Sierra-PrecisionPoint/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef.dat | 2 ++ libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.inc | 2 ++ libraries/AP_HAL_ChibiOS/hwdef/kha_eth/hwdef.dat | 2 ++ libraries/AP_HAL_ChibiOS/hwdef/mRoCANPWM-M10126/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/mRoKitCANrevC/hwdef.dat | 4 +++- libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_iofirmware.h | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/sw-boom-f407/hwdef.dat | 2 ++ libraries/AP_HAL_ChibiOS/hwdef/sw-nav-f405/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/sw-spar-f407/hwdef.dat | 1 + 18 files changed, 30 insertions(+), 1 deletion(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ARK_CANNODE/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ARK_CANNODE/hwdef.dat index 89400cd90b..e82ea526d0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ARK_CANNODE/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ARK_CANNODE/hwdef.dat @@ -131,3 +131,4 @@ define AP_PERIPH_RANGEFINDER_PORT_DEFAULT -1 define HAL_RCIN_THREAD_ENABLED 1 define HAL_SCHEDULER_LOOP_DELAY_ENABLED 1 +define HAL_MONITOR_THREAD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef.dat index fee3e51c82..a75dcba475 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef.dat @@ -124,3 +124,4 @@ define HAL_PERIPH_GPS_PORT_DEFAULT 1 define HAL_SERIAL_ESC_COMM_ENABLED 1 define HAL_RCIN_THREAD_ENABLED 1 define HAL_SCHEDULER_LOOP_DELAY_ENABLED 1 +define HAL_MONITOR_THREAD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef.dat index 41f51e9e97..172deb9b6c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef.dat @@ -135,3 +135,4 @@ define HAL_PERIPH_GPS_PORT_DEFAULT 1 define HAL_SERIAL_ESC_COMM_ENABLED 1 define HAL_RCIN_THREAD_ENABLED 1 define HAL_SCHEDULER_LOOP_DELAY_ENABLED 1 +define HAL_MONITOR_THREAD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BotBloxSwitch/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BotBloxSwitch/hwdef.dat index f277e0068d..e00fde56eb 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BotBloxSwitch/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BotBloxSwitch/hwdef.dat @@ -99,3 +99,5 @@ define AP_SCRIPTING_ENABLED 1 define AP_FILESYSTEM_ROMFS_ENABLED 1 include ../include/network_PPPGW.inc + +define HAL_MONITOR_THREAD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef.dat index 4637d12cc7..f0d426ad8e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-CANMod/hwdef.dat @@ -86,3 +86,5 @@ define AP_FILESYSTEM_ROMFS_ENABLED 1 # undefine to disable. Use -1 to allow on all ports, otherwise serial number index defined in SERIAL_ORDER starting at 0 define HAL_PERIPH_LISTEN_FOR_SERIAL_UART_REBOOT_CMD_PORT 0 ################################# + +define HAL_MONITOR_THREAD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-PPPGW/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-PPPGW/hwdef.dat index bf18499b1e..d274c070a1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-PPPGW/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-PPPGW/hwdef.dat @@ -22,3 +22,5 @@ define HAL_WITH_MCU_MONITORING 1 # MCU_CLOCKRATE_MHZ 200 include ../include/network_PPPGW.inc + +define HAL_MONITOR_THREAD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef.dat index 3a2959b133..c0e8b3a72c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef.dat @@ -136,3 +136,4 @@ define AP_SERIALLED_ENABLED 1 define HAL_SERIAL_ESC_COMM_ENABLED 1 define HAL_RCIN_THREAD_ENABLED 1 define HAL_SCHEDULER_LOOP_DELAY_ENABLED 1 +define HAL_MONITOR_THREAD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-G491/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-G491/hwdef.dat index 2334c17478..6349392a21 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-G491/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-G491/hwdef.dat @@ -72,3 +72,4 @@ define STM32_ADC_USE_ADC1 TRUE PB11 BAT_CURR_SENS ADC1 SCALE(1) define HAL_RCIN_THREAD_ENABLED 1 +define HAL_MONITOR_THREAD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-PrecisionPoint/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-PrecisionPoint/hwdef.dat index e6bd38b83c..c9a7dd156f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-PrecisionPoint/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-PrecisionPoint/hwdef.dat @@ -148,3 +148,4 @@ PC6 USB_SEL OUTPUT PUSHPULL SPEED_LOW HIGH define HAL_SERIAL_ESC_COMM_ENABLED 1 define HAL_RCIN_THREAD_ENABLED 1 define HAL_SCHEDULER_LOOP_DELAY_ENABLED 1 +define HAL_MONITOR_THREAD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef.dat index eee005173a..ffb9ae90aa 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef.dat @@ -142,3 +142,5 @@ define GPS_MAX_RATE_MS 200 # 10" DLVR sensor by default define HAL_AIRSPEED_TYPE_DEFAULT 9 define AIRSPEED_MAX_SENSORS 1 + +define HAL_MONITOR_THREAD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.inc b/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.inc index bc022599a8..9306a674b1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.inc +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.inc @@ -122,3 +122,5 @@ env ROMFS_UNCOMPRESSED True # reduce the number of CAN RX Buffer define HAL_CAN_RX_QUEUE_SIZE 64 + +define HAL_MONITOR_THREAD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/kha_eth/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/kha_eth/hwdef.dat index b8d89d3226..408ccc13af 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/kha_eth/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/kha_eth/hwdef.dat @@ -147,4 +147,6 @@ DMA_NOSHARE USART1* USART2* CAN1* # bootloader embedding / bootloader flashing not available define AP_BOOTLOADER_FLASHING_ENABLED 0 +define HAL_MONITOR_THREAD_ENABLED 1 + AUTOBUILD_TARGETS None diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoCANPWM-M10126/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoCANPWM-M10126/hwdef.dat index 91b1d34330..5531a5e182 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoCANPWM-M10126/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoCANPWM-M10126/hwdef.dat @@ -89,3 +89,4 @@ define HAL_SERIAL_ESC_COMM_ENABLED 1 define HAL_SUPPORT_RCOUT_SERIAL 1 define HAL_WITH_ESC_TELEM 1 +define HAL_MONITOR_THREAD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoKitCANrevC/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoKitCANrevC/hwdef.dat index a44f8a39f3..046df2745a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoKitCANrevC/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoKitCANrevC/hwdef.dat @@ -27,4 +27,6 @@ define HAL_PERIPH_ENABLE_AIRSPEED # Safety button PC13 SAFE_BUTTON INPUT PULLUP # Button is active LOW -define HAL_SAFE_BUTTON_ON 0 \ No newline at end of file +define HAL_SAFE_BUTTON_ON 0 + +define HAL_MONITOR_THREAD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_iofirmware.h b/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_iofirmware.h index 64e913c6f6..bdb08a7310 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_iofirmware.h +++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_iofirmware.h @@ -69,3 +69,7 @@ #ifndef HAL_SCHEDULER_LOOP_DELAY_ENABLED #define HAL_SCHEDULER_LOOP_DELAY_ENABLED 0 #endif + +#ifndef HAL_MONITOR_THREAD_ENABLED +#define HAL_MONITOR_THREAD_ENABLED 0 +#endif diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sw-boom-f407/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sw-boom-f407/hwdef.dat index 544340b49f..9b90331d95 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/sw-boom-f407/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/sw-boom-f407/hwdef.dat @@ -115,5 +115,7 @@ define AP_TEMPERATURE_SENSOR_MAX_INSTANCES 1 define AP_SCRIPTING_ENABLED 1 define AP_FILESYSTEM_ROMFS_ENABLED 1 +define HAL_MONITOR_THREAD_ENABLED 1 + # don't build on firmware.ardupilot.org AUTOBUILD_TARGETS None diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sw-nav-f405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sw-nav-f405/hwdef.dat index 22caeff548..18e17fe682 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/sw-nav-f405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/sw-nav-f405/hwdef.dat @@ -81,6 +81,7 @@ define DISCRETE_RGB_POLARITY true define HAL_RCIN_THREAD_ENABLED 1 define HAL_SCHEDULER_LOOP_DELAY_ENABLED 1 +define HAL_MONITOR_THREAD_ENABLED 1 # don't build on firmware.ardupilot.org AUTOBUILD_TARGETS None diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sw-spar-f407/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sw-spar-f407/hwdef.dat index da4d3c3340..0e1a5844dd 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/sw-spar-f407/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/sw-spar-f407/hwdef.dat @@ -126,3 +126,4 @@ AUTOBUILD_TARGETS None define HAL_SERIAL_ESC_COMM_ENABLED 1 define HAL_RCIN_THREAD_ENABLED 1 define HAL_SCHEDULER_LOOP_DELAY_ENABLED 1 +define HAL_MONITOR_THREAD_ENABLED 1