summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-09-16Merge branch 'develop' into wake-timehubmartin113-779/+1270
2021-09-14Merge pull request #658 from NeroBurner/patch-2JF0021-4/+4
2021-09-14Merge pull request #668 from NeroBurner/motorcontroller_remove_unused_includeJF0021-1/+0
2021-09-13Remove unused include in MotoController.hReinhold Gschweicher1-1/+0
2021-09-13Fix DisplayAppRecovery : fix include error by forward declaring Controllers i...Jean-François Milants2-13/+20
2021-09-13Merge branch 'evergreen22-refactor_adv' into developJean-François Milants4-51/+97
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/pinmapJF00216-92/+118
2021-09-13docs: Fix a few typos (#606)Tim Gates4-4/+4
2021-09-13Add WATCH_COLMI_P8 option to cmake & docshubmartin2-0/+10
2021-09-13Merge branch 'develop' into pinmaphubmartin17-86/+71
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-12Merge pull request #552 from Riksu9000/new_to_infinitimeJF0021-17/+7
2021-09-12Merge pull request #551 from hubmartin/patch-3JF0021-0/+4
2021-09-12Merge pull request #550 from hubmartin/patch-2JF0021-0/+4
2021-09-11Merge pull request #615 from Utopiah/patch-1JF0021-0/+1
2021-09-11Merge pull request #636 from Itai-Nelken/move-about-firmware-settings-downJF0021-2/+2
2021-09-10Run CI on master and develop branchNeroBurner1-4/+4
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-02Set version to 1.4.0.Jean-François Milants1-1/+1
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-09-01Merge pull request #579 from mabuch/fix-github-buildJF0021-15/+9
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 pull request #497 from Riksu9000/refresh_reworkJF00272-287/+182
2021-08-28Merge branch 'develop' into refresh_reworkRiku Isokoski29-234/+292
2021-08-28Merge branch 'develop' into timer_battery_readingRiku Isokoski37-351/+423
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 'Riksu9000-twimaster_rework' into developJean-François Milants4-88/+49
2021-08-28Merge branch 'twimaster_rework' of https://github.com/Riksu9000/InfiniTime in...Jean-François Milants4-88/+49
2021-08-28Merge pull request #492 from Riksu9000/new_touch_handlerJF00224-151/+239
2021-08-26Correct change test for wake up mode settingColin Kinloch1-1/+1
2021-08-26Infini-iOSFabien Benetou1-0/+1
2021-08-23Remove commented commands completelyhubmartin2-11/+0
2021-08-23Merge branch 'develop' into wake-timehubmartin2-7/+7
2021-08-22Update startup SCL toggling pinmap definitionshubmartin1-4/+5
2021-08-22Merge branch 'develop' into pinmaphubmartin25-342/+365
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 19:36:55 +0000