aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Replaced "JF002" in github URLs with "InfiniTimeOrg"mabuch2021-10-152-2/+3
|
* Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime ↵Jean-François Milants2021-10-1012-24/+161
|\ | | | | | | | | | | | | into Riksu9000-update_touch_driver # Conflicts: # src/displayapp/Apps.h
| * Merge branch 'develop' into update_touch_driverRiku Isokoski2021-10-0525-96/+99
| |\
| * \ Merge branch 'develop' into update_touch_driverRiku Isokoski2021-09-1819-5/+567
| |\ \
| * | | Fix Error screen and optimize GetTouchInfoRiku Isokoski2021-09-154-15/+8
| | | |
| * | | Merge branch 'develop' into update_touch_driverRiku Isokoski2021-09-1498-518/+949
| |\ \ \
| * \ \ \ Merge branch 'develop' into update_touch_driverRiku Isokoski2021-08-2830-208/+272
| |\ \ \ \
| * | | | | Automatic error detectionRiku Isokoski2021-08-1810-9/+121
| | | | | |
| * | | | | Fix after mergeRiku Isokoski2021-08-171-1/+1
| | | | | |
| * | | | | Merge branch 'develop' into update_touch_driverRiku Isokoski2021-08-1752-708/+670
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into update_touch_driverRiku Isokoski2021-07-156-55/+80
| |\ \ \ \ \ \
| * | | | | | | Update touchpad driverRiku Isokoski2021-07-146-36/+63
| | | | | | | |
* | | | | | | | Setting SetDate/SetTime : replace #defines by constexpr variables, NULL by ↵Jean-François Milants2021-10-104-85/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nullptr and other small cleanings.
* | | | | | | | DateTimeController : remove unused methods and variables.Jean-François Milants2021-10-102-81/+9
| | | | | | | |
* | | | | | | | Merge with develop and fix conflicts from timaios:set-datetime-manually.Jean-François Milants2021-10-1010-8/+508
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'JF002:develop' into set-datetime-manuallyTim2021-08-0854-533/+877
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Code optimizations in SettingSetDate and SettingSetTimeTim Taenny2021-07-092-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of calling lv_obj_align after each button click, the labels have their auto_realign property set.
| * | | | | | | | | Code optimizations in SettingSetTimeTim Taenny2021-07-091-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The positions of the labels are controlled by #define's, just like in SettingSetDate.
| * | | | | | | | | Modified Settings menu as per suggestionTim Taenny2021-07-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved "Set date" and "Set time" to the second page of the Settings menu.
| * | | | | | | | | Code optimizations in SettingSetDateTim Taenny2021-07-091-41/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using static method of DateTimeController for retrieving month texts instead of implementing it in SettingSetDate again.
| * | | | | | | | | Exposed Month and DayOfWeek texts in DateTimeControllerTim Taenny2021-07-092-9/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added static methods to return the text of a given month or dayOfWeek.
| * | | | | | | | | Code optimizations in SettingSetTimeTim Taenny2021-07-091-24/+10
| | | | | | | | | |
| * | | | | | | | | Code optimizations in SettingSetDateTim Taenny2021-07-091-28/+12
| | | | | | | | | |
| * | | | | | | | | Added new menu entries to Settings pagetimaios2021-07-092-3/+17
| | | | | | | | | |
| * | | | | | | | | Added new screens to DisplayApp.cpptimaios2021-07-091-0/+10
| | | | | | | | | |
| * | | | | | | | | Added new screens to the list of applicationstimaios2021-07-091-1/+3
| | | | | | | | | |
| * | | | | | | | | Include new screens in CMakeLists.txttimaios2021-07-091-0/+2
| | | | | | | | | |
| * | | | | | | | | Added new screen: SettingSetDatetimaios2021-07-092-0/+317
| | | | | | | | | |
| * | | | | | | | | Added new screen: SettingSetTimetimaios2021-07-092-0/+212
| | | | | | | | | |
* | | | | | | | | | Remove call to `batteryController.Update();` which was replaced by ↵Jean-François Milants2021-10-091-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `batteryController.MeasureVoltage()`.
* | | | | | | | | | Merge pull request #715 from hubmartin/gpiote-fixJF2021-10-091-9/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix GPIOTE not calling ISR when button is held during boot
| * | | | | | | | | | Code cleanuphubmartin2021-10-031-6/+0
| | | | | | | | | | |
| * | | | | | | | | | Call battery controller updatehubmartin2021-10-031-1/+3
| | | | | | | | | | |
| * | | | | | | | | | GPIOTE fix of button and power detection experimenthubmartin2021-10-031-9/+13
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #719 from Riksu9000/improve_battery_reportingJF2021-10-095-19/+25
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve battery percentage calculation and reporting
| * | | | | | | | | | | Don't measure and notify percentage on charging event.Riku Isokoski2021-10-093-5/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Improve battery percentage calculation and reportingRiku Isokoski2021-10-045-14/+14
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While charging, percentage should only go up, and while discharging, percentage should only go down.
* | | | | | | | | | | Merge pull request #728 from hubmartin/charge-wakeJF2021-10-091-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add wake-up on charge event
| * | | | | | | | | | | Call also ReloadIdleTimerhubmartin2021-10-081-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Add wake on charge eventhubmartin2021-10-081-0/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #522 from jonvmey/fix-nav-uuid-docsJF2021-10-092-41/+21
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Navigation Service UUID docs
| * | | | | | | | | | | Move callback function into anonymous namespaceJonathan Vander Mey2021-07-241-5/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Update nav service UUID macro to constexpr functionsJonathan Vander Mey2021-07-242-28/+20
| | | | | | | | | | | |
| * | | | | | | | | | | Set navigation service id is base UUID macroJonathan Vander Mey2021-07-242-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids the need to copy the same ID into every characteristic UUID genereated from it.
| * | | | | | | | | | | Update Navigation UUID documentationJonathan Vander Mey2021-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed mismatch between the service and characteristic IDs in the navigation service comments and documentation. They had old values not reflecting the current code and changes in doc/ble.md
* | | | | | | | | | | | Merge pull request #524 from jonvmey/ble-uuid-c-castsJF2021-10-0910-63/+54
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary C-style casts with BLE UUIDs
| * | | | | | | | | | | | Remove unnecessary C-style casts with BLE UUIDsJonathan Vander Mey2021-07-2410-63/+54
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of casting the UUID object to the ble_uuid_t* used throughout the NimBLE API just pass the address of the ble_uuid_t member that's at the start of each of the UUID structs.
* | | | | | | | | | | | Merge pull request #701 from ↵JF2021-10-092-4/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maksalees/close-info-popup-with-back-button-in-alarm Alarm: Close the popup with information about the time until alarm with the back button
| * | | | | | | | | | | Fixes based on code reviewsMaxim Leshchenko2021-09-292-8/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Alarm: Close the popup with information about the time until alarm with the ↵Maxim Leshchenko2021-09-282-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | back button Previously, pressing the back button would close the alarm app anyway. Now if you press on it and the popup with information is open, it will first close and the second press will close the application