Th3maz1ng/W800_Smart_Watch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Regenerated used fonts (14, 16, 24, 28 and 30) to add accented characters used in the french and german languages. Added parentheses around macro value in app_config.h, Updated the firmware_version.h file.

Browse Source
This commit is contained in:
Th3maz1ng 2023-11-04 12:09:02 +01:00
parent 0580425401
commit 54c35bcde8
12 changed files with 4202 additions and 1630 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/W800_SDK_v1.00.10/app/app_config.h
View File

@ -53,7 +53,7 @@
* @brief lcd display
*
*/
#define LCD_ROTATION 0
#define LCD_ROTATION (0)
#define LCD_CLOCK_CLOCK WM_IO_PB_06
#define LCD_DATA_LINE WM_IO_PB_07
#define LCD_CHIP_SELECT WM_IO_PB_10

33
src/W800_SDK_v1.00.10/app/firmware_version.h
View File

@ -1,8 +1,35 @@
#ifndef FIRMWARE_VERSION_H
#define FIRMWARE_VERSION_H
//#define FIRMWARE_VERSION "0.0.1" //Firmware creation
#define FIRMWARE_VERSION "0.0.2" //Updated the music player to be more accurate, Selected category in menu setting is now highlighted
#define FIRMWARE_TIME_DATE (__TIME__" "__DATE__)
/**
* @brief Firmware creation
*
*/
//#define FIRMWARE_VERSION "0.0.1"
/**
* @brief Updated the music player to be more accurate,
* selected category in menu setting is now highlighted
*
*/
//#define FIRMWARE_VERSION "0.0.2"
/**
* @brief Added message notification support,
* corrected the year of the date overflowing,
* remap of the accelerometer wrist tilt when changing screen orientation
*
*/
//#define FIRMWARE_VERSION "0.0.3"
/**
* @brief Fonts now support accents (used for the French and German GUI text translations)
*
*/
#define FIRMWARE_VERSION "0.0.4"
#define FIRMWARE_COMPILATION_TIME_DATE (__TIME__" "__DATE__)
#endif //FIRMWARE_VERSION_H

37
src/W800_SDK_v1.00.10/app/gfx/settings_screen.c
View File

@ -55,6 +55,8 @@ static void _settings_screen_update_labels_language(SettingsScreen_t * const set
{
// Update the header's title
common_screen_header_update_title(translation_get_word(TRANSLATION_SETTINGS));
// Language label
lv_label_set_text_static(settingsScreen->language_label, translation_get_word(TRANSLATION_LANGUAGE_2));
// All items in the menu list
update_menu_list_item_text(settingsScreen->time_and_date_item, translation_get_word(TRANSLATION_TIME_AND_DATE));
update_menu_list_item_text(settingsScreen->display_item, translation_get_word(TRANSLATION_DISPLAY));
@ -193,13 +195,11 @@ static void vibration_typed_roller_cb(lv_event_t *e)
if (!settingsScreen->settingsScreenAPIInterface.setDisplayVibrationDurationSettingsCb)
return;
settingsScreen->settingsScreenAPIInterface.setDisplayVibrationDurationSettingsCb(&index, SETTING_MODE_SET);
common_screen_onclick_vibration();
break;
case ROLLER_ID_TOUCH_VIBRATION_STRENGTH:
if(!settingsScreen->settingsScreenAPIInterface.setDisplayVibrationStrengthSettingsCb)
return;
settingsScreen->settingsScreenAPIInterface.setDisplayVibrationStrengthSettingsCb(&index, SETTING_MODE_SET);
common_screen_onclick_vibration();
break;
case ROLLER_ID_NOTIFICATION_VIBRATION_DURATION:
if (!settingsScreen->settingsScreenAPIInterface.setNotificationVibrationDurationSettingsCb)
@ -286,7 +286,7 @@ static void activation_switch_cb(lv_event_t *e)
static void language_dropdown_cb(lv_event_t *e)
{
SettingsScreen_t *settingsScreen = e->user_data;
SettingsScreen_t *settingsScreen = lv_event_get_user_data(e);
if(!settingsScreen->settingsScreenAPIInterface.setLanguageSettingsCb) return;
@ -531,6 +531,10 @@ static void load_display_side_screen(SettingsScreen_t *settingsScreen)
static void load_notifications_side_screen(SettingsScreen_t *settingsScreen)
{
// Messages notification header text
lv_obj_t *label = lv_label_create(settingsScreen->side_screen);
lv_label_set_text_static(label, "Messages\nNotifications :");
// Notification enable switch
lv_obj_t *notification_enable_switch = lv_switch_create(settingsScreen->side_screen);
lv_obj_set_user_data(notification_enable_switch, (void *)SWITCH_ID_NOTIFICATION_ENABLE);
@ -538,14 +542,15 @@ static void load_notifications_side_screen(SettingsScreen_t *settingsScreen)
if(settingsScreen->settingsScreenAPIInterface.setNotificationEnabledSettingsCb)
settingsScreen->settingsScreenAPIInterface.setNotificationEnabledSettingsCb(&toggled, SETTING_MODE_GET);
if(toggled)lv_obj_add_state(notification_enable_switch, LV_STATE_CHECKED);
lv_obj_align_to(notification_enable_switch, label, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 10);
lv_obj_add_event_cb(notification_enable_switch, &(activation_switch_cb), LV_EVENT_VALUE_CHANGED, settingsScreen);
lv_obj_t * label = lv_label_create(settingsScreen->side_screen);
lv_label_set_text_static(label, "Notifications");
label = lv_label_create(settingsScreen->side_screen);
lv_label_set_text_static(label, "Enabled");
lv_obj_align_to(label, notification_enable_switch, LV_ALIGN_OUT_RIGHT_MID, 10, 0);
label = lv_label_create(settingsScreen->side_screen);
lv_label_set_text_static(label, "Vibrate on\nnotifications :");
lv_label_set_text_static(label, "Vibrate On\nNotifications :");
lv_obj_align_to(label, notification_enable_switch, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 10);
lv_obj_t *on_notification_vibration_duration_roller = lv_roller_create(settingsScreen->side_screen);
@ -579,6 +584,11 @@ static void load_notifications_side_screen(SettingsScreen_t *settingsScreen)
lv_label_set_text_static(label, "Strength");
lv_obj_align_to(label, on_notification_vibration_strength_roller, LV_ALIGN_OUT_RIGHT_MID, 5, 0);
//Calls notification header text
label = lv_label_create(settingsScreen->side_screen);
lv_label_set_text_static(label, "Calls\nNotifications :");
lv_obj_align_to(label, on_notification_vibration_strength_roller, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 10);
// Call enable switch
lv_obj_t *call_enable_switch = lv_switch_create(settingsScreen->side_screen);
lv_obj_set_user_data(call_enable_switch, (void *)SWITCH_ID_CALL_ENABLED);
@ -586,15 +596,15 @@ static void load_notifications_side_screen(SettingsScreen_t *settingsScreen)
if(settingsScreen->settingsScreenAPIInterface.setCallEnabledSettingsCb)
settingsScreen->settingsScreenAPIInterface.setCallEnabledSettingsCb(&toggled, SETTING_MODE_GET);
if(toggled)lv_obj_add_state(call_enable_switch, LV_STATE_CHECKED);
lv_obj_align_to(call_enable_switch, on_notification_vibration_strength_roller, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 10);
lv_obj_align_to(call_enable_switch, label, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 10);
lv_obj_add_event_cb(call_enable_switch, &(activation_switch_cb), LV_EVENT_VALUE_CHANGED, settingsScreen);
label = lv_label_create(settingsScreen->side_screen);
lv_label_set_text_static(label, "Calls");
lv_label_set_text_static(label, "Enabled");
lv_obj_align_to(label, call_enable_switch, LV_ALIGN_OUT_RIGHT_MID, 10, 0);
label = lv_label_create(settingsScreen->side_screen);
lv_label_set_text_static(label, "Vibrate on calls :");
lv_label_set_text_static(label, "Vibrate On Calls :");
lv_obj_align_to(label, call_enable_switch, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 10);
lv_obj_t *on_call_vibration_duration_roller = lv_roller_create(settingsScreen->side_screen);
@ -706,11 +716,11 @@ static void load_connectivity_side_screen(SettingsScreen_t *settingsScreen)
static void load_language_side_screen(SettingsScreen_t *settingsScreen)
{
lv_obj_t *label = lv_label_create(settingsScreen->side_screen);
lv_label_set_text_static(label, "Language :");
settingsScreen->language_label = lv_label_create(settingsScreen->side_screen);
lv_label_set_text_static(settingsScreen->language_label, translation_get_word(TRANSLATION_LANGUAGE_2));
lv_obj_t *language_dropdown = lv_dropdown_create(settingsScreen->side_screen);
lv_obj_align_to(language_dropdown, label, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 10);
lv_obj_align_to(language_dropdown, settingsScreen->language_label, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 10);
lv_dropdown_set_options_static(language_dropdown, language_options);
uint8_t language = 0;
if(settingsScreen->settingsScreenAPIInterface.setLanguageSettingsCb)settingsScreen->settingsScreenAPIInterface.setLanguageSettingsCb(&language, SETTING_MODE_GET);
@ -737,7 +747,7 @@ static void load_about_side_screen(SettingsScreen_t *settingsScreen)
lv_obj_align_to(compile_label, firmware_label, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 5);
lv_obj_t* compile_date_label = lv_label_create(settingsScreen->side_screen);
lv_label_set_text_static(compile_date_label, FIRMWARE_TIME_DATE);
lv_label_set_text_static(compile_date_label, FIRMWARE_COMPILATION_TIME_DATE);
lv_obj_set_style_text_color(compile_date_label, lv_color_make(130, 130, 130), LV_PART_MAIN);
lv_obj_align_to(compile_date_label, compile_label, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 5);
@ -940,6 +950,7 @@ void settings_screen_destroy(SettingsScreen_t * const settingsScreen)
settingsScreen->display = NULL;
settingsScreen->about_refresh_timer = NULL;
settingsScreen->last_selected_item = NULL;
settingsScreen->language_label = NULL;
}
static void _simulate_side_screen_item_click(SettingsScreen_t * const settingsScreen, lv_obj_t *item)

1
src/W800_SDK_v1.00.10/app/gfx/settings_screen.h
View File

@ -88,6 +88,7 @@ typedef struct SettingsScreen
lv_obj_t *ble_dev_name_label;
lv_obj_t *ble_dev_name_value;
lv_obj_t *ble_dev_mac_label;
lv_obj_t *language_label;
struct
{

2
src/W800_SDK_v1.00.10/app/gfx/watch_face.c
View File

@ -374,7 +374,7 @@ void watch_face_create(WatchFace_t * const watchFace)
}
watchFace->dateWindow.dateWindowWidget = lv_label_create(watchFace->display);
lv_label_set_text_static(watchFace->dateWindow.dateWindowWidget, watchFace->dateWindow.dateWindowText);
lv_obj_set_pos(watchFace->dateWindow.dateWindowWidget, 180,112);
lv_obj_set_pos(watchFace->dateWindow.dateWindowWidget, 180,111);
lv_obj_set_width(watchFace->dateWindow.dateWindowWidget, 20);
lv_obj_set_style_text_align(watchFace->dateWindow.dateWindowWidget, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN);

27
src/W800_SDK_v1.00.10/app/translation/translation.c
View File

@ -15,7 +15,7 @@ static const char * const translation_dictionary[][TRANSLATED_LANGUAGES_COUNT] =
[TRANSLATION_ENGLISH]= "Watch"
},
[TRANSLATION_ALARM] = {
[TRANSLATION_FRENCH] = "Reveil",
[TRANSLATION_FRENCH] = "Réveil",
[TRANSLATION_GERMAN] = "Wecker",
[TRANSLATION_ENGLISH]= "Alarm"
},
@ -30,17 +30,17 @@ static const char * const translation_dictionary[][TRANSLATED_LANGUAGES_COUNT] =
[TRANSLATION_ENGLISH]= "Compass"
},
[TRANSLATION_FIND_MY_PHONE] = {
[TRANSLATION_FRENCH] = "Trouver mon tel",
[TRANSLATION_FRENCH] = "Trouver mon tél",
[TRANSLATION_GERMAN] = "Handy finden",
[TRANSLATION_ENGLISH]= "Find my phone"
},
[TRANSLATION_ALTIMETER] = {
[TRANSLATION_FRENCH] = "Altimetre",
[TRANSLATION_FRENCH] = "Altimètre",
[TRANSLATION_GERMAN] = "Hohenmesser",
[TRANSLATION_ENGLISH]= "Altimeter"
},
[TRANSLATION_SETTINGS] = {
[TRANSLATION_FRENCH] = "Parametres",
[TRANSLATION_FRENCH] = "Paramètres",
[TRANSLATION_GERMAN] = "Einstellungen",
[TRANSLATION_ENGLISH]= "Settings"
},
@ -60,8 +60,8 @@ static const char * const translation_dictionary[][TRANSLATED_LANGUAGES_COUNT] =
[TRANSLATION_ENGLISH]= "Notifications"
},
[TRANSLATION_CONNECTIVITY] = {
[TRANSLATION_FRENCH] = "Connectivite",
[TRANSLATION_GERMAN] = "Konnektivitat",
[TRANSLATION_FRENCH] = "Connectivité",
[TRANSLATION_GERMAN] = "Konnektivität",
[TRANSLATION_ENGLISH]= "Connectivity"
},
[TRANSLATION_LANGUAGE] = {
@ -69,13 +69,18 @@ static const char * const translation_dictionary[][TRANSLATED_LANGUAGES_COUNT] =
[TRANSLATION_GERMAN] = "Sprache",
[TRANSLATION_ENGLISH]= "Language"
},
[TRANSLATION_LANGUAGE_2] = {
[TRANSLATION_FRENCH] = "Langue :",
[TRANSLATION_GERMAN] = "Sprache :",
[TRANSLATION_ENGLISH]= "Language :"
},
[TRANSLATION_ABOUT] = {
[TRANSLATION_FRENCH] = "A Propos",
[TRANSLATION_FRENCH] = "À Propos",
[TRANSLATION_GERMAN] = "Apropos",
[TRANSLATION_ENGLISH]= "About"
},
[TRANSLATION_SET_TIME_AND_DATE] = {
[TRANSLATION_FRENCH] = "Reglage de la\nDate & de l'Heure :",
[TRANSLATION_FRENCH] = "Réglage de la\nDate & de l'Heure :",
[TRANSLATION_GERMAN] = "Zeit festlegen :",
[TRANSLATION_ENGLISH]= "Set Time & Date :",
},
@ -180,7 +185,7 @@ static const char * const translation_dictionary[][TRANSLATED_LANGUAGES_COUNT] =
[TRANSLATION_ENGLISH]= "",
},
[TRANSLATION_PHONE_NOT_CONNECTED] = {
[TRANSLATION_FRENCH] = "Mobile\nnon\ncon-\nnecte !",
[TRANSLATION_FRENCH] = "Mobile\nnon\ncon-\nnecté !",
[TRANSLATION_GERMAN] = "Keine\nVerbind-\nung zum\nHandy !",
[TRANSLATION_ENGLISH]= "Phone\nnot\ncon-\nnected !",
},
@ -190,12 +195,12 @@ static const char * const translation_dictionary[][TRANSLATED_LANGUAGES_COUNT] =
[TRANSLATION_ENGLISH]= "Find\nMy\nPhone !",
},
[TRANSLATION_FOUND_MY_PHONE_BTN] = {
[TRANSLATION_FRENCH] = "Je l'ai\nTrouver !",
[TRANSLATION_FRENCH] = "Je l'ai\nTrouvé !",
[TRANSLATION_GERMAN] = "Ich\nHabe Es\nGefu-\nnden !",
[TRANSLATION_ENGLISH]= "Found\nIt !",
},
[TRANSLATION_PHONE_NOT_CONNECTED_2] = {
[TRANSLATION_FRENCH] = "\t\t\t\t\t\tMobile non connecte !",
[TRANSLATION_FRENCH] = "\t\t\t\t\t\tMobile non connecté !",
[TRANSLATION_GERMAN] = "\t\t\t\t\t\tKeine Verbindung zum Handy !",
[TRANSLATION_ENGLISH] = "\t\t\t\t\t\tPhone not connected !",
},

1
src/W800_SDK_v1.00.10/app/translation/translation.h
View File

@ -27,6 +27,7 @@ typedef enum TranslationWord
TRANSLATION_NOTIFICATIONS,
TRANSLATION_CONNECTIVITY,
TRANSLATION_LANGUAGE,
TRANSLATION_LANGUAGE_2,
TRANSLATION_ABOUT,
TRANSLATION_SET_TIME_AND_DATE,
TRANSLATION_AUTOMATIC,

913
src/W800_SDK_v1.00.10/lvgl/lvgl_v8.3/src/font/lv_font_montserrat_14.c
View File

File diff suppressed because it is too large Load Diff

955
src/W800_SDK_v1.00.10/lvgl/lvgl_v8.3/src/font/lv_font_montserrat_16.c
View File

File diff suppressed because it is too large Load Diff

1169
src/W800_SDK_v1.00.10/lvgl/lvgl_v8.3/src/font/lv_font_montserrat_24.c
View File

File diff suppressed because it is too large Load Diff

1312
src/W800_SDK_v1.00.10/lvgl/lvgl_v8.3/src/font/lv_font_montserrat_28.c
View File

File diff suppressed because it is too large Load Diff

1380
src/W800_SDK_v1.00.10/lvgl/lvgl_v8.3/src/font/lv_font_montserrat_30.c
View File

File diff suppressed because it is too large Load Diff