scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity
1273 commits 2 branches 1 tag 45 MiB
Commit graph

1273 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maxim Leshchenko d86ae69961 Alarm: Close the popup with information about the time until alarm with the 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
 2021-09-28 22:50:09 +03:00
Sematre 6aa945a4f5
Fix dead link in README 2021-09-28 21:36:24 +02:00
Jean-François Milants e9bb0b3cdd Set version to 1.6.0 2021-09-28 20:21:50 +02:00
JF002 fc922b607c
Merge pull request #688 from danielgjackson/fix-advertising-18-hours 
Fix advertising packets stopping after 18.2 hours
 2021-09-28 20:15:39 +02:00
Daniel Jackson 7ba00b0157
Fix the size of the filesystem. 
Correct typo: 0x400000 - 0x0B4000 = 0x34C000.
 2021-09-27 02:42:53 +01:00
Jean-François Milants d03db14129 Set version to 1.5.0 2021-09-26 10:57:02 +02:00
Daniel Jackson d7ca217872
Correctly return the tick at which the RF will be fully enabled. 
Always returning 0 (when `MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME` is not defined), rather than a time near to the current tick, causes an issue in at least one place: `ble_ll_adv_sm_start()`, where the calculation of `delta` overflows when the system timer is at 0x80000000 or above -- causing an incorrect, huge adjustment to be made to the scheduled time, ultimately stopping adverts from being sent.
 2021-09-25 23:48:53 +01:00
JF002 8a2b86dc83
Merge pull request #664 from Riksu9000/disable_notif_only 
Toggle notifications only, keep vibrations.
 2021-09-23 20:13:42 +02:00
Riku Isokoski 980ac17388 Show plug icon while plugged in 2021-09-22 13:58:45 +03:00
Riku Isokoski b210090837 Merge branch 'develop' into detect_full_charge 2021-09-22 12:03:41 +03:00
Riku Isokoski d7dfe5d4ed Remove unused variable 2021-09-21 15:36:31 +03:00
Jean-François Milants 1c3c3c8db9 Merge branch 'develop' of github.com:JF002/Pinetime into develop 2021-09-19 17:43:28 +02:00
Jean-François Milants f3b5da0049 Fix the display of the date after a reset : when the date/time was restored from the noinit area, the date was displayed as "--" instead of the actual date. 
This issue was caused by DateTime::SetCurrentTime() that would not update the internal state of the class : dayOfWeek, Month, Year were not properly updated according to the current time.
 2021-09-19 17:42:50 +02:00
JF002 52eb94cfc4
Merge pull request #669 from NeroBurner/fix_unsigned_comparison_warning_metronome 
Fix unsigned/signed comparison warning in Metronome.cpp
 2021-09-18 20:33:45 +02:00
Riku Isokoski e468acc99e
Merge branch 'develop' into update_touch_driver 2021-09-18 19:22:59 +03:00
Jean-François Milants 5855906e49 Merge branch 'geekbozu-PersistantStorage' into develop 2021-09-18 17:37:48 +02:00
Jean-François Milants f556003de3 Merge branch 'PersistantStorage' of git://github.com/geekbozu/InfiniTime into geekbozu-PersistantStorage 
# Conflicts:
#	src/systemtask/SystemTask.cpp
 2021-09-18 17:37:37 +02:00
Jean-François Milants 7af7db74cd Fix DisplayAppRecovery : add AlarmController to ctor(). 2021-09-18 17:20:33 +02:00
JF002 9cd0def361
Merge pull request #662 from mruss77/basic-alarm-app 
Basic alarm app
 2021-09-18 17:16:19 +02:00
Mark Russell b9e56843a2 resolve conflict in src/systemtask/Messages.h 2021-09-16 16:20:39 -04:00
Mark Russell cdf99b08f4 Revert "Merge upstream" 
This reverts commit 1d43adcdfa.
 2021-09-16 16:12:20 -04:00
hubmartin 27366bdfdf Merge branch 'develop' into wake-time 2021-09-16 22:04:31 +02:00
Mark Russell 1d43adcdfa Merge upstream 2021-09-16 16:01:25 -04:00
Mark Russell f857a757a7 Fixes per Riksu9000's feedback 2021-09-16 15:38:31 -04:00
Reinhold Gschweicher 63477fc096 Fix unsigned/signed comparison warning in Metronome.cpp 
`xTaskGetTickCount()` returns a `TickType_t`, which is defined as an
`uint32_t`. This is compared to the `bpm` variable, which is a `int16_t`
in the range of 40 to 220 as defined in the constructor.

```cpp
  lv_arc_set_range(bpmArc, 40, 220);
```

Just assume that `bpm` is greater than 0, as this
would result in a divison by zero or negative values, which would
unintentionally underflow to a very large number.
 2021-09-16 10:47:09 +02:00
Riku Isokoski 8f0771183c Fix Error screen and optimize GetTouchInfo 2021-09-15 12:25:41 +03:00
Riku Isokoski 93d240a23b
Merge branch 'develop' into disable_notif_only 2021-09-14 23:38:42 +03:00
JF002 3eb73774a3
Merge pull request #658 from NeroBurner/patch-2 
Run CI on master and develop branch
 2021-09-14 22:06:37 +02:00
JF002 d081c41ae7
Merge pull request #668 from NeroBurner/motorcontroller_remove_unused_include 
Remove unused include in MotoController.h
 2021-09-14 21:44:50 +02:00
Riku Isokoski f221f5d744 Merge branch 'develop' into update_touch_driver 2021-09-14 15:34:09 +03:00
Reinhold Gschweicher f89780f332 Remove unused include in MotoController.h 
Remove the unused include `app_timer.h` in `MotorController.h`
 2021-09-13 22:40:15 +02:00
Mark Russell 2bf339a3f8 License header fix, add missing braces 2021-09-13 16:05:35 -04:00
Mark Russell bfe13d9d68 Fixes based on code reviews (formatting, UI code) 2021-09-13 15:26:28 -04:00
Jean-François Milants 6356c7f276 Fix DisplayAppRecovery : fix include error by forward declaring Controllers in header file. 2021-09-13 20:35:51 +02:00
Riku Isokoski 40765f1173
Merge branch 'develop' into disable_notif_only 2021-09-13 21:22:53 +03:00
Jean-François Milants cf20b02c09 Merge branch 'evergreen22-refactor_adv' into develop 2021-09-13 20:22:44 +02:00
Jean-François Milants 9afa412a2a Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime into evergreen22-refactor_adv 
# Conflicts:
#	src/components/ble/NimbleController.cpp
 2021-09-13 20:22:27 +02:00
JF002 b0bdd2be1c
Merge pull request #549 from hubmartin/pinmap 
Put all duplicated GPIO pin definitions to a single file
 2021-09-13 20:05:43 +02:00
Tim Gates 84a93b5441
docs: Fix a few typos (#606) 
* docs: Fix a few typos

There are small typos in:
- doc/versioning.md
- src/components/ble/NimbleController.cpp
- src/libs/mynewt-nimble/CODING_STANDARDS.md
- src/libs/mynewt-nimble/docs/btshell/btshell_GAP.rst
- src/systemtask/SystemTask.cpp

Fixes:
- Should read `milliseconds` rather than `miliseconds`.
- Should read `unnecessary` rather than `uncesseray`.
- Should read `target` rather than `tharget`.
- Should read `project` rather than `projct`.
- Should read `preferred` rather than `prefered`.
- Should read `functioning` rather than `functionning`.
- Should read `forever` rather than `forver`.
- Should read `existing` rather than `exisiting`.
 2021-09-13 20:02:53 +02:00
hubmartin e614af1c4a Add WATCH_COLMI_P8 option to cmake & docs 2021-09-13 11:41:51 +02:00
hubmartin 73d3e41cea Merge branch 'develop' into pinmap 2021-09-13 10:19:07 +02:00
JF002 c9aeef94ea
Merge pull request #617 from ColinKinloch/wake_up_mode_setting_change 
Correct change test for wake up mode setting
 2021-09-12 18:41:26 +02:00
JF002 8728ac2f6a
Merge pull request #602 from Riksu9000/del_unused 
Remove unused variables
 2021-09-12 18:34:11 +02:00
JF002 f0329298ac
Merge pull request #580 from Riksu9000/timer_battery_reading 
Make battery reading periodic
 2021-09-12 18:22:04 +02:00
JF002 977321cf64
Merge pull request #552 from Riksu9000/new_to_infinitime 
Make README more friendly for new users.
 2021-09-12 18:00:10 +02:00
JF002 1235c697c4
Merge pull request #551 from hubmartin/patch-3 
Add FW validation note after DFU flash
 2021-09-12 17:58:11 +02:00
JF002 53d641736f
Merge pull request #550 from hubmartin/patch-2 
Add link to WebBLEWatch to sync time
 2021-09-12 17:57:36 +02:00
Riku Isokoski 3ee4876214 Toggle notifications only, keep vibrations. 2021-09-12 11:08:25 +03:00
JF002 cdf5801efe
Merge pull request #615 from Utopiah/patch-1 
Infini-iOS
 2021-09-11 21:13:01 +02:00
JF002 2c83c354cf
Merge pull request #636 from Itai-Nelken/move-about-firmware-settings-down 
Move PineTimeStyle settings up
 2021-09-11 21:11:30 +02:00