diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-06 14:17:37 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-06 14:17:37 +0200 |
| commit | 90c4664dce0e3613e545eabb208aa5fbb02d90e9 (patch) | |
| tree | 322cf10e5338bf48d30be289dc9124a9c64dbd2b /src/modules/px4iofirmware | |
| parent | 4ceddfdd92343277be3c6231cbd2a547e8b7bc57 (diff) | |
| parent | 6a784b770e4b9dff24effc2643711c9da2b0efab (diff) | |
| download | px4-firmware-90c4664dce0e3613e545eabb208aa5fbb02d90e9.tar.gz px4-firmware-90c4664dce0e3613e545eabb208aa5fbb02d90e9.tar.bz2 px4-firmware-90c4664dce0e3613e545eabb208aa5fbb02d90e9.zip | |
Merged status changes
Diffstat (limited to 'src/modules/px4iofirmware')
| -rw-r--r-- | src/modules/px4iofirmware/registers.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/modules/px4iofirmware/registers.c b/src/modules/px4iofirmware/registers.c index 8cb21e54f..9d9ef7c6d 100644 --- a/src/modules/px4iofirmware/registers.c +++ b/src/modules/px4iofirmware/registers.c @@ -674,27 +674,25 @@ registers_get(uint8_t page, uint8_t offset, uint16_t **values, unsigned *num_val #ifdef ADC_VSERVO /* PX4IO_P_STATUS_VSERVO */ { - /* - * Coefficients here derived by measurement of the 5-16V - * range on one unit: - * - * XXX pending measurements - * - * slope = xxx - * intercept = xxx - * - * Intercept corrected for best results @ 5.0V. - */ unsigned counts = adc_measure(ADC_VSERVO); if (counts != 0xffff) { - unsigned mV = (4150 + (counts * 46)) / 10 - 200; - unsigned corrected = (mV * r_page_setup[PX4IO_P_SETUP_VSERVO_SCALE]) / 10000; - - r_page_status[PX4IO_P_STATUS_VSERVO] = corrected; + // use 3:1 scaling on 3.3V ADC input + unsigned mV = counts * 9900 / 4096; + r_page_status[PX4IO_P_STATUS_VSERVO] = mV; + } + } +#endif +#ifdef ADC_RSSI + /* PX4IO_P_STATUS_VRSSI */ + { + unsigned counts = adc_measure(ADC_RSSI); + if (counts != 0xffff) { + // use 1:1 scaling on 3.3V ADC input + unsigned mV = counts * 3300 / 4096; + r_page_status[PX4IO_P_STATUS_VRSSI] = mV; } } #endif - /* XXX PX4IO_P_STATUS_VRSSI */ /* XXX PX4IO_P_STATUS_PRSSI */ SELECT_PAGE(r_page_status); |