summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)AuthorFilesLines
2021-09-16resolve conflict in src/systemtask/Messages.hMark Russell26-209/+268
2021-09-16Revert "Merge upstream"Mark Russell26-268/+209
2021-09-16Merge upstreamMark Russell26-209/+268
2021-09-16Fixes per Riksu9000's feedbackMark Russell7-30/+27
2021-09-13Remove unused include in MotoController.hReinhold Gschweicher1-1/+0
2021-09-13License header fix, add missing bracesMark Russell4-5/+22
2021-09-13Fixes based on code reviews (formatting, UI code)Mark Russell5-89/+133
2021-09-13Fix DisplayAppRecovery : fix include error by forward declaring Controllers i...Jean-François Milants2-13/+20
2021-09-13Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime into...Jean-François Milants4-51/+97
2021-09-13Merge pull request #549 from hubmartin/pinmapJF00214-92/+108
2021-09-13docs: Fix a few typos (#606)Tim Gates2-2/+2
2021-09-13Merge branch 'develop' into pinmaphubmartin13-53/+45
2021-09-12Merge pull request #617 from ColinKinloch/wake_up_mode_setting_changeJF0021-1/+1
2021-09-12Merge pull request #602 from Riksu9000/del_unusedJF0024-18/+2
2021-09-12Merge pull request #580 from Riksu9000/timer_battery_readingJF0028-31/+38
2021-09-10Created basic alarm appMark Russell16-3/+480
2021-09-05Advertise fast for at least 30 secs then slow downJames A. Jerkins3-1/+20
2021-09-05Revert "Linear decrease of advert rate to conserve battery"James A. Jerkins2-6/+0
2021-09-04Linear decrease of advert rate to conserve batteryJames A. Jerkins2-0/+6
2021-09-02Update Settings.cppItai Nelken1-2/+2
2021-09-01Fix styles issues - no change to functionalityJames A. Jerkins1-6/+6
2021-09-01Fix race condition, connect->disconnect->discoveryJames A. Jerkins1-1/+3
2021-08-31Fix notifications that wouldn't auto close when the timeout elapsed (in previ...Jean-François Milants1-1/+0
2021-08-30Completely reset connection state on failJames A. Jerkins1-0/+3
2021-08-30Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski80-313/+686
2021-08-29WIP Refactor ble advertisingJames A. Jerkins4-46/+67
2021-08-29Merge branch 'develop' into pinmaphubmartin94-540/+969
2021-08-28Fix wake on tap/double tap.Jean-François Milants1-6/+8
2021-08-28Settings : use enums instead of ints to store colors. Group all PTS settings ...Jean-François Milants8-116/+144
2021-08-28Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF00210-18/+465
2021-08-28Merge branch 'develop' into refresh_reworkRiku Isokoski29-234/+292
2021-08-28Merge branch 'develop' into timer_battery_readingRiku Isokoski35-351/+407
2021-08-28Fix recovery firmware since last changes in DisplayApp.Jean-François Milants3-2/+11
2021-08-28Fix touchinfo typo in SystemTask.Jean-François Milants1-1/+1
2021-08-28Merge branch 'twimaster_rework' of https://github.com/Riksu9000/InfiniTime in...Jean-François Milants4-88/+49
2021-08-26Correct change test for wake up mode settingColin Kinloch1-1/+1
2021-08-22Update startup SCL toggling pinmap definitionshubmartin1-4/+5
2021-08-22Merge branch 'develop' into pinmaphubmartin20-290/+290
2021-08-19Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2-7/+7
2021-08-19Remove unused variablesRiku Isokoski4-18/+2
2021-08-18Merge branch 'develop' into new_touch_handlerRiku Isokoski20-290/+289
2021-08-18Use highest frequency and move mutex creation to InitRiku Isokoski2-3/+6
2021-08-18Add memory print usagehubmartin1-6/+6
2021-08-18Fix music app buttonsRiku Isokoski1-1/+1
2021-08-16Simplify parameters and cleanupRiku Isokoski3-48/+19
2021-08-15Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray19-283/+283
2021-08-15Fix potential edge case of sidebar being set blackKieran Cawthray1-1/+1
2021-08-15More tidying following reviewKieran Cawthray1-85/+88
2021-08-15Avoid setting the sidebar blackKieran Cawthray1-0/+4
2021-08-15Remove duplicate code, minor fixesKieran Cawthray1-33/+19
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 19:30:29 +0000