Skip to content

Commit 0262261

Browse files
committed
chore(vehicle templates): Added ESC-> FC Telemetry and improved consistency
1 parent 415764c commit 0262261

56 files changed

Lines changed: 332 additions & 223 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/08_batt1.param

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ BATT_LOW_VOLT,79.2 # Low failsafe voltage x nr. of cells
1212
BATT_MONITOR,4 # Selected in component editor window
1313
BATT_VOLT_MULT,12.17
1414
MOT_BAT_VOLT_MAX,92.4 # Scale the PIDs up when battery voltage is below this threshold
15-
MOT_BAT_VOLT_MIN,78.1 # Scale the PIDs up when battery voltage is above this threshold
15+
MOT_BAT_VOLT_MIN,67.199 # Scale the PIDs up when battery voltage is above this threshold

ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/vehicle_components.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"Volt per cell arm": 3.9455,
6161
"Volt per cell low": 3.6,
6262
"Volt per cell crit": 3.55,
63-
"Volt per cell min": 3.55,
63+
"Volt per cell min": 3.0545,
6464
"Number of cells": 22,
6565
"Capacity mAh": 30000
6666
},
@@ -77,10 +77,14 @@
7777
"Type": "",
7878
"Version": ""
7979
},
80-
"FC Connection": {
80+
"FC->ESC Connection": {
8181
"Type": "Main Out",
8282
"Protocol": "Normal"
8383
},
84+
"ESC->FC Telemetry": {
85+
"Type": "None",
86+
"Protocol": "None"
87+
},
8488
"Notes": ""
8589
},
8690
"Motors": {
@@ -119,7 +123,7 @@
119123
"Version": "1.13.2"
120124
},
121125
"FC Connection": {
122-
"Type": "SERIAL3",
126+
"Type": "CAN1",
123127
"Protocol": "DroneCAN"
124128
},
125129
"Notes": "uBlox M8P GNSS with a patch antenna."

ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/vehicle_components.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,14 @@
7777
"Type": "hobbywing",
7878
"Version": ""
7979
},
80-
"FC Connection": {
80+
"FC->ESC Connection": {
8181
"Type": "Main Out",
8282
"Protocol": "Normal"
8383
},
84+
"ESC->FC Telemetry": {
85+
"Type": "None",
86+
"Protocol": "None"
87+
},
8488
"Notes": "ESCs are integrated in the motor arm sets"
8589
},
8690
"Motors": {

ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/08_batt1.param

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ BATT_LOW_VOLT,21.6 # Low failsafe voltage x nr. of cells
1212
BATT_MONITOR,4 # Selected in component editor window
1313
BATT_VOLT_MULT,11 # Use a power source with a voltage close to BATT_LOW_VOLT measure with a calibrated voltimeter and adapt this parameter so that the telemetry voltage reading matches it
1414
MOT_BAT_VOLT_MAX,25.2 # Scale the PIDs up when battery voltage is below this threshold
15-
MOT_BAT_VOLT_MIN,21.3 # Scale the PIDs up when battery voltage is above this threshold
15+
MOT_BAT_VOLT_MIN,19.8 # Scale the PIDs up when battery voltage is above this threshold

ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/vehicle_components.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"Volt per cell arm": 3.9333,
6161
"Volt per cell low": 3.6,
6262
"Volt per cell crit": 3.55,
63-
"Volt per cell min": 3.55,
63+
"Volt per cell min": 3.3,
6464
"Number of cells": 6,
6565
"Capacity mAh": 3000
6666
},
@@ -77,10 +77,14 @@
7777
"Type": "BLHeli32",
7878
"Version": "32.10"
7979
},
80-
"FC Connection": {
80+
"FC->ESC Connection": {
8181
"Type": "Main Out",
8282
"Protocol": "DShot600"
8383
},
84+
"ESC->FC Telemetry": {
85+
"Type": "SERIAL5",
86+
"Protocol": "ESC Telemetry"
87+
},
8488
"Notes": "Runs BDshot600 on Main out and uses SERIAL5 as extra connection for low rate telemetry"
8589
},
8690
"Motors": {

ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Demo32Motor_PeterHall/10_gnss.param

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
BRD_SAFETY_DEFLT,0
2+
CAN_D1_PROTOCOL,1
23
CAN_D1_UC_ESC_BM,65535
34
CAN_P1_DRIVER,1
45
COMPASS_ORIENT,0

ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Demo32Motor_PeterHall/vehicle_components.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,14 @@
7777
"Type": "",
7878
"Version": ""
7979
},
80-
"FC Connection": {
80+
"FC->ESC Connection": {
8181
"Type": "Main Out",
8282
"Protocol": "Normal"
8383
},
84+
"ESC->FC Telemetry": {
85+
"Type": "None",
86+
"Protocol": "None"
87+
},
8488
"Notes": ""
8589
},
8690
"Motors": {

ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/08_batt1.param

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ BATT_LOW_MAH,900 # trigger low failsafe just below 33% remaining
1010
BATT_LOW_VOLT,21 # Low failsafe voltage x nr. of cells
1111
BATT_MONITOR,9 # Selected in component editor window
1212
MOT_BAT_VOLT_MAX,25.2 # Scale the PIDs up when battery voltage is below this threshold
13-
MOT_BAT_VOLT_MIN,19.2 # Scale the PIDs up when battery voltage is above this threshold
13+
MOT_BAT_VOLT_MIN,19.8 # Scale the PIDs up when battery voltage is above this threshold

ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/vehicle_components.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"Volt per cell arm": 3.5833,
6161
"Volt per cell low": 3.5,
6262
"Volt per cell crit": 3.2,
63-
"Volt per cell min": 3.2,
63+
"Volt per cell min": 3.3,
6464
"Number of cells": 6,
6565
"Capacity mAh": 5000
6666
},
@@ -77,7 +77,11 @@
7777
"Type": "FETtec",
7878
"Version": "10_224"
7979
},
80-
"FC Connection": {
80+
"FC->ESC Connection": {
81+
"Type": "SERIAL1",
82+
"Protocol": "FETtecOneWire"
83+
},
84+
"ESC->FC Telemetry": {
8185
"Type": "SERIAL1",
8286
"Protocol": "FETtecOneWire"
8387
},
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
BATT_AMP_PERVLT,17 # new calibrated value for Mamba F45_128k 4in1 ESC
2-
BATT_ARM_VOLT,15.7 # Only arm above this voltage, to avoid taking off with insufficient battery capacity
2+
BATT_ARM_VOLT,11.775 # Only arm above this voltage, to avoid taking off with insufficient battery capacity
33
BATT_CAPACITY,1800 # Total battery capacity specified in the component editor
44
BATT_CRT_MAH,0 # When only 450mAh out of the total 1800mAh remain, trigger critical failsafe
5-
BATT_CRT_VOLT,14.2 # Critical failsafe voltage x nr. of cells
5+
BATT_CRT_VOLT,10.65 # Critical failsafe voltage x nr. of cells
66
BATT_FS_CRT_ACT,1 # Land ASAP
77
BATT_FS_LOW_ACT,2 # Return and land at home or rally point
88
BATT_FS_VOLTSRC,0 # Let the firmware handle the nasty business of variable and battery dependent internal resistance
99
BATT_I2C_BUS,0 # Selected in component editor window
1010
BATT_LOW_MAH,0 # When only 450mAh out of the total 1800mAh remain, trigger low failsafe
11-
BATT_LOW_VOLT,14.4 # Low failsafe voltage x nr. of cells
11+
BATT_LOW_VOLT,10.8 # Low failsafe voltage x nr. of cells
1212
BATT_MONITOR,4 # Selected in component editor window
1313
BATT_VOLT_MULT,10.1 # Use a power source with a voltage close to BATT_LOW_VOLT measure with a calibrated voltimeter and adapt this parameter so that the telemetry voltage reading matches it
14-
MOT_BAT_VOLT_MAX,16.8 # Scale the PIDs up when battery voltage is below this threshold
15-
MOT_BAT_VOLT_MIN,14.2 # Scale the PIDs up when battery voltage is above this threshold
14+
MOT_BAT_VOLT_MAX,12.8001 # Scale the PIDs up when battery voltage is below this threshold
15+
MOT_BAT_VOLT_MIN,9.6 # Scale the PIDs up when battery voltage is above this threshold

0 commit comments

Comments
 (0)