Skip to content

Commit a3f431d

Browse files
committed
AP_HAL_ChibiOS:active VM-L431-SRV-Hub-4CHP for servo VCC current monitor
1 parent bc9cadd commit a3f431d

3 files changed

Lines changed: 29 additions & 7 deletions

File tree

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
ACT_TELEM_RATE 10
2+
ACT1_CURR_PIN 9
3+
ACT1_AMP_OFFSET 0
4+
ACT1_AMP_PERVLT 10
5+
ACT1_CURR_MAX 2.5
6+
ACT2_CURR_PIN 10
7+
ACT2_AMP_OFFSET 0
8+
ACT2_AMP_PERVLT 10
9+
ACT2_CURR_MAX 2.5
10+
ACT3_CURR_PIN 11
11+
ACT3_AMP_OFFSET 0
12+
ACT3_AMP_PERVLT 10
13+
ACT3_CURR_MAX 2.5
14+
ACT4_CURR_PIN 12
15+
ACT4_AMP_OFFSET 0
16+
ACT4_AMP_PERVLT 10
17+
ACT4_CURR_MAX 2.5

libraries/AP_HAL_ChibiOS/hwdef/VM-L431-SRV-Hub-4CHP/hwdef.dat

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ PB7 USART1_RX USART1 NODMA
88
STDOUT_SERIAL SD1
99
STDOUT_BAUDRATE 57600
1010

11-
define HAL_USE_ADC FALSE
11+
define HAL_USE_ADC TRUE
1212

13-
#Servo VCC Current Sampling, for future development
14-
# define STM32_ADC_USE_ADC1 TRUE
15-
# PA4 SPARE1_ADC1 ADC1 SCALE(1) # Current Sampling on PWM(1)
16-
# PA5 SPARE2_ADC1 ADC1 SCALE(1) # Current Sampling on PWM(2)
17-
# PA6 SPARE3_ADC1 ADC1 SCALE(1) # Current Sampling on PWM(3)
18-
# PA7 SPARE4_ADC1 ADC1 SCALE(1) # Current Sampling on PWM(4)
13+
#Servo VCC Current Sampling
14+
define AP_PERIPH_ACTUATOR_TELEM_ENABLED 1
15+
define HAL_ACTUATOR_TELEM_CHANNELS 4
16+
define STM32_ADC_USE_ADC1 TRUE
17+
PA4 ACT1_CURRENT_SENS ADC1 SCALE(1) # Current Sampling on PWM(1)
18+
PA5 ACT2_CURRENT_SENS ADC1 SCALE(1) # Current Sampling on PWM(2)
19+
PA6 ACT3_CURRENT_SENS ADC1 SCALE(1) # Current Sampling on PWM(3)
20+
PA7 ACT4_CURRENT_SENS ADC1 SCALE(1) # Current Sampling on PWM(4)
1921

2022
define AP_PERIPH_RC_OUT_ENABLED 1
2123

libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,9 @@
370370
#ifndef AP_PERIPH_BUZZER_WITHOUT_NOTIFY_ENABLED
371371
#define AP_PERIPH_BUZZER_WITHOUT_NOTIFY_ENABLED 0
372372
#endif
373+
#ifndef AP_PERIPH_ACTUATOR_TELEM_ENABLED
374+
#define AP_PERIPH_ACTUATOR_TELEM_ENABLED 0
375+
#endif
373376

374377
/*
375378
* turning on of ArduPilot features based on which AP_Periph features

0 commit comments

Comments
 (0)