AP_HAL_ChibiOS/hwdef: update JFB110 board definition

jfbblue0922 · Dec 21, 2023 · 8d2f414 · 8d2f414
1 parent 79c5cae
commit 8d2f414
Show file tree

Hide file tree

Showing 25 changed files with 124 additions and 48 deletions.
diff --git a/build/JFB110/bin/antennatracker b/build/JFB110/bin/antennatracker
diff --git a/build/JFB110/bin/antennatracker.apj b/build/JFB110/bin/antennatracker.apj
diff --git a/build/JFB110/bin/antennatracker.bin b/build/JFB110/bin/antennatracker.bin
diff --git a/build/JFB110/bin/arducopter b/build/JFB110/bin/arducopter
diff --git a/build/JFB110/bin/arducopter-heli b/build/JFB110/bin/arducopter-heli
diff --git a/build/JFB110/bin/arducopter-heli.apj b/build/JFB110/bin/arducopter-heli.apj
diff --git a/build/JFB110/bin/arducopter-heli.bin b/build/JFB110/bin/arducopter-heli.bin
diff --git a/build/JFB110/bin/arducopter.apj b/build/JFB110/bin/arducopter.apj
diff --git a/build/JFB110/bin/arducopter.bin b/build/JFB110/bin/arducopter.bin
diff --git a/build/JFB110/bin/arduplane b/build/JFB110/bin/arduplane
diff --git a/build/JFB110/bin/arduplane.apj b/build/JFB110/bin/arduplane.apj
diff --git a/build/JFB110/bin/arduplane.bin b/build/JFB110/bin/arduplane.bin
diff --git a/build/JFB110/bin/ardurover b/build/JFB110/bin/ardurover
diff --git a/build/JFB110/bin/ardurover.apj b/build/JFB110/bin/ardurover.apj
diff --git a/build/JFB110/bin/ardurover.bin b/build/JFB110/bin/ardurover.bin
diff --git a/build/JFB110/bin/ardusub b/build/JFB110/bin/ardusub
diff --git a/build/JFB110/bin/ardusub.apj b/build/JFB110/bin/ardusub.apj
diff --git a/build/JFB110/bin/ardusub.bin b/build/JFB110/bin/ardusub.bin
diff --git a/build/JFB110/bin/blimp b/build/JFB110/bin/blimp
diff --git a/build/JFB110/bin/blimp.apj b/build/JFB110/bin/blimp.apj
diff --git a/build/JFB110/bin/blimp.bin b/build/JFB110/bin/blimp.bin
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/JFB110/README.md b/libraries/AP_HAL_ChibiOS/hwdef/JFB110/README.md
@@ -113,8 +113,8 @@ The JFB-110 has 9 analog inputs
  - ADC Pin5  -> ADC 5V Sense
  - ADC Pin11 -> ADC 3.3V Sense
  - ADC Pin10 -> RSSI voltage monitoring
- - ADC Pin12 -> ADC SPARE 1
- - ADC Pin13 -> ADC SPARE 2
+ - ADC Pin13 -> ADC SPARE 1
+ - ADC Pin12 -> ADC SPARE 2
 
 ## I2C Buses
 

diff --git a/libraries/AP_HAL_ChibiOS/hwdef/JFB110/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/JFB110/defaults.parm
@@ -1,45 +1,17 @@
 # board setting
 BRD_VBUS_MIN 4.9
 
-# setup SERIAL0(OTG1) to Mavlink2
-SERIAL0_BAUD 1500
-SERIAL0_PROTOCOL 2
-# setup SERIAL1 to telem1
-SERIAL1_BAUD 921
-SERIAL1_PROTOCOL 2
-SERIAL1_OPTIONS 0
-# setup SERIAL2 to telem2
-SERIAL2_BAUD 921
-SERIAL2_PROTOCOL 2
-SERIAL2_OPTIONS 0
-# setup SERIAL3 to GPS
-SERIAL3_BAUD 57
-SERIAL3_PROTOCOL 5
-SERIAL3_OPTIONS 0
-# setup SERIAL4 for BPort
-SERIAL4_BAUD 57
-SERIAL4_PROTOCOL -1
-SERIAL4_OPTIONS 0
 # setup SERIAL5 to RCIN
-SERIAL5_BAUD 100
 SERIAL5_PROTOCOL 23
-SERIAL5_OPTIONS 3
+
 # setup SERIAL6 to SBUS OUT
 SERIAL6_BAUD 100
 SERIAL6_PROTOCOL 15
 SERIAL6_OPTIONS 3
-# setup SERIAL7 for debug console
-SERIAL7_BAUD 921
-SERIAL7_PROTOCOL 0
-SERIAL7_OPTIONS 0
-# setup SERIAL8(OTG2) to SLCAN
-SERIAL8_BAUD 1500
-SERIAL8_PROTOCOL 22
-SERIAL8_OPTIONS 0
 
 #Three IMU Setting
 EK3_IMU_MASK 7
-INS_ENABLE_MASK 7
+
 
 #RSSI Setting
 RSSI_TYPE 1

diff --git a/libraries/AP_HAL_ChibiOS/hwdef/JFB110/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/JFB110/hwdef-bl.dat
@@ -1,6 +1,5 @@
 # hw definition file for processing by chibios_hwdef.py
 # for the JFB110 hardware
-# define AP_CUSTOM_FIRMWARE_STRING "(JFB110 V1.1.0)"
 
 # board ID for firmware load
 APJ_BOARD_ID 1110

diff --git a/libraries/AP_HAL_ChibiOS/hwdef/JFB110/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/JFB110/hwdef.dat
@@ -1,6 +1,5 @@
 # hw definition file for processing by chibios_hwdef.py
 # for the JFB110 hardware
-# define AP_CUSTOM_FIRMWARE_STRING "(JFB110 V1.1.0)"
 
 # board ID for firmware load
 APJ_BOARD_ID 1110
@@ -35,10 +34,6 @@ define CONFIG_HAL_BOARD HAL_BOARD_CHIBIOS
 #define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_FMUV5
 #define HAL_CHIBIOS_ARCH_FMUV5 1
 
-# to be compatible with the px4 bootloader we need
-# to use a different RAM_MAPs
-env USE_ALT_RAM_MAP 1
-
 env OPTIMIZE -O2
 
 # order of UARTs (and USB)
@@ -296,13 +291,11 @@ NODMA I2C*
 define STM32_I2C_USE_DMA FALSE
 
 # builtin compass on JAE JFB110
+define HAL_COMPASS_DISABLE_IST8310_INTERNAL_PROBE
 define HAL_PROBE_EXTERNAL_I2C_COMPASSES
 COMPASS IST8310 I2C:ALL_INTERNAL:0x0E false ROTATION_YAW_270
 COMPASS IST8310 I2C:ALL_EXTERNAL:0x0E true  ROTATION_ROLL_180_YAW_90
 
-define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE
-define HAL_COMPASS_AUTO_ROT_DEFAULT 2
-
 # armed indication
 PB10 nARMED OUTPUT HIGH  # TP8
 
@@ -348,6 +341,7 @@ DMA_PRIORITY SDMMC* UART* USART* ADC* SPI* TIM*
 
 # enable FAT filesystem support (needs a microSD defined via SDMMC)
 define HAL_OS_FATFS_IO 1
+# for building Plane-4.3.3
 define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS"
 define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN"
 
@@ -356,9 +350,6 @@ define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN"
 # disabled
 ENABLE_DFU_BOOT 1
 
-# enable and enforce OpenDroneID
-define AP_OPENDRONEID_ENABLED 0
-
 # External watchdog gpio
 PG5 EXT_WDOG OUTPUT SPEED_VERYLOW
 define EXT_WDOG_INTERVAL_MS 50