Commit Graph

2232 Commits

Author SHA1 Message Date
Jean-François Milants
fbe964ff44 Merge branch 'watchface-casio-digital-G7710' of github.com:ITCactus/InfiniTime into ITCactus-watchface-casio-digital-G7710
# 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
2022-09-27 21:59:22 +02:00
JF
63932810d2
Merge pull request #1024 from dmlls/infineat-pr
Infineat Watchface + support for external resources.
2022-09-27 21:27:36 +02:00
Jean-François Milants
58586d0ad1 Fix formatting in CheckBoxList.cpp. 2022-09-27 21:10:01 +02:00
Jean-François Milants
2400110900 CheckBoxList : remove unused constant MAXLISTITEMS (replaced by MaxItems). 2022-09-27 21:04:40 +02:00
Reinhold Gschweicher
f699261ca3 AlarmController: add const to SecondsToAlarm() function
The function `SecondsToAlarm()` doesn't change anything in the
`AlarmController` object. Mark the function `const` to show this
property.
2022-09-27 20:32:13 +02:00
Jean-François Milants
56f315b94a A few minors changes following the code review : rename fs -> filesystem, use std::array instead of raw array,... 2022-09-27 18:06:15 +02:00
JF
30e8353a4f
Merge pull request #1272 from mashuptwice/workflow-ignore-md
Workflow ignore *.md files
2022-09-17 21:33:43 +02:00
Akseli
b546facaf1 Update src/displayapp/screens/WatchFacePineTimeStyle.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
2022-09-17 21:32:43 +02:00
Akseli
90278b54d1 Update src/displayapp/Colors.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
2022-09-17 21:32:43 +02:00
Akseli
d55ba9a3d8 Update src/components/settings/Settings.h
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
2022-09-17 21:32:43 +02:00
Akseli Lahtinen
8c35c3c3d4 add pink color 2022-09-17 21:32:43 +02:00
mashuptwice
809323df3a Applist is in ApplicationList.h 2022-09-17 21:29:48 +02:00
Riku Isokoski
b9224c1ace Disable value_str
value_str is a way to add text on a button without a separate label.
This saves having an extra label object, but uses more memory and is
removed in LVGL8
2022-09-17 21:27:32 +02:00
Riku Isokoski
bf90e07a28 Improve status icon visibility 2022-09-17 21:26:51 +02:00
Jean-François Milants
6ed8e983e9 Remove CMake targets and corresponding CLI arguments that are specific to the debugging environment (USE_JLINK, USE_OPENOCD and USE_GDB_CLIENT). 2022-09-17 21:25:54 +02:00
Riku Isokoski
c853681d75
Reduce duplication in Twos (#1274) 2022-09-11 20:57:49 +02:00
Jean-François Milants
58bb0e77db Fix formatting 2022-09-11 20:18:01 +02:00
Jean-François Milants
970d5b368d Fix submodule for date library 2022-09-11 20:11:21 +02:00
Jean-François Milants
0cd1d6f8cf Fix recovery firmware : add FS in parameters of DisplayAppRecovery ctor. 2022-09-11 18:21:29 +02:00
Jean-François Milants
4cf73fc169 Infineat : Add support for external resources, and read the images and fonts from the ilesystem 2022-09-11 16:22:28 +02:00
Jean-François Milants
ada2c09581 Merge branch 'develop' into infineat-external-resources
# Conflicts:
#	src/displayapp/screens/Symbols.h
#	src/displayapp/screens/settings/SettingWatchFace.cpp
#	src/displayapp/screens/settings/SettingWatchFace.h
2022-09-11 14:59:49 +02:00
Jean-François Milants
c9a5c3fa5c Fix formatting. 2022-09-11 14:44:36 +02:00
Jean-François Milants
cac9b3cc8e Add doc about the new parameter -DBUILD_RESOURCES. 2022-09-11 14:44:36 +02:00
Jean-François Milants
e2a3d9f0c7 Small improvement in generate-fonts.py following code review.
Add lv_img_conf in Docker image to build resources at build time.
2022-09-11 14:44:36 +02:00
Jean-François Milants
cbe2f08cf7 Fix missing '/' in the path of a font (external resource) 2022-09-11 14:44:36 +02:00
Jean-François Milants
cfc055c978 Package resources + a metadata file into a single .zip file. 2022-09-11 14:44:36 +02:00
Kieran Cawthray
4fe834efda Cleanup 2022-09-06 12:58:46 +02:00
Kieran Cawthray
fbc9f63308 Relabel button 2022-09-06 12:07:58 +02:00
Kieran Cawthray
b49fddd555 Implement persistent settings 2022-09-06 11:37:12 +02:00
Kieran Cawthray
2933405158 Merge remote-tracking branch 'upstream/develop' into pts-options 2022-09-05 22:03:56 +02:00
mashuptwice
4fdb06acd9 Merge remote-tracking branch 'upstream/develop' into workflow-ignore-md 2022-08-25 11:34:12 +02:00
mashuptwice
4940cbda7a removed lv_sim.yml 2022-08-25 11:30:11 +02:00
mashuptwice
5c253c10a8 Merge remote-tracking branch 'upstream/develop' into workflow-ignore-md 2022-08-25 10:56:09 +02:00
Riku Isokoski
f53e75063b
Merge CI to deduplicate events (#1279) 2022-08-25 08:32:46 +03:00
Riku Isokoski
69563ed031
Add sleep mode which disables notifications, touch- and motion wakeup (#1261) 2022-08-21 14:52:38 +03:00
Riku Isokoski
62c4ff9c2d
Determine the number of digits from the max value. (#1271) 2022-08-21 14:52:14 +03:00
Riku Isokoski
c2b6a8de3e
Fix markdown format with autoformatter (#1284) 2022-08-21 14:50:09 +03:00
Riku Isokoski
c495db8a71
Simplify coding style (#1280) 2022-08-21 14:44:05 +03:00
Riku Isokoski
093a66c8f8
Simplify contribute.md (#1281) 2022-08-21 14:43:56 +03:00
Riku Isokoski
e02b58bf1b
Move all images to doc. Remove old images. (#1282) 2022-08-21 14:42:53 +03:00
Kieran Cawthray
593ca2028d Add half gauge/seconds option 2022-08-16 23:38:07 +02:00
Riku Isokoski
ef6ed5d26e
Improve checkbox visibility (#1266) 2022-08-16 08:29:26 +03:00
Riku Isokoski
78fc1682da
Centralize most color definitions (#1258) 2022-08-16 08:21:23 +03:00
izzeho
d6aa767bda Add P8B mirrored version definition. 2022-08-15 13:18:23 +02:00
mashuptwice
a86668b6b7
Merge branch 'InfiniTimeOrg:develop' into workflow-ignore-md 2022-08-11 01:43:19 +02:00
mashuptwice
d00a5d1e37 workflow: ignore changes in *.md files 2022-08-11 01:42:17 +02:00
Riku Isokoski
eb487c71be Use Counter in SettingsSetDate 2022-08-10 08:37:52 +03:00
Riku Isokoski
3eebe02448 Add support for months and variable digit count to Counter 2022-08-10 08:37:52 +03:00
Riku Isokoski
8e72cf380f
Notification swap text colors for visibility and reduce duplication (#1252) 2022-08-08 18:01:40 +03:00
ialokim
a7c86786c3
Apply suggestions from code review
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
2022-08-07 20:40:45 +02:00