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

OLED Page with Altitude, Vario and Speed

pull/21/head
Farkas Szilárd 2020-04-27 12:44:18 +02:00
rodzic 3a82baf506
commit 5f3587a15a
3 zmienionych plików z 96 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
main/disp.cpp
Wyświetl plik

@ -26,9 +26,9 @@
#ifdef WITH_U8G2_OLED
#ifdef WITH_U8G2_LISTS
const uint8_t DISP_Pages = 6+3;
const uint8_t DISP_Pages = 7+3;
#else
const uint8_t DISP_Pages = 6;
const uint8_t DISP_Pages = 7;
#endif
static uint8_t DISP_Page = 1;
#endif
@ -178,9 +178,10 @@ void vTaskDISP(void* pvParameters)
// case 6: OLED_DrawRelay (&U8G2_OLED, GPS); break;
// case 7: OLED_DrawLookout(&U8G2_OLED, GPS); break;
case 0: OLED_DrawBattery(&U8G2_OLED, GPS); break;
case 6: OLED_DrawAltitudeAndSpeed (&U8G2_OLED, GPS); break;
#ifdef WITH_U8G2_LISTS
case 6: OLED_DrawRelay (&U8G2_OLED, GPS); break;
case 7: OLED_DrawLookout(&U8G2_OLED, GPS); break;
case 7: OLED_DrawRelay (&U8G2_OLED, GPS); break;
case 8: OLED_DrawLookout(&U8G2_OLED, GPS); break;
case 9: OLED_DrawTrafWarn(&U8G2_OLED, GPS); break;
#endif
// default:
@ -188,6 +189,7 @@ void vTaskDISP(void* pvParameters)
// OLED_DrawPosition(&U8G2_OLED, GPS, 2); }
}
}
//if ( DISP_Page != 6 )
OLED_DrawStatusBar(&U8G2_OLED, GPS);
u8g2_SendBuffer(&U8G2_OLED);
}

89
main/disp_oled.cpp
Wyświetl plik

@ -692,6 +692,95 @@ void OLED_DrawID(u8g2_t *OLED, GPS_Position *GPS)
u8g2_DrawStr(OLED, 96, 62, "v0.1.1");
}
void OLED_DrawAltitudeAndSpeed(u8g2_t *OLED, GPS_Position *GPS)
{ uint8_t Len=0;
// Altitude
if(GPS && GPS->hasBaro)
//Len+=Format_UnsDec(Line+Len, (95634+5)/10, 1, 0);
Len+=Format_UnsDec(Line+Len, (GPS->StdAltitude+5)/10, 1, 0);
else
Len+=Format_String(Line+Len, "----");
Line[Len]=0;
u8g2_SetFont(OLED, u8g2_font_fub20_tr);
uint8_t Altitude_width = u8g2_GetStrWidth(OLED, Line);
u8g2_DrawStr(OLED, 80-Altitude_width, 40, Line);
Len=0;
Len+=Format_String(Line+Len, "m");
Line[Len]=0;
u8g2_SetFont(OLED, u8g2_font_9x15_tr);
u8g2_DrawStr(OLED, 84, 40, Line);
// Climb Rate
Len=0;
if(GPS && GPS->hasBaro) {
//int16_t vario_value = 129;
int16_t vario_value = GPS->ClimbRate;
if(vario_value<0) {
vario_value=(-vario_value);
#define minus_width 10
#define minus_height 17
static unsigned char minus_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0xfe, 0x01, 0xfe, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
u8g2_DrawXBM(OLED,0,47,minus_width, minus_height, minus_bits);
}
else {
#define plus_width 10
#define plus_height 17
static unsigned char plus_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x30, 0x00,
0x30, 0x00, 0xfe, 0x01, 0xfe, 0x01, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
u8g2_DrawXBM(OLED,0,47,plus_width, plus_height, plus_bits);
}
Len+=Format_UnsDec(Line+Len, vario_value, 2, 1);
}
else
Len+=Format_String(Line+Len, "-.-");
Line[Len]=0;
u8g2_SetFont(OLED, u8g2_font_fub17_tr);
uint8_t Vario_width = u8g2_GetStrWidth(OLED, Line);
u8g2_DrawStr(OLED, 54-Vario_width, 64, Line);
#define ms_width 7
#define ms_height 17
static unsigned char ms_bits[] = {
0x00, 0x00, 0x16, 0x2a, 0x2a, 0x2a, 0x2a, 0x00, 0x7f, 0x00, 0x1c, 0x22,
0x02, 0x1c, 0x20, 0x22, 0x1c };
u8g2_DrawXBM(OLED,58,47,ms_width, ms_height, ms_bits);
// Speed
Len=0;
if(GPS) {
uint16_t speed = round(GPS->Speed * 0.36f); // Speed is in 0.1m/s
Len+=Format_UnsDec(Line+Len, speed, 1, 0);
//Len+=Format_UnsDec(Line+Len, 623, 1, 0);
}
else
Len+=Format_String(Line+Len, "-");
Line[Len]=0;
u8g2_SetFont(OLED, u8g2_font_fub17_tr);
uint8_t Speed_width = u8g2_GetStrWidth(OLED, Line);
u8g2_DrawStr(OLED, 114-Speed_width, 64, Line);
#define kmh_width 10
#define kmh_height 17
static unsigned char kmh_bits[] = {
0x01, 0x00, 0x01, 0x00, 0x69, 0x01, 0xa5, 0x02, 0xa3, 0x02, 0xa5, 0x02,
0xa9, 0x02, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0x08, 0x00, 0x08, 0x00,
0x08, 0x00, 0x38, 0x00, 0x48, 0x00, 0x48, 0x00, 0x48, 0x00 };
u8g2_DrawXBM(OLED,118,47,kmh_width, kmh_height, kmh_bits);
}
#endif
// ========================================================================================================================

1
main/disp_oled.h
Wyświetl plik

@ -22,5 +22,6 @@ void OLED_DrawBattery (u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawStatusBar(u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawSystem (u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawID (u8g2_t *OLED, GPS_Position *GPS=0);
void OLED_DrawAltitudeAndSpeed(u8g2_t *OLED, GPS_Position *GPS=0);
#endif