Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-05 15:33:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

APM: added RSSI_PIN option for receiver RSSI

Browse Source 
this allows you to configure the pin for receiver RSSI without
recompiling
This commit is contained in:
Andrew Tridgell 2012-11-06 22:04:41 +11:00
parent 403721f8ca
commit 8652bfee8d
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArduPlane/ArduPlane.pde
View File

@ -274,9 +274,9 @@ AP_AnalogSource_ADC pitot_analog_source( &adc,
AP_AnalogSource_Arduino pitot_analog_source(CONFIG_PITOT_SOURCE_ANALOG_PIN, 4.0); AP_AnalogSource_Arduino pitot_analog_source(CONFIG_PITOT_SOURCE_ANALOG_PIN, 4.0);
#endif #endif
#if RECEIVER_RSSI_PIN != -1 // a pin for reading the receiver RSSI voltage. The scaling by 0.25
AP_AnalogSource_Arduino RSSI_pin(RECEIVER_RSSI_PIN, 0.25); // is to take the 0 to 1024 range down to an 8 bit range for MAVLink
#endif AP_AnalogSource_Arduino RSSI_pin(-1, 0.25);
AP_Relay relay; AP_Relay relay;

4
ArduPlane/Parameters.h
View File

@ -138,7 +138,8 @@ public:
// //
// Battery monitoring parameters // Battery monitoring parameters
// //
k_param_battery_volt_pin = 168, k_param_rssi_pin = 167,
k_param_battery_volt_pin,
k_param_battery_curr_pin, // 169 k_param_battery_curr_pin, // 169
// //
@ -341,6 +342,7 @@ public:
AP_Float curr_amp_per_volt; AP_Float curr_amp_per_volt;
AP_Float input_voltage; AP_Float input_voltage;
AP_Int32 pack_capacity; // Battery pack capacity less reserve AP_Int32 pack_capacity; // Battery pack capacity less reserve
AP_Int8 rssi_pin;
AP_Int8 battery_volt_pin; AP_Int8 battery_volt_pin;
AP_Int8 battery_curr_pin; AP_Int8 battery_curr_pin;
AP_Int8 inverted_flight_ch; // 0=disabled, 1-8 is channel for inverted flight trigger AP_Int8 inverted_flight_ch; // 0=disabled, 1-8 is channel for inverted flight trigger

12
ArduPlane/Parameters.pde
View File

@ -534,16 +534,24 @@ const AP_Param::Info var_info[] PROGMEM = {
// @Param: BATT_VOLT_PIN // @Param: BATT_VOLT_PIN
// @DisplayName: Battery Voltage sensing pin // @DisplayName: Battery Voltage sensing pin
// @Description: Setting this to 0 ~ 13 will enable battery current sensing on pins A0 ~ A13. // @Description: Setting this to 0 ~ 13 will enable battery current sensing on pins A0 ~ A13.
// @Values: 99:Disabled, 0:A0, 1:A1, 13:A13 // @Values: -1:Disabled, 0:A0, 1:A1, 13:A13
// @User: Standard // @User: Standard
GSCALAR(battery_volt_pin, "BATT_VOLT_PIN", BATTERY_VOLT_PIN), GSCALAR(battery_volt_pin, "BATT_VOLT_PIN", BATTERY_VOLT_PIN),
// @Param: BATT_CURR_PIN // @Param: BATT_CURR_PIN
// @DisplayName: Battery Current sensing pin // @DisplayName: Battery Current sensing pin
// @Description: Setting this to 0 ~ 13 will enable battery current sensing on pins A0 ~ A13. // @Description: Setting this to 0 ~ 13 will enable battery current sensing on pins A0 ~ A13.
// @Values: 99:Disabled, 1:A1, 2:A2, 12:A12 // @Values: -1:Disabled, 1:A1, 2:A2, 12:A12
// @User: Standard // @User: Standard
GSCALAR(battery_curr_pin, "BATT_CURR_PIN", BATTERY_CURR_PIN), GSCALAR(battery_curr_pin, "BATT_CURR_PIN", BATTERY_CURR_PIN),
// @Param: RSSI_PIN
// @DisplayName: Receiver RSSI sensing pin
// @Description: This selects an analog pin for the receiver RSSI voltage. It assumes the voltage is 5V for max rssi, 0V for minimum
// @Values: -1:Disabled, 0:A0, 1:A1, 13:A13
// @User: Standard
GSCALAR(rssi_pin, "RSSI_PIN", -1),
GSCALAR(inverted_flight_ch, "INVERTEDFLT_CH", 0), GSCALAR(inverted_flight_ch, "INVERTEDFLT_CH", 0),
// barometer ground calibration. The GND_ prefix is chosen for // barometer ground calibration. The GND_ prefix is chosen for

5
ArduPlane/config.h
View File

@ -134,11 +134,6 @@
#endif #endif
// pin for receiver RSSI
#ifndef RECEIVER_RSSI_PIN
# define RECEIVER_RSSI_PIN -1
#endif
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// IMU Selection // IMU Selection
// //

3
ArduPlane/sensors.pde
View File

@ -64,10 +64,9 @@ static void read_battery(void)
// RC_CHANNELS_SCALED message // RC_CHANNELS_SCALED message
void read_receiver_rssi(void) void read_receiver_rssi(void)
{ {
#if RECEIVER_RSSI_PIN != -1 RSSI_pin.set_pin(g.rssi_pin);
float ret = RSSI_pin.read(); float ret = RSSI_pin.read();
receiver_rssi = constrain(ret, 0, 255); receiver_rssi = constrain(ret, 0, 255);
#endif
} }