[Vario] Now ID 0x38 instead of 0x3F for vario (home made sensors)

[Jeti] Code cleaning
[sky9x] No more SD mount polling
This commit is contained in:
bsongis
2013-01-31 20:16:30 +00:00
parent cdc4470d1e
commit 313a74bc7c
4 changed files with 7 additions and 13 deletions
+2 -4
View File
@@ -125,8 +125,8 @@ PACK(struct FrskyHubData {
uint16_t maxGpsDistance; uint16_t maxGpsDistance;
uint16_t maxCurrent; uint16_t maxCurrent;
/* end */ /* end */
int16_t varioAcc1; int16_t varioSpeed; // 0x38 Added to FrSky protocol for home made varios
int16_t varioAcc2; int16_t cellsSum;
uint16_t volts_bp; // 0x3A uint16_t volts_bp; // 0x3A
uint16_t volts_ap; // 0x3B uint16_t volts_ap; // 0x3B
// end of FrSky Hub data // end of FrSky Hub data
@@ -134,8 +134,6 @@ PACK(struct FrskyHubData {
int16_t gpsAltitudeOffset; int16_t gpsAltitudeOffset;
uint8_t varioAltitudeQueuePointer; // circular-buffer pointer uint8_t varioAltitudeQueuePointer; // circular-buffer pointer
uint8_t minCellIdx; uint8_t minCellIdx;
int16_t varioSpeed; // 0x3F Added to FrSky protocol for home made varios
uint16_t cellsSum;
uint16_t vfas; uint16_t vfas;
// TODO later uint16_t minVfas; // TODO later uint16_t minVfas;
+2 -8
View File
@@ -34,9 +34,9 @@
#include "open9x.h" #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 JetiBuffer[32]; // 32 characters
uint8_t JetiBufferReady; volatile uint8_t JetiBufferReady;
#ifndef SIMU #ifndef SIMU
ISR (USART0_RX_vect) ISR (USART0_RX_vect)
@@ -179,18 +179,12 @@ void JETI_put_stop (void)
UDR0 = 0xFF; UDR0 = 0xFF;
} }
#include "menus.h"
extern void menuMainView(uint8_t event);
void menuTelemetryJeti(uint8_t event) void menuTelemetryJeti(uint8_t event)
{ {
TITLE(PSTR("JETI")); TITLE(PSTR("JETI"));
switch(event) switch(event)
{ {
//case EVT_KEY_FIRST(KEY_MENU):
// break;
case EVT_KEY_FIRST(KEY_EXIT): case EVT_KEY_FIRST(KEY_EXIT):
JETI_DisableRXD(); JETI_DisableRXD();
chainMenu(menuMainView); chainMenu(menuMainView);
+1 -1
View File
@@ -420,7 +420,7 @@ FATFS g_FATFS_Obj;
FRESULT f_stat (const TCHAR * path, FILINFO *) FRESULT f_stat (const TCHAR * path, FILINFO *)
{ {
struct stat tmp; 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; return stat(path, &tmp) ? FR_INVALID_NAME : FR_OK;
} }
+2
View File
@@ -957,6 +957,7 @@ FATFS g_FATFS_Obj = { 0 };
void sdMountPoll() void sdMountPoll()
{ {
#if 0
if (!Card_initialized) if (!Card_initialized)
return; return;
@@ -1019,6 +1020,7 @@ void sdMountPoll()
case SD_ST_ERR: case SD_ST_ERR:
break; break;
} }
#endif
} }
void sdInit() void sdInit()