From cabf7f6155dce62e381ffdbabf87603611f9ff55 Mon Sep 17 00:00:00 2001 From: rotorman Date: Sun, 22 Aug 2021 20:03:17 +0200 Subject: [PATCH] Show raw value in first column, also in decimal; pre-processed value in second column. --- radio/src/gui/colorlcd/radio_diaganas.cpp | 8 ++++---- radio/src/targets/horus/flyskyHallStick_driver.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/colorlcd/radio_diaganas.cpp b/radio/src/gui/colorlcd/radio_diaganas.cpp index 5d22a4752..c07625241 100644 --- a/radio/src/gui/colorlcd/radio_diaganas.cpp +++ b/radio/src/gui/colorlcd/radio_diaganas.cpp @@ -58,8 +58,8 @@ class RadioAnalogsDiagsWindow: public Window { #endif dc->drawNumber(x, y, i + 1, LEADING0 | LEFT, 2); dc->drawText(x + 2 * 15 - 2, y, ":"); - drawHexNumber(dc, x + 3 * 15 - 1, y, hall_raw_values[i]); - dc->drawNumber(x + ANA_OFFSET, y, hall_raw_values[i], RIGHT); + dc->drawNumber(x + 3 * 15 - 1, y, hall_raw_values[i], LEFT); + dc->drawNumber(x + ANA_OFFSET, y, hall_adc_values[i], RIGHT); } for (uint8_t i = FLYSKY_HALL_CHANNEL_COUNT; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; i++) { @@ -72,7 +72,7 @@ class RadioAnalogsDiagsWindow: public Window { #endif dc->drawNumber(x, y, i + 1, LEADING0 | LEFT, 2); dc->drawText(x + 2 * 15 - 2, y, ":"); - drawHexNumber(dc, x + 3 * 15 - 1, y, anaIn(i)); + dc->drawNumber(x + 3 * 15 -1, y, anaIn(i), LEFT); dc->drawNumber(x + ANA_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT); } #else @@ -86,7 +86,7 @@ class RadioAnalogsDiagsWindow: public Window { #endif dc->drawNumber(x, y, i + 1, LEADING0 | LEFT, 2); dc->drawText(x + 2 * 15 - 2, y, ":"); - drawHexNumber(dc, x + 3 * 15 - 1, y, anaIn(i)); + dc->drawNumber(x + 3 * 15 -1, y, anaIn(i), LEFT); dc->drawNumber(x + ANA_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT); } #endif diff --git a/radio/src/targets/horus/flyskyHallStick_driver.h b/radio/src/targets/horus/flyskyHallStick_driver.h index 02edacb88..af9b1bd24 100644 --- a/radio/src/targets/horus/flyskyHallStick_driver.h +++ b/radio/src/targets/horus/flyskyHallStick_driver.h @@ -137,3 +137,4 @@ enum TRANSFER_DIR_E { }; extern signed short hall_raw_values[FLYSKY_HALL_CHANNEL_COUNT]; +extern unsigned short hall_adc_values[FLYSKY_HALL_CHANNEL_COUNT];