summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-09-19Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants
2021-09-19Fix the display of the date after a reset : when the date/time was restored f...Jean-François Milants
2021-09-18Merge pull request #669 from NeroBurner/fix_unsigned_comparison_warning_metro...JF002
2021-09-18Merge branch 'geekbozu-PersistantStorage' into developJean-François Milants
2021-09-18Merge branch 'PersistantStorage' of git://github.com/geekbozu/InfiniTime into...Jean-François Milants
2021-09-18Fix DisplayAppRecovery : add AlarmController to ctor().Jean-François Milants
2021-09-18Merge pull request #662 from mruss77/basic-alarm-appJF002
2021-09-16resolve conflict in src/systemtask/Messages.hMark Russell
2021-09-16Revert "Merge upstream"Mark Russell
2021-09-16Merge upstreamMark Russell
2021-09-16Fixes per Riksu9000's feedbackMark Russell
2021-09-16Fix unsigned/signed comparison warning in Metronome.cppReinhold Gschweicher
2021-09-14Merge pull request #658 from NeroBurner/patch-2JF002
2021-09-14Merge pull request #668 from NeroBurner/motorcontroller_remove_unused_includeJF002
2021-09-13Remove unused include in MotoController.hReinhold Gschweicher
2021-09-13License header fix, add missing bracesMark Russell
2021-09-13Fixes based on code reviews (formatting, UI code)Mark Russell
2021-09-13Fix DisplayAppRecovery : fix include error by forward declaring Controllers i...Jean-François Milants
2021-09-13Merge branch 'evergreen22-refactor_adv' into developJean-François Milants
2021-09-13Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime into...Jean-François Milants
2021-09-13Merge pull request #549 from hubmartin/pinmapJF002
2021-09-13docs: Fix a few typos (#606)Tim Gates
2021-09-13Add WATCH_COLMI_P8 option to cmake & docshubmartin
2021-09-13Merge branch 'develop' into pinmaphubmartin
2021-09-12Merge pull request #617 from ColinKinloch/wake_up_mode_setting_changeJF002
2021-09-12Merge pull request #602 from Riksu9000/del_unusedJF002
2021-09-12Merge pull request #580 from Riksu9000/timer_battery_readingJF002
2021-09-12Merge pull request #552 from Riksu9000/new_to_infinitimeJF002
2021-09-12Merge pull request #551 from hubmartin/patch-3JF002
2021-09-12Merge pull request #550 from hubmartin/patch-2JF002
2021-09-11Merge pull request #615 from Utopiah/patch-1JF002
2021-09-11Merge pull request #636 from Itai-Nelken/move-about-firmware-settings-downJF002
2021-09-10Created basic alarm appMark Russell
2021-09-10Run CI on master and develop branchNeroBurner
2021-09-05Advertise fast for at least 30 secs then slow downJames A. Jerkins
2021-09-05Revert "Linear decrease of advert rate to conserve battery"James A. Jerkins
2021-09-04Linear decrease of advert rate to conserve batteryJames A. Jerkins
2021-09-02Add some commentsTim Keller
2021-09-02Update Settings.cppItai Nelken
2021-09-02Set version to 1.4.0.Jean-François Milants
2021-09-02Fix styles issues - no change to functionalityJames A. Jerkins
2021-09-02Fix race condition, connect->disconnect->discoveryJames A. Jerkins
2021-09-01Merge pull request #579 from mabuch/fix-github-buildJF002
2021-08-31Fix notifications that wouldn't auto close when the timeout elapsed (in previ...Jean-François Milants
2021-08-31Completely reset connection state on failJames A. Jerkins
2021-08-30Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski
2021-08-29WIP Refactor ble advertisingJames A. Jerkins
2021-08-29Merge branch 'develop' into pinmaphubmartin
2021-08-28Fix wake on tap/double tap.Jean-François Milants
2021-08-28Settings : use enums instead of ints to store colors. Group all PTS settings ...Jean-François Milants