mirror of
https://github.com/armel/uv-k1-k5v3-firmware-custom.git
synced 2026-10-02 03:15:37 +00:00
Add opt-in Fusion development firmware build
This commit is contained in:
1 parent
bf7eda8a48
commit
7f906300e3
10 files changed
+69
-13
No files matched your search
@@ -70,6 +70,7 @@ if(ENABLE_FEAT_F4HWN)
|
||||
"AUTHOR_STRING_2=\"${AUTHOR_STRING_2}\""
|
||||
"VERSION_STRING_1=\"${VERSION_STRING_1}\""
|
||||
"VERSION_STRING_2=\"${VERSION_STRING_2}\""
|
||||
"DISPLAY_VERSION_STRING_2=\"${DISPLAY_VERSION_STRING_2}\""
|
||||
"EDITION_STRING=\"${EDITION_STRING}\""
|
||||
ALERT_TOT=10
|
||||
)
|
||||
|
||||
+1
-1
@@ -1187,7 +1187,7 @@ void UI_DisplayMenu(void)
|
||||
if (page == p++) {
|
||||
// Page 0: firmware identity.
|
||||
#ifdef ENABLE_FEAT_F4HWN
|
||||
sprintf(String, "%s\n%s", AUTHOR_STRING_2, VERSION_STRING_2);
|
||||
sprintf(String, "%s\n%s", AUTHOR_STRING_2, DISPLAY_VERSION_STRING_2);
|
||||
UI_PrintStringSmallNormal(Edition, menu_item_x1 - 1, menu_item_x2, 6);
|
||||
#else
|
||||
sprintf(String, "%u.%02uV\n%u%%",
|
||||
|
||||
+23
-6
@@ -20,6 +20,7 @@
|
||||
#include "driver/py25q16.h"
|
||||
#include "driver/st7565.h"
|
||||
#include "external/printf/printf.h"
|
||||
#include "font.h"
|
||||
#include "helper/battery.h"
|
||||
#include "settings.h"
|
||||
#include "misc.h"
|
||||
@@ -312,17 +313,33 @@ void UI_DisplayWelcome(void)
|
||||
UI_PrintString(WelcomeString1, 0, 127, 2, 10);
|
||||
|
||||
#ifdef ENABLE_FEAT_F4HWN
|
||||
UI_PrintStringSmallNormal(Version, 0, 128, 4);
|
||||
const size_t version_width = strlen(DisplayVersion) * (ARRAY_SIZE(gFontSmall[0]) + 1u);
|
||||
const uint8_t version_x = version_width < LCD_WIDTH
|
||||
? (uint8_t)((LCD_WIDTH - version_width + 1u) / 2u)
|
||||
: 0u;
|
||||
const uint8_t capsule_left = version_x > 2u ? (uint8_t)(version_x - 3u) : 0u;
|
||||
const size_t capsule_right_candidate = version_x + version_width + 2u;
|
||||
const uint8_t capsule_right = capsule_right_candidate < LCD_WIDTH
|
||||
? (uint8_t)capsule_right_candidate
|
||||
: (LCD_WIDTH - 1u);
|
||||
|
||||
UI_DrawLineBuffer(gFrameBuffer, 0, 35, 18, 35, 1);
|
||||
gFrameBuffer[4][19] ^= 0x7F;
|
||||
for (uint8_t x = 20; x < 108; x++)
|
||||
UI_PrintStringSmallNormal(DisplayVersion, version_x, 0, 4);
|
||||
|
||||
if (capsule_left > 0u)
|
||||
{
|
||||
UI_DrawLineBuffer(gFrameBuffer, 0, 35, capsule_left - 1u, 35, 1);
|
||||
}
|
||||
gFrameBuffer[4][capsule_left] ^= 0x7F;
|
||||
for (uint8_t x = capsule_left + 1u; x < capsule_right; x++)
|
||||
{
|
||||
gFrameBuffer[4][x] ^= 0xFF;
|
||||
gFrameBuffer[3][x] ^= 0x80;
|
||||
}
|
||||
gFrameBuffer[4][108] ^= 0x7F;
|
||||
UI_DrawLineBuffer(gFrameBuffer, 109, 35, 127, 35, 1);
|
||||
gFrameBuffer[4][capsule_right] ^= 0x7F;
|
||||
if (capsule_right < LCD_WIDTH - 1u)
|
||||
{
|
||||
UI_DrawLineBuffer(gFrameBuffer, capsule_right + 1u, 35, LCD_WIDTH - 1u, 35, 1);
|
||||
}
|
||||
|
||||
/*
|
||||
#ifdef ENABLE_FEAT_F4HWN_MEM
|
||||
|
||||
+6
-5
@@ -6,11 +6,12 @@
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_FEAT_F4HWN
|
||||
const char Version[] = AUTHOR_STRING_2 " " VERSION_STRING_2;
|
||||
const char Edition[] = EDITION_STRING;
|
||||
const char BuildDate[] = __DATE__;
|
||||
const char BuildTime[] = __TIME__;
|
||||
const char BuildCommit[] = BUILD_COMMIT;
|
||||
const char Version[] = AUTHOR_STRING_2 " " VERSION_STRING_2;
|
||||
const char DisplayVersion[] = AUTHOR_STRING_2 " " DISPLAY_VERSION_STRING_2;
|
||||
const char Edition[] = EDITION_STRING;
|
||||
const char BuildDate[] = __DATE__;
|
||||
const char BuildTime[] = __TIME__;
|
||||
const char BuildCommit[] = BUILD_COMMIT;
|
||||
#else
|
||||
const char Version[] = AUTHOR_STRING VER;
|
||||
#endif
|
||||
|
||||
@@ -23,6 +23,7 @@ extern const char UART_Version[];
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_FEAT_F4HWN
|
||||
extern const char DisplayVersion[];
|
||||
extern const char Edition[];
|
||||
extern const char BuildDate[];
|
||||
extern const char BuildTime[];
|
||||
|
||||
Reference in new issue
Block a user