hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

add option for text across the top on custom LCD

Browse Source
This commit is contained in:
joeycastillo 2024-09-29 14:54:59 -04:00
parent c0db4af5d5
commit b66f91a0b9
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
watch-library/shared/watch/watch_common_display.c
View File

@ -54,6 +54,7 @@ static const uint32_t IndicatorSegments[] = {
void watch_display_character(uint8_t character, uint8_t position) { void watch_display_character(uint8_t character, uint8_t position) {
#ifdef USE_CUSTOM_LCD #ifdef USE_CUSTOM_LCD
if (character == 'R') character = 'r'; // We can't display uppercase R on this display. if (character == 'R') character = 'r'; // We can't display uppercase R on this display.
else if (character == 'T' && position > 1 && position < 8) character = 't'; // lowercase t is the only option for these positions
#else #else
// special cases for positions 4 and 6 // special cases for positions 4 and 6
if (position == 4 || position == 6) { if (position == 4 || position == 6) {
@ -155,6 +156,7 @@ void watch_display_string(const char *string, uint8_t position) {
void watch_display_text(watch_position_t location, const char *string) { void watch_display_text(watch_position_t location, const char *string) {
switch (location) { switch (location) {
case WATCH_POSITION_TOP:
case WATCH_POSITION_TOP_LEFT: case WATCH_POSITION_TOP_LEFT:
watch_display_character(string[0], 0); watch_display_character(string[0], 0);
if (string[1]) { if (string[1]) {
@ -198,7 +200,6 @@ void watch_display_text(watch_position_t location, const char *string) {
} }
break; break;
case WATCH_POSITION_FULL: case WATCH_POSITION_FULL:
default:
// This is deprecated, but we use it for the legacy behavior. // This is deprecated, but we use it for the legacy behavior.
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
@ -212,6 +213,14 @@ void watch_display_text_with_fallback(watch_position_t location, const char *str
(void)fallback; (void)fallback;
switch (location) { switch (location) {
case WATCH_POSITION_TOP:
for (size_t i = 0; i < strlen(string); i++) {
if (i < 2) watch_display_character(string[i], i);
else if (i == 2) watch_display_character(string[i], 10);
else if (i < 5) watch_display_character(string[i], i - 1);
else break;
}
break;
case WATCH_POSITION_TOP_LEFT: case WATCH_POSITION_TOP_LEFT:
watch_display_character(string[0], 0); watch_display_character(string[0], 0);
if (string[1]) { if (string[1]) {
@ -248,7 +257,6 @@ void watch_display_text_with_fallback(watch_position_t location, const char *str
watch_display_text(location, string); watch_display_text(location, string);
break; break;
case WATCH_POSITION_FULL: case WATCH_POSITION_FULL:
default:
// This is deprecated, but we use it for the legacy behavior. // This is deprecated, but we use it for the legacy behavior.
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"

1
watch-library/shared/watch/watch_slcd.h
View File

@ -62,6 +62,7 @@ typedef enum {
/// An enum listing the locations on the display where text can be placed. /// An enum listing the locations on the display where text can be placed.
typedef enum { typedef enum {
WATCH_POSITION_FULL = 0, ///< Display 10 characters to the full screen, in the standard F-91W layout. WATCH_POSITION_FULL = 0, ///< Display 10 characters to the full screen, in the standard F-91W layout.
WATCH_POSITION_TOP, ///< Display 2 (classic) or 5 (custom) characters at the top of the screen. On custom LCD, overwrites top right positon.
WATCH_POSITION_TOP_LEFT, ///< Display 2 or 3 characters in the top left of the screen. WATCH_POSITION_TOP_LEFT, ///< Display 2 or 3 characters in the top left of the screen.
WATCH_POSITION_TOP_RIGHT, ///< Display 2 digits in the top right of the screen. WATCH_POSITION_TOP_RIGHT, ///< Display 2 digits in the top right of the screen.
WATCH_POSITION_BOTTOM, ///< Display 6 characters at the bottom of the screen, the main line. WATCH_POSITION_BOTTOM, ///< Display 6 characters at the bottom of the screen, the main line.