Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-27 11:08:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ChibiOS: move from HAL_NO_GCS to HAL_GCS_ENABLED

Browse Source
This commit is contained in:
Peter Barker 2021-08-18 21:42:17 +10:00 committed by Peter Barker
parent 6d615a3e16
commit 1bd62362a4
24 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_HAL_ChibiOS/Util.cpp
View File

@ -227,11 +227,15 @@ uint64_t Util::get_hw_rtc() const
#if !defined(HAL_NO_FLASH_SUPPORT) && !defined(HAL_NO_ROMFS_SUPPORT)
#if defined(HAL_NO_GCS) || defined(HAL_BOOTLOADER_BUILD)
#define Debug(fmt, args ...) do { hal.console->printf(fmt, ## args); } while (0)
#else
#ifndef HAL_BOOTLOADER_BUILD
#include <GCS_MAVLink/GCS.h>
#if HAL_GCS_ENABLED
#define Debug(fmt, args ...) do { gcs().send_text(MAV_SEVERITY_INFO, fmt, ## args); } while (0)
#endif // HAL_GCS_ENABLED
#endif // ifndef HAL_BOOT_LOADER_BUILD
#ifndef Debug
#define Debug(fmt, args ...) do { hal.console->printf(fmt, ## args); } while (0)
#endif
Util::FlashBootloader Util::flash_bootloader()

2
libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat
View File

@ -106,7 +106,7 @@ define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.birdcandy"
define HAL_NO_GCS
define HAL_GCS_ENABLED 0
define HAL_NO_LOGGING
define HAL_NO_MONITOR_THREAD

1
libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat
View File

@ -133,7 +133,6 @@ define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.cuav_gps"
define HAL_NO_GCS
define HAL_NO_MONITOR_THREAD
define HAL_MINIMIZE_FEATURES 0

1
libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef.dat
View File

@ -39,7 +39,6 @@ define GPS_MAX_RECEIVERS 1
define GPS_MAX_INSTANCES 1
define HAL_COMPASS_MAX_SENSORS 1
define HAL_NO_GCS
define HAL_NO_MONITOR_THREAD
define HAL_DISABLE_LOOP_DELAY

1
libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef.dat
View File

@ -35,7 +35,6 @@ define GPS_MAX_RECEIVERS 1
define GPS_MAX_INSTANCES 1
define HAL_COMPASS_MAX_SENSORS 1
define HAL_NO_GCS
define HAL_NO_MONITOR_THREAD
define HAL_DISABLE_LOOP_DELAY

1
libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat
View File

@ -129,7 +129,6 @@ define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.FreeflyRTK"
define HAL_NO_GCS
define HAL_NO_MONITOR_THREAD
define HAL_MINIMIZE_FEATURES 0

1
libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef.dat
View File

@ -137,7 +137,6 @@ define HAL_UART_MIN_RX_SIZE 128
define HAL_UART_STACK_SIZE 0x200
define HAL_NO_GCS
define HAL_NO_MONITOR_THREAD
define HAL_MINIMIZE_FEATURES 0

2
libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef.dat
View File

@ -26,7 +26,7 @@ FLASH_SIZE_KB 2048
# env AP_PERIPH 1
# define HAL_BUILD_AP_PERIPH
# define HAL_NO_GCS
# define HAL_GCS_ENABLED 0
# bootloader is installed at zero offset
FLASH_RESERVE_START_KB 128

2
libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef.dat
View File

@ -26,7 +26,7 @@ FLASH_SIZE_KB 2048
# env AP_PERIPH 1
# define HAL_BUILD_AP_PERIPH
# define HAL_NO_GCS
# define HAL_GCS_ENABLED 0
# bootloader is installed at zero offset
FLASH_RESERVE_START_KB 128

2
libraries/AP_HAL_ChibiOS/hwdef/HereCommon/hwdef.inc
View File

@ -81,4 +81,4 @@ define STM32_ADC_USE_ADC1 FALSE
define HAL_DISABLE_ADC_DRIVER TRUE
define HAL_CAN_DEFAULT_NODE_ID 0
define HAL_NO_GCS
define HAL_GCS_ENABLED 0

1
libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat
View File

@ -40,7 +40,6 @@ SERIAL_ORDER OTG1 UART7
define HAL_NO_LOGGING TRUE
define HAL_NO_MONITOR_THREAD
define HAL_NO_GCS
# USART3 F9
PD9 USART3_RX USART3

2
libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat
View File

@ -59,7 +59,7 @@ define CONFIGURE_PPS_PIN TRUE
FLASH_RESERVE_START_KB 256
define GPS_UBLOX_MOVING_BASELINE TRUE
# define HAL_NO_LOGGING TRUE
define HAL_GCS_ENABLED 1
define HAL_LOGGING_ENABLED TRUE
define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS"
define HAL_NO_MONITOR_THREAD

1
libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef.dat
View File

@ -111,7 +111,6 @@ define HAL_UART_MIN_RX_SIZE 128
define HAL_UART_STACK_SIZE 0x200
define HAL_NO_GCS
define HAL_NO_MONITOR_THREAD
define HAL_MINIMIZE_FEATURES 0

1
libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat
View File

@ -144,7 +144,6 @@ define HAL_CAN_DEFAULT_NODE_ID 0
define CAN_APP_NODE_NAME "org.ardupilot.HolybroGPS"
define HAL_NO_GCS
define HAL_NO_LOGGING
define HAL_NO_MONITOR_THREAD

1
libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef.dat
View File

@ -49,7 +49,6 @@ define HAL_PERIPH_ADSB_PORT_DEFAULT 3
# default ADSB off by setting 0 baudrate
define HAL_PERIPH_ADSB_BAUD_DEFAULT 0
define HAL_NO_GCS
define HAL_NO_MONITOR_THREAD
define HAL_DISABLE_LOOP_DELAY
define HAL_USE_RTC FALSE

1
libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat
View File

@ -39,7 +39,6 @@ define GPS_MAX_RECEIVERS 1
define GPS_MAX_INSTANCES 1
define HAL_COMPASS_MAX_SENSORS 1
define HAL_NO_GCS
define HAL_NO_MONITOR_THREAD
define HAL_DISABLE_LOOP_DELAY

1
libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat
View File

@ -103,7 +103,6 @@ define HAL_UART_MIN_RX_SIZE 128
define HAL_UART_STACK_SIZE 256
define STORAGE_THD_WA_SIZE 512
define HAL_NO_GCS
define HAL_NO_MONITOR_THREAD
define HAL_MINIMIZE_FEATURES 0

1
libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat
View File

@ -155,7 +155,6 @@ define HAL_BARO_ALLOW_INIT_NO_BARO
# use DNA
define HAL_CAN_DEFAULT_NODE_ID 0
define HAL_NO_GCS
define HAL_NO_MONITOR_THREAD
define HAL_PERIPH_ENABLE_GPS

1
libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.inc
View File

@ -104,7 +104,6 @@ define HAL_UART_STACK_SIZE 256
define STORAGE_THD_WA_SIZE 300
define IO_THD_WA_SIZE 300
define HAL_NO_GCS
define HAL_NO_MONITOR_THREAD
define HAL_MINIMIZE_FEATURES 0

2
libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef.dat
View File

@ -81,8 +81,6 @@ define HAL_UART_STACK_SIZE 512
define STORAGE_THD_WA_SIZE 512
define IO_THD_WA_SIZE 512
define HAL_NO_GCS
define HAL_MINIMIZE_FEATURES 0
define HAL_BUILD_AP_PERIPH

2
libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.inc
View File

@ -104,8 +104,6 @@ define HAL_UART_STACK_SIZE 0x300
define STORAGE_THD_WA_SIZE 512
define IO_THD_WA_SIZE 512
define HAL_NO_GCS
define HAL_MINIMIZE_FEATURES 0
define HAL_BUILD_AP_PERIPH

1
libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat
View File

@ -49,7 +49,6 @@ define DMA_RESERVE_SIZE 0
define HAL_DISABLE_LOOP_DELAY
define HAL_NO_GCS
define HAL_NO_MONITOR_THREAD
define HAL_MINIMIZE_FEATURES 0

1
libraries/AP_HAL_ChibiOS/hwdef/mRo-M10095/hwdef.dat
View File

@ -86,7 +86,6 @@ define HAL_DISABLE_LOOP_DELAY
PA11 CAN1_RX CAN1
PA12 CAN1_TX CAN1
define HAL_NO_GCS
define HAL_NO_MONITOR_THREAD
define HAL_MINIMIZE_FEATURES 0

3
libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
View File

@ -2358,6 +2358,9 @@ def add_apperiph_defaults(f):
#ifndef HAL_LOGGING_ENABLED
#define HAL_LOGGING_ENABLED 0
#endif
#ifndef HAL_GCS_ENABLED
#define HAL_GCS_ENABLED 0
#endif
// default to no protocols, AP_Periph enables with params
#define HAL_SERIAL1_PROTOCOL -1
#define HAL_SERIAL2_PROTOCOL -1