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

Compilation fix

Browse Source
This commit is contained in:
Bertrand Songis
2019-07-04 17:04:36 +02:00
parent c975e000b8
commit 74154c5ae7
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/common/stdlcd/radio_version.cpp
+11 -11
View File
@@ -207,21 +207,21 @@ void menuRadioVersion(event_t event)
{
SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, MENU_RADIO_VERSION, ITEM_RADIO_VERSION_COUNT);
lcdDrawText(FW, FH + 2, vers_stamp, SMLSIZE);
coord_t y = MENU_HEADER_HEIGHT + 4*FH;
coord_t y = MENU_HEADER_HEIGHT + 2;
lcdDrawText(FW, y, vers_stamp, SMLSIZE);
y += 4 * (FH - 1);
#if defined(COPROCESSOR)
if (Coproc_valid == 1) {
lcdDrawTextAlignedLeft(y, "CoPr:");
lcdDraw8bitsNumber(10*FW, y, Coproc_read);
}
else {
lcdDrawTextAlignedLeft(y, "CoPr: ---");
}
y += FH;
lcdDrawText(FW, y, "COPR\037\033: ", SMLSIZE);
if (Coproc_valid == 1)
lcdDrawNumber(lcdNextPos, y, Coproc_read, SMLSIZE);
else
lcdDrawText(lcdNextPos, y, "---", SMLSIZE);
y += FH - 1;
#endif
y += 2;
#if defined(PXX2)
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_MODULES_RX_VERSION), menuVerticalPosition == ITEM_RADIO_MODULES_VERSION ? INVERS : 0);
y += FH;
radio/src/stamp.cpp
+5 -5
View File
@@ -28,6 +28,8 @@
#if defined(PCBHORUS)
#define TAB "\037\075"
#else
#define TAB "\037\033"
#endif
#if defined(COLORLCD)
@@ -35,12 +37,10 @@
const char date_stamp[] = "DATE" TAB ": " DATE;
const char time_stamp[] = "TIME" TAB ": " TIME;
const char eeprom_stamp[] = "EEPR" TAB ": " EEPROM_STR;
#elif defined(PCBTARANIS) && defined(BOARD_NAME)
const char vers_stamp[] = "FW\037\033: " "opentx-" BOARD_NAME "\036VERS\037\033: " VERSION " (" GIT_STR ")" "\036DATE\037\033: " DATE " " TIME "\036EEPR\037\033: " EEPROM_STR;
#elif defined(PCBTARANIS)
const char vers_stamp[] = "FW\037\033: " "opentx-" FLAVOUR "\036VERS\037\033: " VERSION " (" GIT_STR ")" "\036DATE\037\033: " DATE " " TIME "\036EEPR\037\033: " EEPROM_STR;
#elif defined(BOARD_NAME)
const char vers_stamp[] = "FW" TAB ": opentx-" BOARD_NAME "\036VERS" TAB ": " VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
#else
const char vers_stamp[] = "FW\037\033: " "opentx-" FLAVOUR "\036VERS\037\033: " VERSION "\036DATE\037\033: " DATE "\036TIME\037\033: " TIME "\036EEPR\037\033: " EEPROM_STR;
const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": " VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
#endif
/**
radio/src/targets/sky9x/board_lowlevel.h
+1 -1
View File
@@ -43,7 +43,7 @@
/// - BOARD_NAME
/// Name of the board.
#define BOARD_NAME "AT91SAM3S-EK"
// #define BOARD_NAME "AT91SAM3S-EK"
/// Board definition.
#define at91sam3sek
/// Family definition (already defined).