Merge pull request #1328 from EdgeTX/yaml_radio_version
Remove reference to EEPROM / EEPR in radio version screen
This commit is contained in:
@@ -24,13 +24,14 @@
|
|||||||
#include "options.h"
|
#include "options.h"
|
||||||
#include "libopenui.h"
|
#include "libopenui.h"
|
||||||
|
|
||||||
char * getVersion(char * str, PXX2Version version)
|
char *getVersion(char *str, PXX2Version version)
|
||||||
{
|
{
|
||||||
if (version.major == 0xFF && version.minor == 0x0F && version.revision == 0x0F) {
|
if (version.major == 0xFF && version.minor == 0x0F &&
|
||||||
|
version.revision == 0x0F) {
|
||||||
return strAppend(str, "---", 4);
|
return strAppend(str, "---", 4);
|
||||||
}
|
} else {
|
||||||
else {
|
sprintf(str, "%u.%u.%u", (1 + version.major) % 0xFF, version.minor,
|
||||||
sprintf(str, "%u.%u.%u", (1 + version.major) % 0xFF, version.minor, version.revision);
|
version.revision);
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -233,8 +234,8 @@ void RadioVersionPage::build(FormWindow * window)
|
|||||||
new StaticText(window, grid.getLineSlot(), time_stamp, 0, COLOR_THEME_PRIMARY1);
|
new StaticText(window, grid.getLineSlot(), time_stamp, 0, COLOR_THEME_PRIMARY1);
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
|
|
||||||
// EEprom version
|
// Configuration version
|
||||||
new StaticText(window, grid.getLineSlot(), eeprom_stamp, 0, COLOR_THEME_PRIMARY1);
|
new StaticText(window, grid.getLineSlot(), cfgv_stamp, 0, COLOR_THEME_PRIMARY1);
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
|
|
||||||
// Firmware options
|
// Firmware options
|
||||||
@@ -250,16 +251,21 @@ void RadioVersionPage::build(FormWindow * window)
|
|||||||
|
|
||||||
#if defined(AFHDS2)
|
#if defined(AFHDS2)
|
||||||
new StaticText(window, grid.getLabelSlot(), "RF FW:");
|
new StaticText(window, grid.getLabelSlot(), "RF FW:");
|
||||||
sprintf(reusableBuffer.moduleSetup.msg, "%d.%d.%d", (int)((NV14internalModuleFwVersion >> 16) & 0xFF), (int)((NV14internalModuleFwVersion >> 8) & 0xFF), (int)(NV14internalModuleFwVersion & 0xFF));
|
sprintf(reusableBuffer.moduleSetup.msg, "%d.%d.%d",
|
||||||
|
(int)((NV14internalModuleFwVersion >> 16) & 0xFF),
|
||||||
|
(int)((NV14internalModuleFwVersion >> 8) & 0xFF),
|
||||||
|
(int)(NV14internalModuleFwVersion & 0xFF));
|
||||||
new StaticText(window, grid.getFieldSlot(), reusableBuffer.moduleSetup.msg);
|
new StaticText(window, grid.getFieldSlot(), reusableBuffer.moduleSetup.msg);
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(PXX2)
|
#if defined(PXX2)
|
||||||
// Module and receivers versions
|
// Module and receivers versions
|
||||||
auto moduleVersions = new TextButton(window, grid.getLineSlot(), STR_MODULES_RX_VERSION);
|
auto moduleVersions =
|
||||||
|
new TextButton(window, grid.getLineSlot(), STR_MODULES_RX_VERSION);
|
||||||
moduleVersions->setPressHandler([=]() -> uint8_t {
|
moduleVersions->setPressHandler([=]() -> uint8_t {
|
||||||
new versionDialog(window, {50, 30, LCD_W - 100, 0});
|
new versionDialog(window, {50, 30, LCD_W - 100, 0});
|
||||||
return 0;
|
return 0;
|
||||||
});
|
});
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -704,7 +704,7 @@ extern const char fw_stamp[];
|
|||||||
extern const char vers_stamp[];
|
extern const char vers_stamp[];
|
||||||
extern const char date_stamp[];
|
extern const char date_stamp[];
|
||||||
extern const char time_stamp[];
|
extern const char time_stamp[];
|
||||||
extern const char eeprom_stamp[];
|
extern const char cfgv_stamp[];
|
||||||
#else
|
#else
|
||||||
extern const char vers_stamp[];
|
extern const char vers_stamp[];
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+6
-6
@@ -25,7 +25,7 @@
|
|||||||
#define STR2(s) #s
|
#define STR2(s) #s
|
||||||
#define DEFNUMSTR(s) STR2(s)
|
#define DEFNUMSTR(s) STR2(s)
|
||||||
|
|
||||||
#define EEPROM_STR DEFNUMSTR(EEPROM_VER);
|
#define CFGV_STR DEFNUMSTR(EEPROM_VER);
|
||||||
|
|
||||||
#define TAB "\037\033"
|
#define TAB "\037\033"
|
||||||
|
|
||||||
@@ -52,15 +52,15 @@
|
|||||||
#endif
|
#endif
|
||||||
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 cfgv_stamp[] = "CFGV" TAB ": " CFGV_STR;
|
||||||
#elif defined(BOARD_NAME)
|
#elif defined(BOARD_NAME)
|
||||||
const char vers_stamp[] = "FW" TAB ": edgetx-" BOARD_NAME "\036VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
|
const char vers_stamp[] = "FW" TAB ": edgetx-" BOARD_NAME "\036VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036CFGV" TAB ": " CFGV_STR;
|
||||||
#elif defined(RADIOMASTER_RELEASE)
|
#elif defined(RADIOMASTER_RELEASE)
|
||||||
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": RM Factory (" GIT_STR ")" "\036BUILT BY : EdgeTX" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
|
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": RM Factory (" GIT_STR ")" "\036BUILT BY : EdgeTX" "\036DATE" TAB ": " DATE " " TIME "\036CFGV" TAB ": " CFGV_STR;
|
||||||
#elif defined(JUMPER_RELEASE)
|
#elif defined(JUMPER_RELEASE)
|
||||||
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": Factory (" GIT_STR ")" "\036BUILT BY : EdgeTX" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
|
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": Factory (" GIT_STR ")" "\036BUILT BY : EdgeTX" "\036DATE" TAB ": " DATE " " TIME "\036CFGV" TAB ": " CFGV_STR;
|
||||||
#else
|
#else
|
||||||
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
|
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036CFGV" TAB ": " CFGV_STR;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user