From ee99e554f0bf54d76190b7b06727baa8a3f1aaaf Mon Sep 17 00:00:00 2001 From: ecarlett Date: Wed, 29 May 2024 13:15:28 +0200 Subject: [PATCH] copy :( files from gitlab repo interactive rebase in progress; onto b7a353cf Last command done (1 command done): pick 504f5774 copy :( files from gitlab repo Next commands to do (2 remaining commands): pick 9d04c32f recovering manually changes to original Infineat pick 70f9025f now I have the Meow Watchface AND the Infineat Watchface with alarm display You are currently rebasing branch 'my-custom-infinitime' on 'b7a353cf'. Changes to be committed: modified: src/CMakeLists.txt modified: src/displayapp/apps/Apps.h.in modified: src/displayapp/apps/CMakeLists.txt modified: src/displayapp/screens/Symbols.h --- src/CMakeLists.txt | 1 + src/displayapp/apps/Apps.h.in | 3 +++ src/displayapp/apps/CMakeLists.txt | 7 +++++++ src/displayapp/screens/Symbols.h | 9 +++------ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index daf3f8ed..692ec23b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -429,6 +429,7 @@ list(APPEND SOURCE_FILES displayapp/screens/WatchFaceAnalog.cpp displayapp/screens/WatchFaceDigital.cpp displayapp/screens/WatchFaceInfineat.cpp + displayapp/screens/WatchFaceMeow.cpp displayapp/screens/WatchFaceTerminal.cpp displayapp/screens/WatchFacePineTimeStyle.cpp displayapp/screens/WatchFaceInfineatColors.cpp diff --git a/src/displayapp/apps/Apps.h.in b/src/displayapp/apps/Apps.h.in index bf7a803c..e0a80200 100644 --- a/src/displayapp/apps/Apps.h.in +++ b/src/displayapp/apps/Apps.h.in @@ -52,7 +52,10 @@ namespace Pinetime { PineTimeStyle, Terminal, Infineat, +<<<<<<< HEAD InfineatColors, +======= +>>>>>>> 504f5774 (copy :( files from gitlab repo) Meow, CasioStyleG7710, }; diff --git a/src/displayapp/apps/CMakeLists.txt b/src/displayapp/apps/CMakeLists.txt index b462c09e..be3e468b 100644 --- a/src/displayapp/apps/CMakeLists.txt +++ b/src/displayapp/apps/CMakeLists.txt @@ -25,11 +25,18 @@ else() set(DEFAULT_WATCHFACE_TYPES "WatchFace::Digital") #set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Analog") set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::PineTimeStyle") +<<<<<<< HEAD #set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Terminal") #set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Infineat") set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::InfineatColors") set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Meow") #set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::CasioStyleG7710") +======= + set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Terminal") + set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Infineat") + set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Meow") + set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::CasioStyleG7710") +>>>>>>> 504f5774 (copy :( files from gitlab repo) set(WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}" CACHE STRING "List of watch faces to build into the firmware") endif() diff --git a/src/displayapp/screens/Symbols.h b/src/displayapp/screens/Symbols.h index 321adf29..016c91bd 100644 --- a/src/displayapp/screens/Symbols.h +++ b/src/displayapp/screens/Symbols.h @@ -14,7 +14,7 @@ namespace Pinetime { static constexpr const char* clock = "\xEF\x80\x97"; static constexpr const char* bell = "\xEF\x83\xB3"; static constexpr const char* notbell = "\xEF\x87\xB6"; - static constexpr const char* info = "\xEF\x84\xA9"; + static constexpr const char* info = "\xEF\x84\xA9"; static constexpr const char* list = "\xEF\x80\xBA"; static constexpr const char* sun = "\xEF\x86\x85"; static constexpr const char* check = "\xEF\x95\xA0"; @@ -41,14 +41,11 @@ namespace Pinetime { static constexpr const char* eye = "\xEF\x81\xAE"; static constexpr const char* home = "\xEF\x80\x95"; static constexpr const char* sleep = "\xEE\xBD\x84"; -<<<<<<< HEAD static constexpr const char* calendar = "\xEF\x81\xB3"; -======= static constexpr const char* bird = "\xEF\x92\xBA"; static constexpr const char* zzz = "\xEF\x88\xB6"; ->>>>>>> d7de641b (added symbols for alarm states, added alarm state and hour to watchface meow, changed steps to paw. Need to align everythign nicely and find where to change release number) - - // fontawesome_weathericons.c + + // fontawesome_weathericons.c // static constexpr const char* sun = "\xEF\x86\x85"; static constexpr const char* cloudSun = "\xEF\x9B\x84"; static constexpr const char* cloudSunRain = "\xEF\x9D\x83";