Skip to content

fix out of range chars #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix out of range chars #156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion watch-library/shared/watch/watch_common_display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ uint8_t IndicatorSegments[8] = {
SLCD_SEGID(4, 0) // WATCH_INDICATOR_COLON (does not exist, will set in SDATAL4 which is harmless)
};

const uint8_t LCD_Character_Set_first = 0x20 ;
const uint8_t LCD_Character_Set_last = 0x20 + sizeof(Classic_LCD_Character_Set) - 1 ;

void watch_display_character(uint8_t character, uint8_t position) {
if (watch_get_lcd_type() == WATCH_LCD_TYPE_CUSTOM) {
if (character == 'R' && position > 1 && position < 8) character = 'r'; // We can't display uppercase R in these positions
Expand Down Expand Up @@ -89,6 +92,8 @@ void watch_display_character(uint8_t character, uint8_t position) {
digit_mapping_t segmap;
uint8_t segdata;

if((character-0x20 < LCD_Character_Set_first) | (character-0x20 > LCD_Character_Set_last)) return ;

/// TODO: This could be optimized by doing this check once and setting a pointer in watch_discover_lcd_type.

if (watch_get_lcd_type() == WATCH_LCD_TYPE_CUSTOM) {
Expand Down Expand Up @@ -125,10 +130,11 @@ void watch_display_character(uint8_t character, uint8_t position) {

void watch_display_character_lp_seconds(uint8_t character, uint8_t position) {
// Will only work for digits and for positions 8 and 9 - but less code & checks to reduce power consumption

digit_mapping_t segmap;
uint8_t segdata;

if((character-0x20 < LCD_Character_Set_first) | (character-0x20 > LCD_Character_Set_last)) return ;

/// TODO: See optimization note above.

if (watch_get_lcd_type() == WATCH_LCD_TYPE_CUSTOM) {
Expand Down Expand Up @@ -169,6 +175,7 @@ void watch_display_string(const char *string, uint8_t position) {
}

void watch_display_text(watch_position_t location, const char *string) {
if(string[0] == '\0') return ;
switch (location) {
case WATCH_POSITION_TOP:
case WATCH_POSITION_TOP_LEFT:
Expand Down Expand Up @@ -228,9 +235,11 @@ void watch_display_text(watch_position_t location, const char *string) {

void watch_display_text_with_fallback(watch_position_t location, const char *string, const char *fallback) {
if (watch_get_lcd_type() == WATCH_LCD_TYPE_CUSTOM) {
if (string[0] == '\0') return;
switch (location) {
case WATCH_POSITION_TOP:
for (size_t i = 0; i < strlen(string); i++) {
if (string[i] == '\0') break;
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);
Expand Down