Compilation fix
This commit is contained in:
@@ -207,21 +207,21 @@ void menuRadioVersion(event_t event)
|
|||||||
{
|
{
|
||||||
SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, MENU_RADIO_VERSION, ITEM_RADIO_VERSION_COUNT);
|
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 + 2;
|
||||||
|
lcdDrawText(FW, y, vers_stamp, SMLSIZE);
|
||||||
coord_t y = MENU_HEADER_HEIGHT + 4*FH;
|
y += 4 * (FH - 1);
|
||||||
|
|
||||||
#if defined(COPROCESSOR)
|
#if defined(COPROCESSOR)
|
||||||
if (Coproc_valid == 1) {
|
lcdDrawText(FW, y, "COPR\037\033: ", SMLSIZE);
|
||||||
lcdDrawTextAlignedLeft(y, "CoPr:");
|
if (Coproc_valid == 1)
|
||||||
lcdDraw8bitsNumber(10*FW, y, Coproc_read);
|
lcdDrawNumber(lcdNextPos, y, Coproc_read, SMLSIZE);
|
||||||
}
|
else
|
||||||
else {
|
lcdDrawText(lcdNextPos, y, "---", SMLSIZE);
|
||||||
lcdDrawTextAlignedLeft(y, "CoPr: ---");
|
y += FH - 1;
|
||||||
}
|
|
||||||
y += FH;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
y += 2;
|
||||||
|
|
||||||
#if defined(PXX2)
|
#if defined(PXX2)
|
||||||
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_MODULES_RX_VERSION), menuVerticalPosition == ITEM_RADIO_MODULES_VERSION ? INVERS : 0);
|
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_MODULES_RX_VERSION), menuVerticalPosition == ITEM_RADIO_MODULES_VERSION ? INVERS : 0);
|
||||||
y += FH;
|
y += FH;
|
||||||
|
|||||||
+5
-5
@@ -28,6 +28,8 @@
|
|||||||
|
|
||||||
#if defined(PCBHORUS)
|
#if defined(PCBHORUS)
|
||||||
#define TAB "\037\075"
|
#define TAB "\037\075"
|
||||||
|
#else
|
||||||
|
#define TAB "\037\033"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
@@ -35,12 +37,10 @@
|
|||||||
const char date_stamp[] = "DATE" TAB ": " DATE;
|
const char date_stamp[] = "DATE" TAB ": " DATE;
|
||||||
const char time_stamp[] = "TIME" TAB ": " TIME;
|
const char time_stamp[] = "TIME" TAB ": " TIME;
|
||||||
const char eeprom_stamp[] = "EEPR" TAB ": " EEPROM_STR;
|
const char eeprom_stamp[] = "EEPR" TAB ": " EEPROM_STR;
|
||||||
#elif defined(PCBTARANIS) && defined(BOARD_NAME)
|
#elif 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;
|
const char vers_stamp[] = "FW" TAB ": opentx-" BOARD_NAME "\036VERS" TAB ": " VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " 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;
|
|
||||||
#else
|
#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
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
/// - BOARD_NAME
|
/// - BOARD_NAME
|
||||||
|
|
||||||
/// Name of the board.
|
/// Name of the board.
|
||||||
#define BOARD_NAME "AT91SAM3S-EK"
|
// #define BOARD_NAME "AT91SAM3S-EK"
|
||||||
/// Board definition.
|
/// Board definition.
|
||||||
#define at91sam3sek
|
#define at91sam3sek
|
||||||
/// Family definition (already defined).
|
/// Family definition (already defined).
|
||||||
|
|||||||
Reference in New Issue
Block a user