mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 15:11:51 +02:00
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
This commit is contained in:
parent
b7a353cfb6
commit
b8f7b65d84
|
@ -428,6 +428,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
|
||||
|
|
|
@ -51,7 +51,10 @@ namespace Pinetime {
|
|||
PineTimeStyle,
|
||||
Terminal,
|
||||
Infineat,
|
||||
<<<<<<< HEAD
|
||||
InfineatColors,
|
||||
=======
|
||||
>>>>>>> 504f5774 (copy :( files from gitlab repo)
|
||||
Meow,
|
||||
CasioStyleG7710,
|
||||
};
|
||||
|
|
|
@ -24,11 +24,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()
|
||||
|
||||
|
|
|
@ -10,11 +10,19 @@ namespace Pinetime {
|
|||
static constexpr const char* bluetooth = "\xEF\x8A\x94";
|
||||
static constexpr const char* plug = "\xEF\x87\xA6";
|
||||
static constexpr const char* shoe = "\xEF\x95\x8B";
|
||||
<<<<<<< HEAD
|
||||
static constexpr const char* paw = "\xEF\x86\xB0";
|
||||
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* paw = "\xEF\x86\xB0";
|
||||
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";
|
||||
>>>>>>> 504f5774 (copy :( files from gitlab repo)
|
||||
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,8 +49,13 @@ 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* bird = "\xEF\x92\xBA";
|
||||
static constexpr const char* zzz = "\xEF\x88\xB6";
|
||||
=======
|
||||
static constexpr const char* bird = "\xEF\x92\xBA";
|
||||
static constexpr const char* zzz = "\xEF\x88\xB6";
|
||||
>>>>>>> 504f5774 (copy :( files from gitlab repo)
|
||||
|
||||
// fontawesome_weathericons.c
|
||||
// static constexpr const char* sun = "\xEF\x86\x85";
|
||||
|
|
Loading…
Reference in a new issue