dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

RC input: Replace magic numbers with better numbers, cap output to 0-100

This commit is contained in:
Lorenz Meier 2015-04-21 17:46:21 +02:00
parent d544ac0955
commit 09ae879b82
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/drv_rc_input.h
View File

@ -65,7 +65,7 @@
/**
* Maximum RSSI value
*/
#define RC_INPUT_RSSI_MAX 255
#define RC_INPUT_RSSI_MAX 100
/**
* @addtogroup topics

9
src/modules/px4iofirmware/controls.c
View File

@ -191,7 +191,10 @@ controls_tick() {
unsigned mV = counts * 3300 / 4096;
/* scale to 0..253 and lowpass */
rssi = (rssi * 0.99f) + ((mV / 13) * 0.01f);
rssi = (rssi * 0.99f) + ((mV / (3300 / RC_INPUT_RSSI_MAX)) * 0.01f);
if (rssi > RC_INPUT_RSSI_MAX) {
rssi = RC_INPUT_RSSI_MAX;
}
}
}
#endif
@ -223,11 +226,11 @@ controls_tick() {
if (sbus_updated) {
r_status_flags |= PX4IO_P_STATUS_FLAGS_RC_SBUS;
unsigned sbus_rssi = 254;
unsigned sbus_rssi = RC_INPUT_RSSI_MAX;
if (sbus_frame_drop) {
r_raw_rc_flags |= PX4IO_P_RAW_RC_FLAGS_FRAME_DROP;
sbus_rssi = 100;
sbus_rssi = RC_INPUT_RSSI_MAX / 2;
} else {
r_raw_rc_flags &= ~(PX4IO_P_RAW_RC_FLAGS_FRAME_DROP);
}