From 855a5d28c016cc7a4d2fe662df959da1e7c42224 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 17 Jan 2024 19:38:42 +1100 Subject: [PATCH] hwdef: use a common PPPGW include and fixed missing RTC bindings in web server --- .../hwdef/CubePilot-PPPGW/hwdef.dat | 20 +--------------- .../hwdef/CubeRedPrimary-PPPGW/hwdef.dat | 24 +------------------ .../hwdef/Pixhawk6X-PPPGW/hwdef.dat | 23 +----------------- .../hwdef/include/network_PPPGW.inc | 21 ++++++++++++++++ 4 files changed, 24 insertions(+), 64 deletions(-) create mode 100644 libraries/AP_HAL_ChibiOS/hwdef/include/network_PPPGW.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-PPPGW/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-PPPGW/hwdef.dat index 630087bb60..70c50244fd 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-PPPGW/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubePilot-PPPGW/hwdef.dat @@ -14,22 +14,4 @@ PD14 UART8_CTS UART8 SERIAL_ORDER OTG1 UART8 -undef AP_RC_CHANNEL_ENABLED -define AP_RC_CHANNEL_ENABLED 0 - -define HAL_PERIPH_ENABLE_SERIAL_OPTIONS -define AP_NETWORKING_BACKEND_PPP 1 - -define AP_PERIPH_NET_PPP_PORT_DEFAULT 1 -define AP_PERIPH_NET_PPP_BAUD_DEFAULT 12500000 - -// add scripting for web interface -define AP_SCRIPTING_ENABLED 1 - -// ROMFS filesystem only -define AP_FILESYSTEM_ROMFS_ENABLED 1 - -// allow scripts to add parameters -define AP_PARAM_DYNAMIC_ENABLED 1 - -ROMFS_DIRECTORY Tools/AP_Periph/Web +include ../include/network_PPPGW.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary-PPPGW/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary-PPPGW/hwdef.dat index 1c0143664b..b718f762d5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary-PPPGW/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary-PPPGW/hwdef.dat @@ -35,31 +35,9 @@ define HAL_NO_RCIN_THREAD define HAL_GPIO_PIN_LED HAL_GPIO_PIN_FMU_LED_AMBER undef HAL_OS_FATFS_IO - undef SDMMC1 MAIN_STACK 0x2000 PROCESS_STACK 0x6000 -define HAL_CAN_DRIVER_DEFAULT 1 - -# listen for reboot command from uploader.py script -# 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 - -// use main fw bootloader -define AP_BOOTLOADER_FLASHING_ENABLED 0 - -define AP_PERIPH_NET_PPP_PORT_DEFAULT 1 -define AP_PERIPH_NET_PPP_BAUD_DEFAULT 12500000 - -// add scripting for web interface -define AP_SCRIPTING_ENABLED 1 - -// ROMFS filesystem only -define AP_FILESYSTEM_ROMFS_ENABLED 1 - -// allow scripts to add parameters -define AP_PARAM_DYNAMIC_ENABLED 1 - -ROMFS_DIRECTORY Tools/AP_Periph/Web +include ../include/network_PPPGW.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X-PPPGW/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X-PPPGW/hwdef.dat index d49206568c..f2db5f6038 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X-PPPGW/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X-PPPGW/hwdef.dat @@ -42,25 +42,4 @@ undef SDMMC1 MAIN_STACK 0x2000 PROCESS_STACK 0x6000 -define HAL_CAN_DRIVER_DEFAULT 1 - -# listen for reboot command from uploader.py script -# 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 - -// use main fw bootloader -define AP_BOOTLOADER_FLASHING_ENABLED 0 - -define AP_PERIPH_NET_PPP_PORT_DEFAULT 1 -define AP_PERIPH_NET_PPP_BAUD_DEFAULT 12500000 - -// add scripting for web interface -define AP_SCRIPTING_ENABLED 1 - -// ROMFS filesystem only -define AP_FILESYSTEM_ROMFS_ENABLED 1 - -// allow scripts to add parameters -define AP_PARAM_DYNAMIC_ENABLED 1 - -ROMFS_DIRECTORY Tools/AP_Periph/Web +include ../include/network_PPPGW.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/include/network_PPPGW.inc b/libraries/AP_HAL_ChibiOS/hwdef/include/network_PPPGW.inc new file mode 100644 index 0000000000..a0188bc94f --- /dev/null +++ b/libraries/AP_HAL_ChibiOS/hwdef/include/network_PPPGW.inc @@ -0,0 +1,21 @@ +undef AP_RC_CHANNEL_ENABLED +define AP_RC_CHANNEL_ENABLED 0 + +define HAL_PERIPH_ENABLE_RTC + +define HAL_PERIPH_ENABLE_SERIAL_OPTIONS +define AP_NETWORKING_BACKEND_PPP 1 + +define AP_PERIPH_NET_PPP_PORT_DEFAULT 1 +define AP_PERIPH_NET_PPP_BAUD_DEFAULT 12500000 + +// add scripting for web interface +define AP_SCRIPTING_ENABLED 1 + +// ROMFS filesystem only +define AP_FILESYSTEM_ROMFS_ENABLED 1 + +// allow scripts to add parameters +define AP_PARAM_DYNAMIC_ENABLED 1 + +ROMFS_DIRECTORY Tools/AP_Periph/Web