diff --git a/src/frsky.h b/src/frsky.h index dbfe2f059..55fa9da3a 100644 --- a/src/frsky.h +++ b/src/frsky.h @@ -125,8 +125,8 @@ PACK(struct FrskyHubData { uint16_t maxGpsDistance; uint16_t maxCurrent; /* end */ - int16_t varioAcc1; - int16_t varioAcc2; + int16_t varioSpeed; // 0x38 Added to FrSky protocol for home made varios + int16_t cellsSum; uint16_t volts_bp; // 0x3A uint16_t volts_ap; // 0x3B // end of FrSky Hub data @@ -134,8 +134,6 @@ PACK(struct FrskyHubData { int16_t gpsAltitudeOffset; uint8_t varioAltitudeQueuePointer; // circular-buffer pointer uint8_t minCellIdx; - int16_t varioSpeed; // 0x3F Added to FrSky protocol for home made varios - uint16_t cellsSum; uint16_t vfas; // TODO later uint16_t minVfas; diff --git a/src/jeti.cpp b/src/jeti.cpp index cf49a713e..4714faf67 100644 --- a/src/jeti.cpp +++ b/src/jeti.cpp @@ -34,9 +34,9 @@ #include "open9x.h" -uint16_t jeti_keys = JETI_KEY_NOCHANGE; +volatile uint16_t jeti_keys = JETI_KEY_NOCHANGE; uint8_t JetiBuffer[32]; // 32 characters -uint8_t JetiBufferReady; +volatile uint8_t JetiBufferReady; #ifndef SIMU ISR (USART0_RX_vect) @@ -179,18 +179,12 @@ void JETI_put_stop (void) UDR0 = 0xFF; } -#include "menus.h" - -extern void menuMainView(uint8_t event); - void menuTelemetryJeti(uint8_t event) { TITLE(PSTR("JETI")); switch(event) { - //case EVT_KEY_FIRST(KEY_MENU): - // break; case EVT_KEY_FIRST(KEY_EXIT): JETI_DisableRXD(); chainMenu(menuMainView); diff --git a/src/simpgmspace.cpp b/src/simpgmspace.cpp index 8fc2dd489..66f93fed7 100644 --- a/src/simpgmspace.cpp +++ b/src/simpgmspace.cpp @@ -420,7 +420,7 @@ FATFS g_FATFS_Obj; FRESULT f_stat (const TCHAR * path, FILINFO *) { struct stat tmp; - printf("f_stat(%s)\n", path); fflush(stdout); + // printf("f_stat(%s)\n", path); fflush(stdout); return stat(path, &tmp) ? FR_INVALID_NAME : FR_OK; } diff --git a/src/sky9x/diskio.cpp b/src/sky9x/diskio.cpp index 3dc7635d9..110dbd285 100644 --- a/src/sky9x/diskio.cpp +++ b/src/sky9x/diskio.cpp @@ -957,6 +957,7 @@ FATFS g_FATFS_Obj = { 0 }; void sdMountPoll() { +#if 0 if (!Card_initialized) return; @@ -1019,6 +1020,7 @@ void sdMountPoll() case SD_ST_ERR: break; } +#endif } void sdInit()