aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rover: use voltage_average() for RSSI

Browse Source 
this allows it to work on PX4
This commit is contained in:
Andrew Tridgell 2013-05-13 15:14:23 +10:00
parent 48cfdac6f0
commit e1ac097e0e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APMrover2/APMrover2.pde
View File

@ -553,7 +553,7 @@ void setup() {
// load the default values of variables listed in var_info[] // load the default values of variables listed in var_info[]
AP_Param::setup_sketch_defaults(); AP_Param::setup_sketch_defaults();
rssi_analog_source = hal.analogin->channel(ANALOG_INPUT_NONE, 1.0); rssi_analog_source = hal.analogin->channel(ANALOG_INPUT_NONE);
vcc_pin = hal.analogin->channel(ANALOG_INPUT_BOARD_VCC); vcc_pin = hal.analogin->channel(ANALOG_INPUT_BOARD_VCC);
batt_volt_pin = hal.analogin->channel(g.battery_volt_pin); batt_volt_pin = hal.analogin->channel(g.battery_volt_pin);
batt_curr_pin = hal.analogin->channel(g.battery_curr_pin); batt_curr_pin = hal.analogin->channel(g.battery_curr_pin);

2
APMrover2/sensors.pde
View File

@ -44,7 +44,7 @@ static void read_battery(void)
void read_receiver_rssi(void) void read_receiver_rssi(void)
{ {
rssi_analog_source->set_pin(g.rssi_pin); rssi_analog_source->set_pin(g.rssi_pin);
float ret = rssi_analog_source->read_average(); float ret = rssi_analog_source->voltage_average() * 50;
receiver_rssi = constrain_int16(ret, 0, 255); receiver_rssi = constrain_int16(ret, 0, 255);
} }