Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion .github/hardware.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,35 @@ class FieldType(Enum):
"gsensor_stk8xxx": FieldType.BOOL,
"thermal_lm75a": FieldType.BOOL,
"pwm_outputs": FieldType.ARRAY,
"pwm_out_only": FieldType.BOOL,
"vbat": FieldType.ADC,
"vbat_cal_min": FieldType.INT,
"vbat_cal_max": FieldType.INT,
"vbat_noreading": FieldType.INT,
"vbat_offset": FieldType.INT,
"vbat_scale": FieldType.INT,
"vbat_atten": FieldType.INT,
"vsrc1": FieldType.ADC,
"vsrc1_cal_min": FieldType.INT,
"vsrc1_cal_max": FieldType.INT,
"vsrc1_noreading": FieldType.INT,
"vsrc1_offset": FieldType.INT,
"vsrc1_scale": FieldType.INT,
"vsrc1_atten": FieldType.INT,
"vsrc2": FieldType.ADC,
"vsrc2_cal_min": FieldType.INT,
"vsrc2_cal_max": FieldType.INT,
"vsrc2_noreading": FieldType.INT,
"vsrc2_offset": FieldType.INT,
"vsrc2_scale": FieldType.INT,
"vsrc2_atten": FieldType.INT,
"vsrc3": FieldType.ADC,
"vsrc3_cal_min": FieldType.INT,
"vsrc3_cal_max": FieldType.INT,
"vsrc3_noreading": FieldType.INT,
"vsrc3_offset": FieldType.INT,
"vsrc3_scale": FieldType.INT,
"vsrc3_atten": FieldType.INT,
"vtx_amp_pwm": FieldType.OUTPUT,
"vtx_amp_vpd": FieldType.ADC,
"vtx_amp_vref": FieldType.OUTPUT,
Expand Down Expand Up @@ -146,7 +171,11 @@ class FieldType(Enum):
[["joystick", "joystick_values"], [], []],
[["five_way1", "five_way2", "five_way3"], [], []],
[["misc_fan_pwm", "misc_fan_speeds"], [], []],
[["vbat", "vbat_offset", "vbat_scale"], [], []],
[["pwm_out_only"], ["pwm_outputs"], []],
[["vbat", "vbat_cal_min", "vbat_cal_max", "vbat_offset", "vbat_scale"], [], []],
[["vsrc1", "vsrc1_cal_min", "vsrc1_cal_max", "vsrc1_offset", "vsrc1_scale"], [], []],
[["vsrc2", "vsrc2_cal_min", "vsrc2_cal_max", "vsrc2_offset", "vsrc2_scale"], [], []],
[["vsrc3", "vsrc3_cal_min", "vsrc3_cal_max", "vsrc3_offset", "vsrc3_scale"], [], []],
[["power_pdet", "power_pdet_intercept", "power_pdet_slope"], [], []],
[["screen_sda"], ["screen_sck", "screen_type"], []],
[["screen_cs", "screen_dc", "screen_mosi"], ["screen_type", "screen_sck", "screen_rst"], []],
Expand Down
2 changes: 2 additions & 0 deletions RX/DIY S3 DEVKIT 2400 True Diversity PWM 16.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
"vbat": 10,
"vbat_offset": -197,
"vbat_scale": 1200,
"vbat_cal_min": 3500,
"vbat_cal_max": 25200,

"pwm_outputs":[2,9,11,12,13,14,21,35,36,37,38,39,40,41,42,47]
}
2 changes: 2 additions & 0 deletions RX/DIY S3 DEVKIT 2400 True Diversity VTX PWM 11.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
"vbat": 10,
"vbat_offset": -197,
"vbat_scale": 1200,
"vbat_cal_min": 3500,
"vbat_cal_max": 25200,

"pwm_outputs":[2,9,11,12,13,14,21,35,36,37,38],

Expand Down
2 changes: 2 additions & 0 deletions RX/Frank 2400.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,7 @@
"vbat_offset": 12,
"vbat_scale": 410,
"vbat_atten": 0,
"vbat_cal_min": 3500,
"vbat_cal_max": 25200,
"button": 0
}
6 changes: 4 additions & 2 deletions RX/Generic 2400 PWMP5.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,7 @@
"pwm_outputs": [0,1,3,9,10],
"vbat": 17,
"vbat_offset": 12,
"vbat_scale": 410
}
"vbat_scale": 410,
"vbat_cal_min": 3500,
"vbat_cal_max": 25200
}
6 changes: 4 additions & 2 deletions RX/Generic 2400 PWMP6.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,7 @@
"pwm_outputs": [0,1,3,9,10,5],
"vbat": 17,
"vbat_offset": 12,
"vbat_scale": 310
}
"vbat_scale": 310,
"vbat_cal_min": 4000,
"vbat_cal_max": 9000
}
6 changes: 4 additions & 2 deletions RX/Generic 2400 PWMP7.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,7 @@
"pwm_outputs": [0,1,3,9,10,5,2],
"vbat": 17,
"vbat_offset": 12,
"vbat_scale": 310
}
"vbat_scale": 310,
"vbat_cal_min": 3500,
"vbat_cal_max": 25200
}
6 changes: 4 additions & 2 deletions RX/Generic 2400 True Diversity PA PWM 14.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,7 @@
"vbat": 36,
"vbat_offset": -197,
"vbat_scale": 1200,
"vbat_atten": 0
}
"vbat_atten": 0,
"vbat_cal_min": 3500,
"vbat_cal_max": 25200
}
4 changes: 3 additions & 1 deletion RX/Generic 2400 True Diversity PWM 16.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,7 @@
"vbat": 36,
"vbat_offset": -197,
"vbat_scale": 1200,
"vbat_atten": 0
"vbat_atten": 0,
"vbat_cal_min": 3500,
"vbat_cal_max": 25200
}
4 changes: 3 additions & 1 deletion RX/Generic 900 True Diversity PWM 16.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@
"vbat": 36,
"vbat_offset": -197,
"vbat_scale": 1200,
"vbat_atten": 0
"vbat_atten": 0,
"vbat_cal_min": 3500,
"vbat_cal_max": 25200
}
10 changes: 7 additions & 3 deletions RX/Generic C3 2400 PWM.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
"led_rgb": 8,
"led_rgb_isgrb": true,
"vbat": 0,
"vbat_offset": 12,
"vbat_scale": 410
}
"vbat_offset": 0,
"vbat_scale": 909,
"vbat_atten": 7,
"vbat_noreading": 13,
"vbat_cal_min": 3500,
"vbat_cal_max": 25200
}
9 changes: 6 additions & 3 deletions RX/Generic C3 LR1121 PWM.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
"led_rgb": 8,
"led_rgb_isgrb": true,
"vbat": 0,
"vbat_offset": 3,
"vbat_scale": 937,
"vbat_atten": 7
"vbat_offset": 0,
"vbat_scale": 909,
"vbat_atten": 7,
"vbat_noreading": 13,
"vbat_cal_min": 3500,
"vbat_cal_max": 25200
}
10 changes: 7 additions & 3 deletions RX/HelloRadio HR7E.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
"button": 0,

"vbat": 36,
"vbat_offset": -147,
"vbat_scale": 1239
}
"vbat_offset": 19,
"vbat_scale": 990,
"vbat_atten": 7,
"vbat_noreading": 8,
"vbat_cal_min": 4000,
"vbat_cal_max": 30000
}
10 changes: 7 additions & 3 deletions RX/HelloRadio HR8E.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
"button": 0,

"vbat": 36,
"vbat_offset": -147,
"vbat_scale": 1239
}
"vbat_offset": 19,
"vbat_scale": 990,
"vbat_atten": 7,
"vbat_noreading": 8,
"vbat_cal_min": 4000,
"vbat_cal_max": 30000
}
9 changes: 6 additions & 3 deletions RX/Radiomaster 2400 ER8G.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@
"i2c_scl": 18,
"vbat": 39,
"button": 0,
"vbat_scale": 700,
"vbat_offset": -30,
"vbat_atten": 7
"vbat_scale": 987,
"vbat_offset": 3,
"vbat_atten": 7,
"vbat_noreading": -1,
"vbat_cal_min": 4000,
"vbat_cal_max": 30000
}
2 changes: 2 additions & 0 deletions RX/SPRacing RXG1 Gyro 2400 RX GYRO.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@
"vbat_atten": 7,
"vbat_offset": -12,
"vbat_scale": 902,
"vbat_cal_min": 4000,
"vbat_cal_max": 26000,

"//": "LED",
"led_rgb": 38,
Expand Down
2 changes: 2 additions & 0 deletions RX/SPRacing RXN1 Gyro 2400 RX GYRO IR D4.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@
"vbat_atten": 7,
"vbat_offset": -12,
"vbat_scale": 902,
"vbat_cal_min": 4000,
"vbat_cal_max": 26000,
"//": "Analog IN",
"//": "A1 - GPIO34/ADC1_CH6",
"//": "A2 - GPIO35/ADC1_CH7",
Expand Down
11 changes: 7 additions & 4 deletions RX/Vario 2400.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
"pwm_outputs": [14,1,3,15,2,4],
"vbat": 39,
"button": 0,
"vbat_scale": 1024,
"vbat_offset": -62,
"vbat_atten": 7
}
"vbat_scale": 1007,
"vbat_offset": -32,
"vbat_atten": 7,
"vbat_noreading": -1,
"vbat_cal_min": 3000,
"vbat_cal_max": 26000
}
Loading
Loading