CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'watchface-casio-digital-G7710' of github.com:ITCactus/InfiniTime into ITCactus-watchface-casio-digital-G7710

Browse Source 
# Conflicts:
#	src/components/settings/Settings.h
#	src/displayapp/screens/CheckboxList.cpp
#	src/displayapp/screens/CheckboxList.h
#	src/displayapp/screens/Clock.cpp
#	src/displayapp/screens/Clock.h
#	src/displayapp/screens/settings/SettingWatchFace.cpp
This commit is contained in:
Jean-François Milants
2022-09-27 21:59:22 +02:00
parent 63932810d2 50b98798b9
commit fbe964ff44
7 changed files with 456 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/displayapp/screens/settings/SettingWatchFace.cpp
View File

@@ -49,7 +49,7 @@ std::unique_ptr<Screen> SettingWatchFace::CreateScreen1() {
}
std::unique_ptr<Screen> SettingWatchFace::CreateScreen2() {
std::array<const char*, 4> watchfaces {"Infineat face", "", "", ""};
std::array<const char*, 4> watchfaces {"Infineat face", "Casio G7710", "", ""};
return std::make_unique<Screens::CheckboxList>(1,
2,
app,