scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity
1862 commits 2 branches 1 tag 45 MiB
Commit graph

1862 commits

This branch
This branch
All branches
Author SHA1 Message Date
Reinhold Gschweicher a2a70f8eda MotorController: no need to make this function a class function 
The `StopRinging()` function was used just in `Notifications.h` screen.
That screen already has access to a `motorController` object.
 2022-02-19 13:13:36 +01:00
Reinhold Gschweicher 04eca81a95 Notifications: use motorController object instead of class function 
We get the motoroController object, so store and use it.
 2022-02-19 13:13:36 +01:00
Reinhold Gschweicher d5b78ecd66 SystemTask: remove unused ble includes 
Remove unused includes. The firmware still compiles fine without the
includes.
 2022-02-19 13:00:50 +01:00
minacode a1db9fca13 remove unused reference 2022-02-16 13:34:14 +01:00
Riku Isokoski 4f649a8544 Improved alarm alert handling 2022-02-13 11:36:51 +01:00
Jean-François Milants e332be0d7c Merge branch 'mruss77-statusBarTimeFormat' into develop 2022-02-13 11:23:20 +01:00
Jean-François Milants 87d882b151 Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime into mruss77-statusBarTimeFormat 
# Conflicts:
#	src/components/datetime/DateTimeController.cpp
 2022-02-13 11:23:05 +01:00
Zorvalt d967efa197 Fix biased BLE pass key generation 2022-02-12 18:44:05 +01:00
Reinhold Gschweicher 5938b4b208 SystemTask: fix static cast missing brackets syntax 
The static_cast syntax requires brackets around the input variable. The
implementation worked because the used input are defines, which add the
missing brackets like the following:
```cpp
  #define GPIO_PIN_CNF_SENSE_Low (3UL)
```
 2022-02-12 18:38:31 +01:00
Riku Isokoski 32fe7b660c Make switch disabled state slightly dimmer 2022-02-12 18:36:11 +01:00
Riku Isokoski 76f63ed76a Fix switch default state 2022-02-12 18:36:11 +01:00
Riku Isokoski 0930a79041 Alarm: Fix missing stop button. Revert alert layout 2022-02-12 18:36:11 +01:00
Riku Isokoski a9b77ae0d4 Alarm: Change checkable button for a switch 2022-02-12 18:36:11 +01:00
Riku Isokoski 1ac1d5aa5a Add issue links 2022-02-12 18:21:52 +01:00
Eli Weiss 2daa5dcbee Added alarm 12 hour interface 2022-01-31 20:42:48 +01:00
Eli Weiss ae0724c28c Corrected capitalization 2022-01-31 20:42:18 +01:00
Eli Weiss 02e94acf18 Corrected code formatting 
Corrected formatting and removed unnecessary variable time24H
 2022-01-31 20:42:18 +01:00
Eli Weiss d86f81b9ad Changed setHourLabels function to handle 24H too 
Changed setHourLabels function to handle 24 hour time labeling, changed to private
 2022-01-31 20:42:18 +01:00
Eli Weiss c8d998e82c Consolidated label changes, optimizations 
Consolidated 12 hour label changes to function. Removed use of strings, struct.
 2022-01-31 20:42:18 +01:00
Eli Weiss 5be2f57a78 Consolidated time conversion logic 
Consolidated 24 hour to 12 hour time conversion logic into function, addressed formatting issues, cleaned up code.
 2022-01-31 20:42:18 +01:00
Eli Weiss 1813399959 Removed redundant brackets 
Also corrected orphaned bracket
 2022-01-31 20:42:18 +01:00
Eli Weiss 2bc338ceed Cleaned up redundant if statements, spacing 
Removed redundant if statements in hour button logic. Spacing is now in line with repo guidelines.
 2022-01-31 20:42:18 +01:00
Eli Weiss 698288d822 Added 12 hour set time 2022-01-31 20:42:18 +01:00
JF e73a92c29b
Merge pull request #949 from Riksu9000/fix_alarm 
Fix alarm on time change
 2022-01-26 22:03:14 +01:00
JF f38c559089
Merge pull request #954 from NeroBurner/music_initialize_lastLength 
Music: initialize totalLength to have non-random data from the start
 2022-01-26 22:01:07 +01:00
JF b12603448c
Merge pull request #959 from NeroBurner/stopwatch_include_cleanup 
StopWatch: cleanup unused includes and use relative to src includes
 2022-01-26 22:00:33 +01:00
JF 71c895dc71
Merge pull request #531 from hatmajster/heart-rate-gain-setting 
Heart rate sensor - HRS gain changed to x8
 2022-01-26 21:44:23 +01:00
JF 9e9010c725
Merge pull request #876 from yehoshuapw/hrs-driver-changes 
Hrs driver changes
 2022-01-26 21:39:58 +01:00
JF 458f5b8eb8
Merge pull request #903 from Riksu9000/improved_notif_timeout 
Improved notification timeout
 2022-01-26 21:38:07 +01:00
JF bbb823b170
Merge pull request #939 from NeroBurner/buttonHandler_relative_include 
ButtonHandler: includes relative to src dir
 2022-01-26 21:35:03 +01:00
JF a1880ca3b8
Merge pull request #940 from NeroBurner/systemTask_queue_include 
SystemTask: add missing queue.h include for QueueHandle_t
 2022-01-26 21:34:25 +01:00
JF a354650a9c
Merge pull request #944 from NeroBurner/no_generated_files_in_source_dir 
Create Version.h in binary dir instead of src dir
 2022-01-26 21:33:57 +01:00
JF cc01d6ca17
Merge pull request #948 from Riksu9000/watchfacecleanup 
PTS and digital watchface code cleanups
 2022-01-26 21:25:59 +01:00
Reinhold Gschweicher 67f546fa33 StopWatch: cleanup unused includes and use relative to src includes 2022-01-26 08:31:14 +01:00
hatmajster b4e956227e Hrs3300: changed default gain to x8 2022-01-25 17:44:11 +01:00
Reinhold Gschweicher 314c02194a Music: initialize totalLength to have non-random data from the start 
In the first `Music::Refresh` call the lastLength and totalLength are
not initialized. The `lastLength` value is read first from the
musicService. Naturally in the first itereation that is changed and
`UpdateLength()` is called. There the variable `totalLength` is used as
well, but that variable isn't initialed to a sensible value yet. This
leads to sometimes the `Music.h` screen segfaulting (depending on the
random uninitialized data in the `lastLength` variable)
 2022-01-23 23:39:38 +01:00
Riku Isokoski 470db4ab99 Fix alarm on time change 2022-01-22 12:47:23 +02:00
Riku Isokoski 6bf6bb7e2a PTS and digital watchface code cleanups 2022-01-20 16:04:26 +02:00
Reinhold Gschweicher 688dc2fed7 Create Version.h in binary dir instead of src dir 
Don't use source directory for generated files. Use the binary (build)
directory instead.
 2022-01-17 21:26:40 +01:00
Reinhold Gschweicher bbc5af078d SystemTask: add missing queue.h include for QueueHandle_t 2022-01-16 22:47:16 +01:00
Reinhold Gschweicher 48e9458301 ButtonHandler: includes relative to src dir 2022-01-16 20:59:49 +01:00
Jean-François Milants 26ae828e39 Set version to 1.8.0 2022-01-07 17:27:43 +01:00
JF f711f0f794
Merge pull request #916 from Riksu9000/shake_menuoption 
Update shakewake menu option
 2022-01-07 16:53:21 +01:00
Riku Isokoski 97cbe34963 Update shakewake menu option 2022-01-06 15:44:39 +02:00
JF e8fc46ba20
Merge pull request #912 from SteveAmor/chimesradio 
Updates radio button style for Chimes Option
 2022-01-05 10:42:25 +01:00
SteveAmor b1b9937ff7 Updates radio button style 2022-01-04 21:28:37 +00:00
Jean-François Milants dc8be2244c Merge branch 'geekbozu-ShakeWake' into develop 2022-01-04 21:48:20 +01:00
Jean-François Milants bef3e708f6 Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekbozu-ShakeWake 
# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/screens/settings/Settings.cpp
 2022-01-04 21:48:08 +01:00
JF b8b54f47a2
Merge pull request #813 from SteveAmor/chimes 
Chimes option
 2022-01-04 21:44:36 +01:00
SteveAmor 15c3807a76 Adds enum class for chimes option 2022-01-04 19:32:29 +00:00