haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 15:11:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

copy :( files from gitlab repo

Browse source 
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
This commit is contained in:
ecarlett 2024-05-29 13:15:28 +02:00 committed by Eve C
parent ad5a472b4b
commit ee99e554f0
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/CMakeLists.txt
View file

@ -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

3
src/displayapp/apps/Apps.h.in
View file

@ -52,7 +52,10 @@ namespace Pinetime {
PineTimeStyle,
Terminal,
Infineat,
<<<<<<< HEAD
InfineatColors,
=======
>>>>>>> 504f5774 (copy :( files from gitlab repo)
Meow,
CasioStyleG7710,
};

7
src/displayapp/apps/CMakeLists.txt
View file

@ -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()

3
src/displayapp/screens/Symbols.h
View file

@ -41,12 +41,9 @@ 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
// static constexpr const char* sun = "\xEF\x86\x85";