sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Fix Menu / RC2

Browse Source 
#214
New Icons
Fix Hold to scroll timer with a lockout
Fix Menu lengths

New French Translation Closes #228

Fix confirmation message scroll speed
Fix translations.cpp
This commit is contained in:
Ben V. Brown
2018-03-14 23:21:29 +11:00
parent fcfa44a949
commit 0d2bfb9a29
11 changed files with 123 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
workspace/TS100/src/gui.cpp
View File

@@ -221,19 +221,22 @@ static void printShortDescription(uint32_t shortDescIndex,
static int userConfirmation(const char* message) {
uint16_t messageWidth = FONT_12_WIDTH * (strlen(message) + 7);
uint32_t messageStart = HAL_GetTick();
uint32_t messageStart = xTaskGetTickCount();
lcd.setFont(0);
lcd.setCursor(0, 0);
int16_t lastOffset = -1;
bool lcdRefresh = true;
// TODO Scrolling speed factor can be moved to User Interface settings
uint16_t scrollingSpeedFactor = 4; // lower the value - higher the speed
for (;;) {
int16_t messageOffset = (int) ((HAL_GetTick() - messageStart)
/ (float) scrollingSpeedFactor + 0.5) % messageWidth;
int16_t messageOffset =
((xTaskGetTickCount() - messageStart)
/ (systemSettings.descriptionScrollSpeed == 1 ?
1 : 2));
messageOffset %= messageWidth; //Roll around at the end
if (lastOffset != messageOffset) {
lcd.clearScreen();
@@ -611,10 +614,6 @@ void gui_Menu(const menuitem* menu) {
int16_t lastOffset = -1;
bool lcdRefresh = true;
// lower the value - higher the speed
int16_t descriptionWidth = FONT_12_WIDTH
* (strlen(menu[currentScreen].description) + 7);
while ((menu[currentScreen].draw.func != NULL) && earlyExit == false) {
lcd.setFont(0);
lcd.setCursor(0, 0);
@@ -629,10 +628,14 @@ void gui_Menu(const menuitem* menu) {
// Draw description
if (descriptionStart == 0)
descriptionStart = xTaskGetTickCount();
int16_t descriptionOffset = ((xTaskGetTickCount() - descriptionStart)
/ (systemSettings.descriptionScrollSpeed == 1?1:2));
descriptionOffset %= descriptionWidth;//Roll around at the end
// lower the value - higher the speed
int16_t descriptionWidth = FONT_12_WIDTH
* (strlen(menu[currentScreen].description) + 7);
int16_t descriptionOffset =
((xTaskGetTickCount() - descriptionStart)
/ (systemSettings.descriptionScrollSpeed == 1 ?
1 : 2));
descriptionOffset %= descriptionWidth; //Roll around at the end
if (lastOffset != descriptionOffset) {
lcd.clearScreen();