Show raw value in first column, also in decimal; pre-processed value in second column.
This commit is contained in:
committed by
Raphael Coeffic
parent
1737a52d7e
commit
cabf7f6155
@@ -58,8 +58,8 @@ class RadioAnalogsDiagsWindow: public Window {
|
|||||||
#endif
|
#endif
|
||||||
dc->drawNumber(x, y, i + 1, LEADING0 | LEFT, 2);
|
dc->drawNumber(x, y, i + 1, LEADING0 | LEFT, 2);
|
||||||
dc->drawText(x + 2 * 15 - 2, y, ":");
|
dc->drawText(x + 2 * 15 - 2, y, ":");
|
||||||
drawHexNumber(dc, x + 3 * 15 - 1, y, hall_raw_values[i]);
|
dc->drawNumber(x + 3 * 15 - 1, y, hall_raw_values[i], LEFT);
|
||||||
dc->drawNumber(x + ANA_OFFSET, y, hall_raw_values[i], RIGHT);
|
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++) {
|
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
|
#endif
|
||||||
dc->drawNumber(x, y, i + 1, LEADING0 | LEFT, 2);
|
dc->drawNumber(x, y, i + 1, LEADING0 | LEFT, 2);
|
||||||
dc->drawText(x + 2 * 15 - 2, y, ":");
|
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);
|
dc->drawNumber(x + ANA_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
@@ -86,7 +86,7 @@ class RadioAnalogsDiagsWindow: public Window {
|
|||||||
#endif
|
#endif
|
||||||
dc->drawNumber(x, y, i + 1, LEADING0 | LEFT, 2);
|
dc->drawNumber(x, y, i + 1, LEADING0 | LEFT, 2);
|
||||||
dc->drawText(x + 2 * 15 - 2, y, ":");
|
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);
|
dc->drawNumber(x + ANA_OFFSET, y, (int16_t) calibratedAnalogs[CONVERT_MODE(i)] * 25 / 256, RIGHT);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -137,3 +137,4 @@ enum TRANSFER_DIR_E {
|
|||||||
};
|
};
|
||||||
|
|
||||||
extern signed short hall_raw_values[FLYSKY_HALL_CHANNEL_COUNT];
|
extern signed short hall_raw_values[FLYSKY_HALL_CHANNEL_COUNT];
|
||||||
|
extern unsigned short hall_adc_values[FLYSKY_HALL_CHANNEL_COUNT];
|
||||||
|
|||||||
Reference in New Issue
Block a user