Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 14:55:21 +03:00
Code Issues Wiki Activity

Show rates on OLED rate display page.

Browse source 
Other minor display cleanups and improvements.
This commit is contained in:
Dominic Clifton 2014-11-13 01:51:36 +00:00
parent f5a0f9d3b2
commit daef382dd9
2 changed files with 46 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/config/config.c
View file

@ -282,6 +282,10 @@ uint8_t getCurrentControlRateProfile(void)
return currentControlRateProfileIndex; return currentControlRateProfileIndex;
} }
controlRateConfig_t *getControlRateConfig(uint8_t profileIndex) {
return &masterConfig.controlRateProfiles[profileIndex];
}
static void setControlRateProfile(uint8_t profileIndex) static void setControlRateProfile(uint8_t profileIndex)
{ {
currentControlRateProfileIndex = profileIndex; currentControlRateProfileIndex = profileIndex;

54
src/main/io/display.c
View file

@ -42,6 +42,7 @@
#include "sensors/compass.h" #include "sensors/compass.h"
#include "rx/rx.h" #include "rx/rx.h"
#include "io/rc_controls.h"
#include "config/runtime_config.h" #include "config/runtime_config.h"
@ -49,6 +50,8 @@
#include "display.h" #include "display.h"
controlRateConfig_t *getControlRateConfig(uint8_t profileIndex);
//#define ENABLE_DEBUG_OLED_PAGE //#define ENABLE_DEBUG_OLED_PAGE
#define MILLISECONDS_IN_A_SECOND (1000 * 1000) #define MILLISECONDS_IN_A_SECOND (1000 * 1000)
@ -199,6 +202,9 @@ void drawRxChannel(uint8_t channelIndex, uint8_t width)
drawHorizonalPercentageBar(width - 1, percentage); drawHorizonalPercentageBar(width - 1, percentage);
} }
#define HALF_SCREEN_CHARACTER_COLUMN_COUNT (SCREEN_CHARACTER_COLUMN_COUNT / 2)
#define IS_SCREEN_CHARACTER_COLUMN_COUNT_ODD (SCREEN_CHARACTER_COLUMN_COUNT & 1)
#define RX_CHANNELS_PER_PAGE_COUNT 14 #define RX_CHANNELS_PER_PAGE_COUNT 14
void showRxPage(void) void showRxPage(void)
{ {
@ -206,19 +212,17 @@ void showRxPage(void)
for (uint8_t channelIndex = 0; channelIndex < rxRuntimeConfig.channelCount && channelIndex < RX_CHANNELS_PER_PAGE_COUNT; channelIndex += 2) { for (uint8_t channelIndex = 0; channelIndex < rxRuntimeConfig.channelCount && channelIndex < RX_CHANNELS_PER_PAGE_COUNT; channelIndex += 2) {
i2c_OLED_set_line((channelIndex / 2) + PAGE_TITLE_LINE_COUNT); i2c_OLED_set_line((channelIndex / 2) + PAGE_TITLE_LINE_COUNT);
uint8_t width = SCREEN_CHARACTER_COLUMN_COUNT / 2; drawRxChannel(channelIndex, HALF_SCREEN_CHARACTER_COLUMN_COUNT);
drawRxChannel(channelIndex, width);
if (channelIndex >= rxRuntimeConfig.channelCount) { if (channelIndex >= rxRuntimeConfig.channelCount) {
continue; continue;
} }
if (width * 2 != SCREEN_CHARACTER_COLUMN_COUNT) { if (IS_SCREEN_CHARACTER_COLUMN_COUNT_ODD) {
LCDprint(' '); LCDprint(' ');
} }
drawRxChannel(channelIndex + PAGE_TITLE_LINE_COUNT, width); drawRxChannel(channelIndex + PAGE_TITLE_LINE_COUNT, HALF_SCREEN_CHARACTER_COLUMN_COUNT);
} }
} }
@ -239,13 +243,39 @@ void showArmedPage(void)
void showProfilePage(void) void showProfilePage(void)
{ {
uint8_t rowIndex = PAGE_TITLE_LINE_COUNT;
tfp_sprintf(lineBuffer, "Profile: %d", getCurrentProfile()); tfp_sprintf(lineBuffer, "Profile: %d", getCurrentProfile());
i2c_OLED_set_line(PAGE_TITLE_LINE_COUNT + 0); i2c_OLED_set_line(rowIndex++);
i2c_OLED_send_string(lineBuffer); i2c_OLED_send_string(lineBuffer);
tfp_sprintf(lineBuffer, "Rate profile: %d", getCurrentControlRateProfile()); uint8_t currentRateProfileIndex = getCurrentControlRateProfile();
i2c_OLED_set_line(PAGE_TITLE_LINE_COUNT + 1); tfp_sprintf(lineBuffer, "Rate profile: %d", currentRateProfileIndex);
i2c_OLED_set_line(rowIndex++);
i2c_OLED_send_string(lineBuffer); i2c_OLED_send_string(lineBuffer);
controlRateConfig_t *controlRateConfig = getControlRateConfig(currentRateProfileIndex);
tfp_sprintf(lineBuffer, "RC Expo: %d", controlRateConfig->rcExpo8);
padLineBuffer();
i2c_OLED_set_line(rowIndex++);
i2c_OLED_send_string(lineBuffer);
tfp_sprintf(lineBuffer, "RC Rate: %d", controlRateConfig->rcRate8);
padLineBuffer();
i2c_OLED_set_line(rowIndex++);
i2c_OLED_send_string(lineBuffer);
tfp_sprintf(lineBuffer, "R&P Rate: %d", controlRateConfig->rollPitchRate);
padLineBuffer();
i2c_OLED_set_line(rowIndex++);
i2c_OLED_send_string(lineBuffer);
tfp_sprintf(lineBuffer, "Yaw Rate: %d", controlRateConfig->yawRate);
padLineBuffer();
i2c_OLED_set_line(rowIndex++);
i2c_OLED_send_string(lineBuffer);
} }
void showBatteryPage(void) void showBatteryPage(void)
@ -253,10 +283,10 @@ void showBatteryPage(void)
uint8_t rowIndex = PAGE_TITLE_LINE_COUNT; uint8_t rowIndex = PAGE_TITLE_LINE_COUNT;
if (feature(FEATURE_VBAT)) { if (feature(FEATURE_VBAT)) {
tfp_sprintf(lineBuffer, "Volts: %d.%d, Cells: %d", vbat / 10, vbat % 10, batteryCellCount); tfp_sprintf(lineBuffer, "Volts: %d.%1d Cells: %d", vbat / 10, vbat % 10, batteryCellCount);
padLineBuffer();
i2c_OLED_set_line(rowIndex++); i2c_OLED_set_line(rowIndex++);
i2c_OLED_send_string(lineBuffer); i2c_OLED_send_string(lineBuffer);
padLineBuffer();
uint8_t batteryPercentage = calculateBatteryPercentage(); uint8_t batteryPercentage = calculateBatteryPercentage();
i2c_OLED_set_line(rowIndex++); i2c_OLED_set_line(rowIndex++);
@ -264,10 +294,10 @@ void showBatteryPage(void)
} }
if (feature(FEATURE_CURRENT_METER)) { if (feature(FEATURE_CURRENT_METER)) {
tfp_sprintf(lineBuffer, "Amps: %d.%d, mAh: %d", amperage / 100, amperage % 100, mAhDrawn); tfp_sprintf(lineBuffer, "Amps: %d.%2d mAh: %d", amperage / 100, amperage % 100, mAhDrawn);
padLineBuffer();
i2c_OLED_set_line(rowIndex++); i2c_OLED_set_line(rowIndex++);
i2c_OLED_send_string(lineBuffer); i2c_OLED_send_string(lineBuffer);
padLineBuffer();
uint8_t capacityPercentage = calculateBatteryCapacityRemainingPercentage(); uint8_t capacityPercentage = calculateBatteryCapacityRemainingPercentage();
i2c_OLED_set_line(rowIndex++); i2c_OLED_set_line(rowIndex++);