aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* MotorController: no need to make this function a class functionReinhold Gschweicher2022-02-191-1/+1
| | | | | The `StopRinging()` function was used just in `Notifications.h` screen. That screen already has access to a `motorController` object.
* Notifications: use motorController object instead of class functionReinhold Gschweicher2022-02-192-10/+19
| | | | We get the motoroController object, so store and use it.
* SystemTask: remove unused ble includesReinhold Gschweicher2022-02-191-9/+0
| | | | | Remove unused includes. The firmware still compiles fine without the includes.
* Improved alarm alert handlingRiku Isokoski2022-02-133-10/+41
|
* Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime ↵Jean-François Milants2022-02-136-10/+38
|\ | | | | | | | | | | | | into mruss77-statusBarTimeFormat # Conflicts: # src/components/datetime/DateTimeController.cpp
| * Status bar displays time in 12 or 24 hour format based on settingsMark Russell2021-11-106-10/+37
| |
* | Fix biased BLE pass key generationZorvalt2022-02-121-1/+22
| |
* | SystemTask: fix static cast missing brackets syntaxReinhold Gschweicher2022-02-121-2/+2
| | | | | | | | | | | | | | | | | | 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) ```
* | Make switch disabled state slightly dimmerRiku Isokoski2022-02-121-1/+2
| |
* | Fix switch default stateRiku Isokoski2022-02-121-0/+2
| |
* | Alarm: Fix missing stop button. Revert alert layoutRiku Isokoski2022-02-121-4/+6
| |
* | Alarm: Change checkable button for a switchRiku Isokoski2022-02-124-33/+51
| |
* | Added alarm 12 hour interfaceEli Weiss2022-01-313-8/+39
| |
* | Corrected capitalizationEli Weiss2022-01-312-5/+5
| |
* | Corrected code formattingEli Weiss2022-01-312-28/+30
| | | | | | | | Corrected formatting and removed unnecessary variable time24H
* | Changed setHourLabels function to handle 24H tooEli Weiss2022-01-312-36/+28
| | | | | | | | Changed setHourLabels function to handle 24 hour time labeling, changed to private
* | Consolidated label changes, optimizationsEli Weiss2022-01-311-36/+15
| | | | | | | | Consolidated 12 hour label changes to function. Removed use of strings, struct.
* | Consolidated time conversion logicEli Weiss2022-01-312-87/+94
| | | | | | | | Consolidated 24 hour to 12 hour time conversion logic into function, addressed formatting issues, cleaned up code.
* | Removed redundant bracketsEli Weiss2022-01-311-5/+3
| | | | | | | | Also corrected orphaned bracket
* | Cleaned up redundant if statements, spacingEli Weiss2022-01-312-47/+43
| | | | | | | | Removed redundant if statements in hour button logic. Spacing is now in line with repo guidelines.
* | Added 12 hour set timeEli Weiss2022-01-313-8/+80
| |
* | Merge pull request #949 from Riksu9000/fix_alarmJF2022-01-262-0/+5
|\ \ | | | | | | Fix alarm on time change
| * | Fix alarm on time changeRiku Isokoski2022-01-222-0/+5
| | |
* | | Merge pull request #954 from NeroBurner/music_initialize_lastLengthJF2022-01-261-1/+1
|\ \ \ | | | | | | | | Music: initialize totalLength to have non-random data from the start
| * | | Music: initialize totalLength to have non-random data from the startReinhold Gschweicher2022-01-231-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | Merge pull request #959 from NeroBurner/stopwatch_include_cleanupJF2022-01-262-7/+4
|\ \ \ | | | | | | | | StopWatch: cleanup unused includes and use relative to src includes
| * | | StopWatch: cleanup unused includes and use relative to src includesReinhold Gschweicher2022-01-262-7/+4
| |/ /
* | | Merge pull request #531 from hatmajster/heart-rate-gain-settingJF2022-01-261-2/+2
|\ \ \ | | | | | | | | Heart rate sensor - HRS gain changed to x8
| * | | Hrs3300: changed default gain to x8hatmajster2022-01-251-2/+2
| |/ /
* | | Merge pull request #876 from yehoshuapw/hrs-driver-changesJF2022-01-263-8/+7
|\ \ \ | | | | | | | | Hrs driver changes
| * | | changed ReadHrs and ReadAls to uint32, and did static_cast instead of hidden ↵Yehoshua Pesach Wallach2021-12-133-6/+5
| | | | | | | | | | | | | | | | cast when using it
| * | | order ReadHrs, ReadAls bitwise according to bit orderingYehoshua Pesach Wallach2021-12-131-2/+2
| | | |
* | | | Merge pull request #903 from Riksu9000/improved_notif_timeoutJF2022-01-264-18/+49
|\ \ \ \ | | | | | | | | | | Improved notification timeout
| * | | | Improved notification timeoutRiku Isokoski2022-01-014-18/+49
| | | | |
* | | | | Merge pull request #939 from NeroBurner/buttonHandler_relative_includeJF2022-01-262-2/+2
|\ \ \ \ \ | | | | | | | | | | | | ButtonHandler: includes relative to src dir
| * | | | | ButtonHandler: includes relative to src dirReinhold Gschweicher2022-01-162-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #940 from NeroBurner/systemTask_queue_includeJF2022-01-261-0/+1
|\ \ \ \ \ | | | | | | | | | | | | SystemTask: add missing queue.h include for QueueHandle_t
| * | | | | SystemTask: add missing queue.h include for QueueHandle_tReinhold Gschweicher2022-01-161-0/+1
| |/ / / /
* | | | | Merge pull request #944 from NeroBurner/no_generated_files_in_source_dirJF2022-01-261-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Create Version.h in binary dir instead of src dir
| * | | | | Create Version.h in binary dir instead of src dirReinhold Gschweicher2022-01-171-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | Don't use source directory for generated files. Use the binary (build) directory instead.
* / / / / PTS and digital watchface code cleanupsRiku Isokoski2022-01-204-118/+79
|/ / / /
* | | | Update shakewake menu optionRiku Isokoski2022-01-061-1/+1
| | | |
* | | | Merge pull request #912 from SteveAmor/chimesradioJF2022-01-051-0/+4
|\ \ \ \ | | | | | | | | | | Updates radio button style for Chimes Option
| * | | | Updates radio button styleSteveAmor2022-01-041-0/+4
| | | | |
* | | | | Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into ↵Jean-François Milants2022-01-0412-26/+262
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | geekbozu-ShakeWake # Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/screens/settings/Settings.cpp
| * | | | Fix setting removing it self from wake settings when opening calibration ↵Tim Keller2022-01-042-3/+4
| | | | | | | | | | | | | | | | | | | | window twice.
| * | | | Made calibration window enable Accel wakeups for setting and calibration ↵Tim Keller2022-01-042-1/+9
| | | | | | | | | | | | | | | | | | | | even when wake mode is inactive.
| * | | | Remove "fancy" settings display and always show ShakeWakeThresholdSettingTim Keller2022-01-041-14/+10
| | | | |
| * | | | Fixed button color changingTim Keller2022-01-042-9/+9
| | | | |
| * | | | Added visual aide for shake strengthTim Keller2022-01-042-37/+60
| | | | | | | | | | | | | | | | | | | | Added delay to starting calibration