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

Description scroll speed parametrized + smooth scroll in userConfirmation (#221)

Browse Source 
* Enabled DOUBLE line for Croatian + translation fix

Enabled DOUBLE line Menu for Croatian.
A minor translation fix.

* Added Double line menus for Croatian

Added Double line menus for Croatian. For some reason they were not included in the previous pull request, even though I made them (most probably it was by my mistake).

* Added "Power: " translation for Croatian

* Menu desciption scroll sped up 3x

* Slow scroll

* Additional HR translation fix

* EOL fixed

* Fixed flickering - update only when required

* Parametrized description scrolling speed

* Synchronized Translation.c with original Ralim master

* Removed unnecessary check

* lcd.refresh() in description scroll called only when required

* Smooth scrolling also implemented in userConfirmation() method

* Variable messageSpeedFactor renamed to messageSpeedFactor

* Variable renamed
This commit is contained in:
jonnieZG
2018-03-11 03:12:49 +01:00
committed by Ben V. Brown
parent fbd730760b
commit 33edf6ba76
5 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workspace/TS100/.settings/language.settings.xml
View File

@@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1452291918433808979" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="3703734836139458" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1452291918433808979" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="3703734836139458" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

3
workspace/TS100/inc/Font.h
View File

@@ -10,6 +10,9 @@
#ifndef FONT_H_ #ifndef FONT_H_
#define FONT_H_ #define FONT_H_
#include "Translation.h" #include "Translation.h"
#define FONT_12_WIDTH 12
/* /*
* Remember screen is LSB at the top, MSB at the bottom of the strip! * Remember screen is LSB at the top, MSB at the bottom of the strip!
*/ */

1
workspace/TS100/inc/OLED.hpp
View File

@@ -21,6 +21,7 @@ extern "C" {
} }
#endif #endif
#define DEVICEADDR_OLED (0x3c<<1) #define DEVICEADDR_OLED (0x3c<<1)
#define OLED_WIDTH 96
class OLED { class OLED {
public: public:

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

@@ -102,19 +102,30 @@ static void printShortDescription(uint32_t shortDescIndex,
} }
static int userConfirmation(const char* message) { static int userConfirmation(const char* message) {
uint8_t maxOffset = strlen(message) + 7; uint16_t messageWidth = FONT_12_WIDTH * (strlen(message) + 7);
uint32_t messageStart = xTaskGetTickCount(); uint32_t messageStart = HAL_GetTick();
lcd.setFont(0); lcd.setFont(0);
lcd.setCursor(0, 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 (;;) { for (;;) {
int16_t messageOffset = (((xTaskGetTickCount() - messageStart) / 15) int16_t messageOffset = (int) ((HAL_GetTick() - messageStart)
% maxOffset); / (float) scrollingSpeedFactor + 0.5) % messageWidth;
lcd.clearScreen(); if (lastOffset != messageOffset) {
lcd.setCursor(12 * (7 - messageOffset), 0); lcd.clearScreen();
lcd.print(message);
//^ Rolling offset based on time
lcd.setCursor((OLED_WIDTH - messageOffset), 0);
lcd.print(message);
lastOffset = messageOffset;
lcdRefresh = true;
}
ButtonState buttons = getButtonState(); ButtonState buttons = getButtonState();
switch (buttons) { switch (buttons) {
@@ -132,8 +143,11 @@ static int userConfirmation(const char* message) {
return 0; return 0;
} }
lcd.refresh(); if (lcdRefresh) {
osDelay(50); lcd.refresh();
osDelay(20);
lcdRefresh = false;
}
} }
return 0; return 0;
} }

32
workspace/TS100/src/main.cpp
View File

@@ -21,7 +21,6 @@ uint8_t PCBVersion = 0;
uint16_t currentlyActiveTemperatureTarget = 0; uint16_t currentlyActiveTemperatureTarget = 0;
uint32_t lastMovementTime = 0; uint32_t lastMovementTime = 0;
uint32_t lastButtonTime = 0; uint32_t lastButtonTime = 0;
int16_t lastOffset = 0;
// FreeRTOS variables // FreeRTOS variables
osThreadId GUITaskHandle; osThreadId GUITaskHandle;
@@ -332,6 +331,12 @@ static void gui_settingsMenu() {
uint32_t autoRepeatTimer = 0; uint32_t autoRepeatTimer = 0;
bool earlyExit = false; bool earlyExit = false;
uint32_t descriptionStart = 0; uint32_t descriptionStart = 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
while ((settingsMenu[currentScreen].incrementHandler.func != NULL) while ((settingsMenu[currentScreen].incrementHandler.func != NULL)
&& earlyExit == false) { && earlyExit == false) {
lcd.setFont(0); lcd.setFont(0);
@@ -341,25 +346,29 @@ static void gui_settingsMenu() {
lcd.clearScreen(); lcd.clearScreen();
settingsMenu[currentScreen].draw.func(); settingsMenu[currentScreen].draw.func();
lastOffset = 0; lastOffset = -1;
lcdRefresh = true;
} else { } else {
// Draw description // Draw description
// draw string starting from descriptionOffset // draw string starting from descriptionOffset
int16_t maxOffset = strlen(settingsMenu[currentScreen].description) int16_t descriptionWidth = FONT_12_WIDTH
+ 7; * (strlen(settingsMenu[currentScreen].description) + 7);
if (descriptionStart == 0) if (descriptionStart == 0)
descriptionStart = HAL_GetTick(); descriptionStart = HAL_GetTick();
int16_t descriptionOffset = ((((HAL_GetTick() - descriptionStart) int16_t descriptionOffset =
/ 20) % (maxOffset * 2))) * 6; (int) ((HAL_GetTick() - descriptionStart)
/ (float) scrollingSpeedFactor + 0.5)
% descriptionWidth;
if (lastOffset == 0 || lastOffset!=descriptionOffset) { if (lastOffset != descriptionOffset) {
lcd.clearScreen(); lcd.clearScreen();
//^ Rolling offset based on time //^ Rolling offset based on time
lcd.setCursor(((7 * 12) - descriptionOffset), 0); lcd.setCursor((OLED_WIDTH - descriptionOffset), 0);
lcd.print(settingsMenu[currentScreen].description); lcd.print(settingsMenu[currentScreen].description);
lastOffset = descriptionOffset; lastOffset = descriptionOffset;
lcdRefresh = true;
} }
} }
@@ -403,8 +412,11 @@ static void gui_settingsMenu() {
break; break;
} }
lcd.refresh(); // update the LCD if (lcdRefresh) {
osDelay(20); lcd.refresh(); // update the LCD
osDelay(20);
lcdRefresh = false;
}
} }
saveSettings(); saveSettings();