mirror
/
esp32-ogn-tracker
kopia lustrzana https://github.com/pjalocha/esp32-ogn-tracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Uniform call arguments to organize the OLED pages

pull/20/head
Pawel Jalocha 2020-04-29 22:00:22 +01:00
rodzic bad39fa7fb
commit 1b0523145a
2 zmienionych plików z 20 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
main/disp_oled.cpp
Wyświetl plik

@ -79,7 +79,7 @@ int OLED_DisplayPosition(GPS_Position *GPS=0, uint8_t LineIdx=2)
#ifdef WITH_U8G2_OLED #ifdef WITH_U8G2_OLED
void OLED_DrawLogo(u8g2_t *OLED) // draw logo and hardware options in software void OLED_DrawLogo(u8g2_t *OLED, GPS_Position *GPS) // draw logo and hardware options in software
{ {
u8g2_DrawCircle(OLED, 96, 32, 30, U8G2_DRAW_ALL); u8g2_DrawCircle(OLED, 96, 32, 30, U8G2_DRAW_ALL);
u8g2_DrawCircle(OLED, 96, 32, 34, U8G2_DRAW_UPPER_RIGHT); u8g2_DrawCircle(OLED, 96, 32, 34, U8G2_DRAW_UPPER_RIGHT);
@ -251,7 +251,7 @@ void OLED_DrawGPS(u8g2_t *OLED, GPS_Position *GPS) // GPS time, position, altit
u8g2_DrawStr(OLED, 0, 60, Line); u8g2_DrawStr(OLED, 0, 60, Line);
} }
void OLED_DrawRF(u8g2_t *OLED) // RF void OLED_DrawRF(u8g2_t *OLED, GPS_Position *GPS) // RF
{ u8g2_SetFont(OLED, u8g2_font_7x13_tf); // 5 lines. 12 pixels/line { u8g2_SetFont(OLED, u8g2_font_7x13_tf); // 5 lines. 12 pixels/line
uint8_t Len=0; uint8_t Len=0;
#ifdef WITH_RFM69 #ifdef WITH_RFM69
@ -439,7 +439,7 @@ static uint8_t BattCapacity(uint16_t mVolt)
if(mVolt<=3600) return 0; if(mVolt<=3600) return 0;
return (mVolt-3600+2)/5; } return (mVolt-3600+2)/5; }
void OLED_DrawBattery(u8g2_t *OLED) // draw battery status page void OLED_DrawBattery(u8g2_t *OLED, GPS_Position *GPS) // draw battery status page
{ uint8_t Cap=BattCapacity(BatteryVoltage>>8); // est. battery capacity based on the voltage readout { uint8_t Cap=BattCapacity(BatteryVoltage>>8); // est. battery capacity based on the voltage readout
// u8g2_SetFont(OLED, u8g2_font_battery19_tn); // u8g2_SetFont(OLED, u8g2_font_battery19_tn);
// u8g2_DrawGlyph(OLED, 120, 60, '0'+(Cap+10)/20); // u8g2_DrawGlyph(OLED, 120, 60, '0'+(Cap+10)/20);
@ -544,7 +544,7 @@ void OLED_DrawStatusBar(u8g2_t *OLED, GPS_Position *GPS)
u8g2_DrawStr(OLED, 52, 10, Line); u8g2_DrawStr(OLED, 52, 10, Line);
Sec++; if(Sec>=3) Sec=0; } Sec++; if(Sec>=3) Sec=0; }
void OLED_DrawSystem(u8g2_t *OLED) void OLED_DrawSystem(u8g2_t *OLED, GPS_Position *GPS)
{ {
u8g2_SetFont(OLED, u8g2_font_7x13_tf); // 5 lines, 12 pixels/line u8g2_SetFont(OLED, u8g2_font_7x13_tf); // 5 lines, 12 pixels/line
uint8_t Len=0; uint8_t Len=0;
@ -636,7 +636,7 @@ void OLED_DrawSystem(u8g2_t *OLED)
*/ */
} }
void OLED_DrawID(u8g2_t *OLED) void OLED_DrawID(u8g2_t *OLED, GPS_Position *GPS)
{ u8g2_SetFont(OLED, u8g2_font_9x15_tr); { u8g2_SetFont(OLED, u8g2_font_9x15_tr);
Parameters.Print(Line); Line[10]=0; Parameters.Print(Line); Line[10]=0;
u8g2_DrawStr(OLED, 26, 28, Line); u8g2_DrawStr(OLED, 26, 28, Line);

29
main/disp_oled.h
Wyświetl plik

@ -1,25 +1,26 @@
#ifdef WITH_OLED #ifdef WITH_OLED
int OLED_DisplayStatus(uint32_t Time, uint8_t LineIdx=0); int OLED_DisplayStatus (uint32_t Time, uint8_t LineIdx=0);
int OLED_DisplayPosition(GPS_Position *GPS=0, uint8_t LineIdx=2); int OLED_DisplayPosition(GPS_Position *GPS=0, uint8_t LineIdx=2);
#endif #endif
#ifdef WITH_U8G2_OLED #ifdef WITH_U8G2_OLED
void OLED_DrawLogo(u8g2_t *OLED); void OLED_DrawStatus (u8g2_t *OLED, uint32_t Time, uint8_t LineIdx=0);
void OLED_DrawStatus(u8g2_t *OLED, uint32_t Time, uint8_t LineIdx=0); void OLED_DrawPosition (u8g2_t *OLED, GPS_Position *GPS=0, uint8_t LineIdx=2);
void OLED_DrawPosition(u8g2_t *OLED, GPS_Position *GPS=0, uint8_t LineIdx=2);
void OLED_DrawGPS(u8g2_t *OLED, GPS_Position *GPS=0); void OLED_DrawLogo (u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawRF(u8g2_t *OLED); void OLED_DrawGPS (u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawRelay(u8g2_t *OLED, GPS_Position *GPS=0); void OLED_DrawRF (u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawLookout(u8g2_t *OLED, GPS_Position *GPS=0); void OLED_DrawRelay (u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawTrafWarn(u8g2_t *OLED, GPS_Position *GPS=0); void OLED_DrawLookout (u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawBaro(u8g2_t *OLED, GPS_Position *GPS=0); void OLED_DrawTrafWarn (u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawBattery(u8g2_t *OLED); void OLED_DrawBaro (u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawStatusBar(u8g2_t *OLED, GPS_Position *GPS); void OLED_DrawBattery (u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawSystem(u8g2_t *OLED); void OLED_DrawStatusBar(u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawID(u8g2_t *OLED); void OLED_DrawSystem (u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawID (u8g2_t *OLED, GPS_Position *GPS=0);
#endif #endif