From ea4bba0deadd34ce18bb0fcca4ea2e0f65016e75 Mon Sep 17 00:00:00 2001 From: bsongis Date: Thu, 5 Apr 2012 16:53:48 +0000 Subject: [PATCH] Warning solved (thanks gbirkus) Issue 18 (thanks Paul) fixed --- src/frsky.cpp | 2 +- src/open9x.cpp | 2 +- src/statistics_views.cpp | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/frsky.cpp b/src/frsky.cpp index 672ab30d8..7a8a4b253 100644 --- a/src/frsky.cpp +++ b/src/frsky.cpp @@ -227,7 +227,7 @@ void parseTelemHubByte(uint8_t byte) switch ((uint8_t)structPos) { case offsetof(FrskyHubData, rpm): - frskyHubData.rpm /= (g_model.frsky.blades+2); + frskyHubData.rpm *= (uint8_t)60/(g_model.frsky.blades+2); if (frskyHubData.rpm > frskyHubData.maxRpm) frskyHubData.maxRpm = frskyHubData.rpm; break; diff --git a/src/open9x.cpp b/src/open9x.cpp index a49905bdc..2f53f89ad 100644 --- a/src/open9x.cpp +++ b/src/open9x.cpp @@ -1643,7 +1643,7 @@ void perOut(uint8_t phase) char userDataDisplayBuf[TELEM_SCREEN_BUFFER_SIZE]; #endif -#if defined(PCBARM) || (defined(PCBV4) && !defined(REV0)) +#if (defined(PCBARM) && !defined(REVA) && !defined(SIMU)) || (defined(PCBV4) && !defined(REV0) && !defined(SIMU)) #define TIME_TO_WRITE (s_eeDirtyMsk && (get_tmr10ms() - s_eeDirtyTime10ms) >= WRITE_DELAY_10MS) #else #define TIME_TO_WRITE s_eeDirtyMsk diff --git a/src/statistics_views.cpp b/src/statistics_views.cpp index 4e7bd0c99..eec53d91c 100644 --- a/src/statistics_views.cpp +++ b/src/statistics_views.cpp @@ -77,9 +77,12 @@ void menuProcStatistic(uint8_t event) } } +#if defined(PCBARM) && defined(REVB) uint16_t Current ; uint32_t Current_sum ; uint8_t Current_count ; +#endif + void menuProcDebug(uint8_t event) { TITLE(STR_MENUDEBUG);