diff --git a/Tools/serial/generate_config.py b/Tools/serial/generate_config.py index 099091d..7fc71f5 100755 --- a/Tools/serial/generate_config.py +++ b/Tools/serial/generate_config.py @@ -87,22 +87,22 @@ serial_ports = { "TEL1": { # telemetry link "label": "TELEM 1", "index": 101, - "default_baudrate": 57600, + "default_baudrate": 9600, }, "TEL2": { # companion port "label": "TELEM 2", "index": 102, - "default_baudrate": 921600, + "default_baudrate": 9600, }, "TEL3": { "label": "TELEM 3", "index": 103, - "default_baudrate": 57600, + "default_baudrate": 9600, }, "TEL4": { "label": "TELEM/SERIAL 4", "index": 104, - "default_baudrate": 57600, + "default_baudrate": 9600, }, # GPS Ports diff --git a/boards/px4/fts-proto/firmware.prototype b/boards/px4/fts-proto/firmware.prototype index 981905d..1475442 100644 --- a/boards/px4/fts-proto/firmware.prototype +++ b/boards/px4/fts-proto/firmware.prototype @@ -1,5 +1,5 @@ { - "board_id": 56, + "board_id": 0, "magic": "PX4FWv1", "description": "Firmware for the Nimbus FTS-CAN systems", "image": "", diff --git a/boards/px4/fts-proto/init/rc.board_defaults b/boards/px4/fts-proto/init/rc.board_defaults index 3639aaa..3fa7922 100644 --- a/boards/px4/fts-proto/init/rc.board_defaults +++ b/boards/px4/fts-proto/init/rc.board_defaults @@ -5,4 +5,34 @@ param set-default FTS_TYPE 1 -param set-default FTS_SIM_MODE 0 \ No newline at end of file +param set-default FTS_SIM_MODE 0 + +param set-default SYS_USE_IO 0 +param set-default SENS_IMU_MODE 0 + +# FC INTERFACE (9600 BAUD) +# MAV_0 - TELEM 1 - TTYS5 - UART7 (PE7/PE8) +param set-default MAV_0_BROADCAST 1 +param set-default MAV_0_CONFIG 101 +param set-default MAV_0_FORWARD 0 +param set-default MAV_0_MODE 1 +param set-default MAV_0_RADIO_CTL 0 +param set-default MAV_0_RATE 2400 + +# GROUND FTS INTERFACE (9600 BAUD) +# MAV_1 - TELEM 2 - TTYS3 - UART5 (PD2/PC12) +param set-default MAV_1_BROADCAST 1 +param set-default MAV_1_CONFIG 102 +param set-default MAV_1_FORWARD 0 +param set-default MAV_1_MODE 1 +param set-default MAV_1_RADIO_CTL 0 +param set-default MAV_1_RATE 2400 + +# AUTO FTS INTERFACE (9600 BAUD) +# MAV_2 - TELEM 3 - TTYS1 - USART2 (PA3/PD5) +param set-default MAV_2_BROADCAST 1 +param set-default MAV_2_CONFIG 103 +param set-default MAV_2_FORWARD 0 +param set-default MAV_2_MODE 1 +param set-default MAV_2_RADIO_CTL 0 +param set-default MAV_2_RATE 2400 diff --git a/boards/px4/fts-proto/init/rc.board_sensors b/boards/px4/fts-proto/init/rc.board_sensors index 4be6269..f15cefa 100644 --- a/boards/px4/fts-proto/init/rc.board_sensors +++ b/boards/px4/fts-proto/init/rc.board_sensors @@ -3,19 +3,3 @@ # PX4 FTS-CAN specific board sensors init #------------------------------------------------------------------------------ board_adc start - -# Internal SPI bus BMI055 accel/gyro -#bmi055 -A -R 4 -s start -#bmi055 -G -R 4 -s start - -# Internal SPI bus ICM42688p -#icm42688p -R 6 -s start - -# Internal barometer on I2C4 (The same bus is also exposed externally, and therefore marked as external) -#ms5611 -X -b 4 -a 0x77 start - -# Internal compass on IMU I2C4 (The same bus is also exposed externally, and therefore marked as external) -#ist8310 -X -b 4 -a 0xc start - -# External compass on GPS/I2C1 (the 3rd external bus): standard Holybro Pixhawk 4 or CUAV V5 GPS/compass puck (with lights, safety button, and buzzer) -#ist8310 -X -b 1 -R 10 start diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 40f6cbf..59bdf46 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -1842,6 +1842,9 @@ Mavlink::configure_streams_to_default(const char *configure_single_stream) configure_stream_local("UAVIONIX_ADSB_OUT_DYNAMIC", 5.0f); break; + case MAVLINK_MODE_FTS: + break; + default: ret = -1; break; diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index 85c0361..b4611da 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -211,6 +211,7 @@ public: MAVLINK_MODE_GIMBAL, MAVLINK_MODE_ONBOARD_LOW_BANDWIDTH, MAVLINK_MODE_UAVIONIX, + MAVLINK_MODE_FTS, MAVLINK_MODE_COUNT };