piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
Raphael Coeffic
2019-08-16 22:18:19 +02:00
parent 995888ae41
commit 06eed5d79f
6 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/opentx/opentxeeprom.cpp
+2 -1
View File
@@ -2408,7 +2408,8 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
if (version >= 219 && IS_HORUS_OR_TARANIS(board)) {
internalField.Append(new UnsignedField<2>(this, generalData.pwrOnSpeed, "Power On Speed"));
internalField.Append(new UnsignedField<4>(this, generalData.pwrOffSpeed, "Power Off Speed"));
internalField.Append(new UnsignedField<2>(this, generalData.pwrOffSpeed, "Power Off Speed"));
internalField.Append(new SpareBitsField<2>(this));
}
else {
internalField.Append(new SpareBitsField<6>(this));
radio/src/datastructs.h
+1 -5
View File
@@ -772,13 +772,9 @@ PACK(struct RadioData {
NOBACKUP(uint8_t bluetoothBaudrate:4);
NOBACKUP(uint8_t bluetoothMode:4);
NOBACKUP(uint8_t countryCode:2);
#if defined(PCBHORUS) || defined(PCBTARANIS)
NOBACKUP(uint8_t pwrOnSpeed:2);
NOBACKUP(uint8_t pwrOffSpeed:2);
NOBACKUP(uint8_t spareCC:2);
#else
NOBACKUP(uint8_t spareCC:6);
#endif
NOBACKUP(uint8_t spare5:2);
NOBACKUP(uint8_t imperial:1);
NOBACKUP(uint8_t jitterFilter:1); /* 0 - active */
NOBACKUP(uint8_t disableRssiPoweroffAlarm:1);
radio/src/gui/128x64/startup_shutdown.cpp
+6 -6
View File
@@ -28,11 +28,11 @@ const unsigned char bmp_sleep[] = {
#include "sleep.lbm"
};
void drawStartupAnimation(uint32_t duration, uint32_t total_duration)
void drawStartupAnimation(uint32_t duration, uint32_t totalDuration)
{
if (total_duration == 0) return;
if (totalDuration == 0) return;
uint8_t index = limit<uint8_t>(0, duration / (total_duration / 5), 4);
uint8_t index = limit<uint8_t>(0, duration / (totalDuration / 5), 4);
lcdRefreshWait();
lcdClear();
@@ -47,11 +47,11 @@ void drawStartupAnimation(uint32_t duration, uint32_t total_duration)
lcdRefreshWait();
}
void drawShutdownAnimation(uint32_t duration, uint32_t total_duration, const char * message)
void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration, const char * message)
{
if (total_duration == 0) return;
if (totalDuration == 0) return;
uint8_t index = limit<uint8_t>(0, duration / (total_duration / 5), 4);
uint8_t index = limit<uint8_t>(0, duration / (totalDuration / 5), 4);
lcdRefreshWait();
lcdClear();
radio/src/gui/212x64/startup_shutdown.cpp
+6 -6
View File
@@ -40,11 +40,11 @@ const unsigned char bmp_sleep[] = {
#include "sleep.lbm"
};
void drawStartupAnimation(uint32_t duration, uint32_t total_duration)
void drawStartupAnimation(uint32_t duration, uint32_t totalDuration)
{
if (total_duration == 0) return;
if (totalDuration == 0) return;
uint8_t index = limit<uint8_t>(0, duration / (total_duration / 5), 4);
uint8_t index = limit<uint8_t>(0, duration / (totalDuration / 5), 4);
lcdRefreshWait();
lcdClear();
@@ -57,11 +57,11 @@ void drawStartupAnimation(uint32_t duration, uint32_t total_duration)
lcdRefresh();
}
void drawShutdownAnimation(uint32_t duration, uint32_t total_duration, const char * message)
void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration, const char * message)
{
if (total_duration == 0) return;
if (totalDuration == 0) return;
uint8_t index = limit<uint8_t>(0, duration / (total_duration / 4), 3);
uint8_t index = limit<uint8_t>(0, duration / (totalDuration / 4), 3);
lcdRefreshWait();
lcdClear();
radio/src/gui/480x272/widgets.cpp
+4 -4
View File
@@ -391,9 +391,9 @@ void drawSleepBitmap()
}
#define SHUTDOWN_CIRCLE_DIAMETER 150
void drawShutdownAnimation(uint32_t duration, uint32_t total_duration, const char * message)
void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration, const char * message)
{
if (total_duration == 0) return;
if (totalDuration == 0) return;
static uint32_t lastDuration = 0xffffffff;
static const BitmapBuffer * shutdown = BitmapBuffer::load(getThemePath("shutdown.bmp"));
@@ -406,7 +406,7 @@ void drawShutdownAnimation(uint32_t duration, uint32_t total_duration, const cha
}
else {
lcdRestoreBackupBuffer();
int quarter = duration / (total_duration / 5);
int quarter = duration / (totalDuration / 5);
if (quarter >= 1) lcdDrawBitmapPattern(LCD_W/2, (LCD_H-SHUTDOWN_CIRCLE_DIAMETER)/2, LBM_SHUTDOWN_CIRCLE, TEXT_COLOR, 0, SHUTDOWN_CIRCLE_DIAMETER/2);
if (quarter >= 2) lcdDrawBitmapPattern(LCD_W/2, LCD_H/2, LBM_SHUTDOWN_CIRCLE, TEXT_COLOR, SHUTDOWN_CIRCLE_DIAMETER/2, SHUTDOWN_CIRCLE_DIAMETER/2);
if (quarter >= 3) lcdDrawBitmapPattern((LCD_W-SHUTDOWN_CIRCLE_DIAMETER)/2, LCD_H/2, LBM_SHUTDOWN_CIRCLE, TEXT_COLOR, SHUTDOWN_CIRCLE_DIAMETER, SHUTDOWN_CIRCLE_DIAMETER/2);
@@ -415,7 +415,7 @@ void drawShutdownAnimation(uint32_t duration, uint32_t total_duration, const cha
}
else {
lcd->clear();
int quarter = duration / (total_duration / 5);
int quarter = duration / (totalDuration / 5);
for (int i=1; i<=4; i++) {
if (quarter >= i) {
lcd->drawSolidFilledRect(LCD_W / 2 - 70 + 24 * i, LCD_H / 2 - 10, 20, 20, TEXT_BGCOLOR);
radio/src/gui/common/stdlcd/draw_functions.h
+2 -2
View File
@@ -36,8 +36,8 @@ inline void drawTimer(coord_t x, coord_t y, int32_t tme, LcdFlags att = 0)
drawTimer(x, y, tme, att, att);
}
void drawStartupAnimation(uint32_t duration, uint32_t total_duration);
void drawShutdownAnimation(uint32_t duration, uint32_t total_duration, const char * message);
void drawStartupAnimation(uint32_t duration, uint32_t totalDuration);
void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration, const char * message);
void drawSleepBitmap();
#endif // _COMMON_DRAW_FUNCTIONS_H_