diff --git a/libraries/AP_HAL_F4Light/boards/f4light_Airbot/board.h b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/board.h index 59fa68c609..ae56103489 100644 --- a/libraries/AP_HAL_F4Light/boards/f4light_Airbot/board.h +++ b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/board.h @@ -156,6 +156,12 @@ # define BOARD_BATTERY_CURR_PIN 7 // Battery current on A1 (PC1) D7 # define BOARD_SONAR_SOURCE_ANALOG_PIN 254 +# define HAL_BATT_VOLT_PIN 8 // ChibiOS compatible defines +# define HAL_BATT_CURR_PIN 7 +# define HAL_BATT_VOLT_SCALE 10.1 +# define HAL_BATT_CURR_SCALE 17 + + #define BOARD_USB_DMINUS 108 diff --git a/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/board.h b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/board.h index 444dad8bea..e7b51d5980 100644 --- a/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/board.h +++ b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/board.h @@ -157,6 +157,12 @@ # define BOARD_BATTERY_CURR_PIN 7 // Battery current on A1 (PC1) D7 # define BOARD_SONAR_SOURCE_ANALOG_PIN 254 +# define HAL_BATT_VOLT_PIN 8 // ChibiOS compatible defines +# define HAL_BATT_CURR_PIN 8 +# define HAL_BATT_VOLT_SCALE 10.1 +# define HAL_BATT_CURR_SCALE 17 + + #define BOARD_USB_DMINUS 108 #define BOARD_SBUS_UART 1 // can use some UART as hardware inverted input diff --git a/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_CTR/board.h b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_CTR/board.h index 6c6499bca1..7c90e83450 100644 --- a/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_CTR/board.h +++ b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_CTR/board.h @@ -159,6 +159,12 @@ # define BOARD_BATTERY_CURR_PIN PC4 // Battery current # define BOARD_SONAR_SOURCE_ANALOG_PIN PB1 // rssi PB1 +# define HAL_BATT_VOLT_PIN PC5 // ChibiOS compatible defines +# define HAL_BATT_CURR_PIN PC4 +# define HAL_BATT_VOLT_SCALE 10.1 +# define HAL_BATT_CURR_SCALE 17 + + #define BOARD_USB_DMINUS 108 diff --git a/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_CTR/support/UPLOAD-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_CTR/support/UPLOAD-STLINK.sh index 32ee6f3d2e..1fa504c3e1 100755 --- a/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_CTR/support/UPLOAD-STLINK.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_CTR/support/UPLOAD-STLINK.sh @@ -1,9 +1,6 @@ #!/bin/sh -# production binary without bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/f4light_Revolution.bin 0x08010000 - -#bare metal binary or binary with bootloader +#binary with bootloader /usr/local/stlink/st-flash --reset write ../../../../../ArduCopter/f4light_MatekF405_CTR.bin 0x08010000 && \ /usr/local/stlink/st-util -m diff --git a/libraries/AP_HAL_F4Light/boards/f4light_Revolution/board.h b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/board.h index 652671f902..ae7bd27a55 100644 --- a/libraries/AP_HAL_F4Light/boards/f4light_Revolution/board.h +++ b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/board.h @@ -165,6 +165,12 @@ # define BOARD_BATTERY_CURR_PIN 7 // Battery current on A1 (PC1) D7 # define BOARD_SONAR_SOURCE_ANALOG_PIN 254 // no sonar by default +# define HAL_BATT_VOLT_PIN 8 // ChibiOS compatible defines +# define HAL_BATT_CURR_PIN 7 +# define HAL_BATT_VOLT_SCALE 10.1 +# define HAL_BATT_CURR_SCALE 17 + + #define BOARD_USB_DMINUS 108 //#define BOARD_NRF_NAME "nrf24" @@ -179,11 +185,11 @@ #define SERVO_PIN_6 47 // PA0 // input pins as servo outputs -#define SERVO_PIN_7 5, // PB15 CH2_IN - PPM2 -#define SERVO_PIN_8 12, // PC6 CH3_IN UART6 -#define SERVO_PIN_9 13, // PC7 CH4_IN UART6 -#define SERVO_PIN_10 14, // PC8 CH5_IN i2c -#define SERVO_PIN_11 15, // PC9 CH6_IN i2c +#define SERVO_PIN_7 5 // PB15 CH2_IN - PPM2 +#define SERVO_PIN_8 12 // PC6 CH3_IN UART6 +#define SERVO_PIN_9 13 // PC7 CH4_IN UART6 +#define SERVO_PIN_10 14 // PC8 CH5_IN i2c +#define SERVO_PIN_11 15 // PC9 CH6_IN i2c #define MOTOR_LAYOUT_DEFAULT 0 diff --git a/libraries/AP_HAL_F4Light/boards/f4light_Revolution_EE128/board.h b/libraries/AP_HAL_F4Light/boards/f4light_Revolution_EE128/board.h index 3cae1a6097..02a8e67f9b 100644 --- a/libraries/AP_HAL_F4Light/boards/f4light_Revolution_EE128/board.h +++ b/libraries/AP_HAL_F4Light/boards/f4light_Revolution_EE128/board.h @@ -171,6 +171,13 @@ # define BOARD_BATTERY_CURR_PIN 7 // Battery current on A1 (PC1) D7 # define BOARD_SONAR_SOURCE_ANALOG_PIN 254 // no sonar by default + +# define HAL_BATT_VOLT_PIN 8 // ChibiOS compatible defines +# define HAL_BATT_CURR_PIN 7 +# define HAL_BATT_VOLT_SCALE 10.1 +# define HAL_BATT_CURR_SCALE 17 + + #define BOARD_USB_DMINUS 108 //#define BOARD_NRF_NAME "nrf24" @@ -185,11 +192,11 @@ #define SERVO_PIN_6 47 // PA0 // input pins as servo outputs -#define SERVO_PIN_7 5, // PB15 CH2_IN - PPM2 -#define SERVO_PIN_8 12, // PC6 CH3_IN UART6 -#define SERVO_PIN_9 13, // PC7 CH4_IN UART6 -#define SERVO_PIN_10 14, // PC8 CH5_IN i2c -#define SERVO_PIN_11 15, // PC9 CH6_IN i2c +#define SERVO_PIN_7 5 // PB15 CH2_IN - PPM2 +#define SERVO_PIN_8 12 // PC6 CH3_IN UART6 +#define SERVO_PIN_9 13 // PC7 CH4_IN UART6 +#define SERVO_PIN_10 14 // PC8 CH5_IN i2c +#define SERVO_PIN_11 15 // PC9 CH6_IN i2c #define MOTOR_LAYOUT_DEFAULT 0 #define USE_SERIAL_4WAY_BLHELI_INTERFACE diff --git a/libraries/AP_HAL_F4Light/boards/f4light_Revolution_SD/board.h b/libraries/AP_HAL_F4Light/boards/f4light_Revolution_SD/board.h index d9e735d503..441d883787 100644 --- a/libraries/AP_HAL_F4Light/boards/f4light_Revolution_SD/board.h +++ b/libraries/AP_HAL_F4Light/boards/f4light_Revolution_SD/board.h @@ -166,6 +166,13 @@ # define BOARD_BATTERY_CURR_PIN 7 // Battery current on A1 (PC1) D7 # define BOARD_SONAR_SOURCE_ANALOG_PIN 254 // no sonar by default + +# define HAL_BATT_VOLT_PIN 8 // ChibiOS compatible defines +# define HAL_BATT_CURR_PIN 7 +# define HAL_BATT_VOLT_SCALE 10.1 +# define HAL_BATT_CURR_SCALE 17 + + #define BOARD_USB_DMINUS 108 //#define BOARD_NRF_NAME "nrf24" @@ -180,11 +187,11 @@ #define SERVO_PIN_6 47 // PA0 // input pins as servo outputs -#define SERVO_PIN_7 5, // PB15 CH2_IN - PPM2 -#define SERVO_PIN_8 12, // PC6 CH3_IN UART6 -#define SERVO_PIN_9 13, // PC7 CH4_IN UART6 -#define SERVO_PIN_10 14, // PC8 CH5_IN i2c -#define SERVO_PIN_11 15, // PC9 CH6_IN i2c +#define SERVO_PIN_7 5 // PB15 CH2_IN - PPM2 +#define SERVO_PIN_8 12 // PC6 CH3_IN UART6 +#define SERVO_PIN_9 13 // PC7 CH4_IN UART6 +#define SERVO_PIN_10 14 // PC8 CH5_IN i2c +#define SERVO_PIN_11 15 // PC9 CH6_IN i2c #define MOTOR_LAYOUT_DEFAULT 0 diff --git a/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/board.h b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/board.h index ad7394a5bf..3835c2fcb3 100644 --- a/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/board.h +++ b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/board.h @@ -32,8 +32,8 @@ #define BOARD_BUZZER_PIN 105 // PB4 #define BUZZER_PWM_HZ 3800 // freq for passive buzzer -#define HAL_BUZZER_ON 0 -#define HAL_BUZZER_OFF 1 +#define HAL_BUZZER_ON 1 +#define HAL_BUZZER_OFF 0 #define BOARD_NR_USARTS 5 #define BOARD_USART1_TX_PIN 23 @@ -152,6 +152,12 @@ # define BOARD_BATTERY_CURR_PIN 7 // Battery current on A1 (PC1) D7 # define BOARD_SONAR_SOURCE_ANALOG_PIN 254 +# define HAL_BATT_VOLT_PIN 8 // ChibiOS compatible defines +# define HAL_BATT_CURR_PIN 7 +# define HAL_BATT_VOLT_SCALE 10.1 +# define HAL_BATT_CURR_SCALE 17 + + #define BOARD_USB_DMINUS 108 #define BOARD_SBUS_UART 1 // can use some UART as hardware inverted input diff --git a/libraries/AP_HAL_F4Light/support/MMM.sh b/libraries/AP_HAL_F4Light/support/MMM.sh index 17fdb36ab3..f74f7deda3 100755 --- a/libraries/AP_HAL_F4Light/support/MMM.sh +++ b/libraries/AP_HAL_F4Light/support/MMM.sh @@ -64,7 +64,7 @@ make_plane(){ cd $ROOT zip -r latest.zip Release - git add latest.zip +# git add latest.zip )