fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-06 13:11:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/drv_rc_input.h
+1 -1
View File
@@ -65,7 +65,7 @@
/** /**
* Maximum RSSI value * Maximum RSSI value
*/ */
#define RC_INPUT_RSSI_MAX 255 #define RC_INPUT_RSSI_MAX 100
/** /**
* @addtogroup topics * @addtogroup topics
src/modules/px4iofirmware/controls.c
+6 -3
View File
@@ -191,7 +191,10 @@ controls_tick() {
unsigned mV = counts * 3300 / 4096; unsigned mV = counts * 3300 / 4096;
/* scale to 0..253 and lowpass */ /* 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 #endif
@@ -223,11 +226,11 @@ controls_tick() {
if (sbus_updated) { if (sbus_updated) {
r_status_flags |= PX4IO_P_STATUS_FLAGS_RC_SBUS; r_status_flags |= PX4IO_P_STATUS_FLAGS_RC_SBUS;
unsigned sbus_rssi = 254; unsigned sbus_rssi = RC_INPUT_RSSI_MAX;
if (sbus_frame_drop) { if (sbus_frame_drop) {
r_raw_rc_flags |= PX4IO_P_RAW_RC_FLAGS_FRAME_DROP; r_raw_rc_flags |= PX4IO_P_RAW_RC_FLAGS_FRAME_DROP;
sbus_rssi = 100; sbus_rssi = RC_INPUT_RSSI_MAX / 2;
} else { } else {
r_raw_rc_flags &= ~(PX4IO_P_RAW_RC_FLAGS_FRAME_DROP); r_raw_rc_flags &= ~(PX4IO_P_RAW_RC_FLAGS_FRAME_DROP);
} }