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

365 commits

Author SHA1 Message Date
Jean-François Milants 81a143173f Merge branch 'improve-battery-percentage-to-battery-icon-mapping' of https://github.com/hassless/InfiniTime into hassless-improve-battery-percentage-to-battery-icon-mapping 
# Conflicts:
#	src/displayapp/screens/BatteryIcon.cpp
 2021-08-10 12:30:42 +02:00
Jean-François Milants c086520c97 Code cleaning in Clock, WatchFaceAnalog, WatchFaceDigital and PineTimeStyle, inspired by PR #232 by nscooling. 2021-08-10 11:39:25 +02:00
Tim 3e9c30a18f
Merge branch 'JF002:develop' into set-datetime-manually 2021-08-08 14:37:48 +02:00
Riku Isokoski 10b5d30ec3 Merge branch 'develop' into refresh_rework 2021-08-03 12:16:40 +03:00
Riku Isokoski a618f43b4d Fixes 2021-08-01 14:13:32 +03:00
Riku Isokoski e6dcb3009f Improvements 2021-08-01 13:05:48 +03:00
Riku Isokoski 5bdef365f2 Merge branch 'develop' into HEAD 2021-08-01 11:47:26 +03:00
Kieran Cawthray 12aeb46889 Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker 2021-07-28 16:07:43 +02:00
Kieran Cawthray e6bc485679 Increment settings value, remove old hacky fix 2021-07-25 22:18:39 +02:00
Jean-François Milants 514481ef7f Tile event handler : read the event data only if the event is a "value changed event". LVGL sends many other event and some of them do not set the event data (global static variable) to a valid address, which may cause an invalid read. I noticed that when porting this class on RISC-V platform (BL602). 2021-07-25 19:55:21 +02:00
Riku Isokoski a1ba187c47 Merge branch 'develop' into new_touch_handler 2021-07-25 20:01:09 +03:00
Riku Isokoski 2e8bc634dc Merge branch 'develop' into fit_more_tasks 2021-07-25 19:30:27 +03:00
Jonathan Vander Mey 7b75ca591d Fix compile warnings 2021-07-25 18:01:13 +02:00
Riku Isokoski 574434550a Fix slow scroll 2021-07-25 17:59:58 +02:00
Riku Isokoski 1ae22f45f9 Fix cases where Get() isn't used 2021-07-25 17:56:07 +02:00
Riku Isokoski f2f22184b0 Add new unique icons for some apps 2021-07-25 17:55:08 +02:00
Riku Isokoski a69be1520a Add task state info to SystemInfo 2021-07-25 17:52:19 +02:00
Riku Isokoski ec2469a6c1
Code cleanup (#466) 
* Code cleanup
* Remove override again
 2021-07-25 16:54:05 +02:00
Riku Isokoski e4d9636e82 Merge branch 'develop' into new_touch_handler 2021-07-24 20:26:10 +03:00
Jean-François Milants 926553d043 Merge branch 'fix_touchevent_tap' of git://github.com/Riksu9000/InfiniTime into Riksu9000-fix_touchevent_tap 
# Conflicts:
#	src/displayapp/DisplayApp.cpp
 2021-07-24 18:46:52 +02:00
Kieran Cawthray b3e3d75d0f Add extra screen in settings to show scrollbar correctly 2021-07-24 14:25:27 +02:00
Riku Isokoski fc93bdbbba Merge branch 'develop' into refresh_rework 2021-07-23 22:56:00 +03:00
Riku Isokoski d666c5004f
Merge branch 'develop' into new_touch_handler 2021-07-23 22:52:08 +03:00
Kieran Cawthray 1ddb1f0832 Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker 2021-07-23 15:03:28 +02:00
Riku Isokoski 0a0f28fff4
Make firmware updating more foolproof (#469) 
* Make firmware updating more foolproof and fix bugs
* No need to manually handle overflow
* Make startTime TickType_t
* Don't process TouchEvents::None
* Fix sleep getting re-enabled issue more directly
 2021-07-22 21:57:45 +02:00
Riku Isokoski 12b14176ec Fix 2021-07-21 14:46:27 +03:00
Riku Isokoski 93893511f1 Fit more tasks in SystemInfo 2021-07-21 14:41:29 +03:00
Kieran Cawthray db784fc2fb Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker 2021-07-20 15:30:07 +02:00
Riku Isokoski 331fc2be69 Set remaining default periods to LV_DISP_DEF_REFR_PERIOD 2021-07-19 17:06:20 +03:00
Riku Isokoski 97c761a5c7 Refresh rework 2021-07-19 16:26:12 +03:00
Riku Isokoski dc2b5f0c6b Restore Tile.cpp changes 2021-07-19 10:21:42 +03:00
Riku Isokoski 329482f873 Fix remaining known issues 2021-07-16 11:55:29 +03:00
Riku Isokoski baffa1594f Fix gestures 2021-07-16 02:17:17 +03:00
Riku Isokoski 2a3e126390 Fix most issues 2021-07-16 00:07:55 +03:00
Riku Isokoski fe64176e7b New touch handler, with issues 2021-07-15 14:11:27 +03:00
Riku Isokoski 7ac6bdfe71 Merge branch 'develop' into update_touch_driver 2021-07-15 01:03:44 +03:00
Kozova1 57b3397078
Multiple wakeup sources (#290) 
* Allow multiple wakeup modes at the same time.

This commit adds multiple wakeup modes support.
It does so by storing them as a uint8_t bitfield enum.
It changes the following functions:

Since multiple modes can be on now, older version would not cut it:
WakeUpMode getWakeupMode() -> std::bitset<3> getWakeUpModes()
Where each bit corresponds to a WakeUpMode

We still need a way to check whether a specific wakeup mode is on, so:
bool isWakeUpModeOn(const WakeUpMode mode)

This function was changed to work correctly with the new implementation.
setWakeUpMode(WakeupMode mode, bool enable)

Previously, systemtask would exit SystemTask::OnTouchEvent() if the wake
up mode was None or RaiseWrist, to prevent waking up when a touch was
received. However, after enabling using multiple WakeUpModes, this
caused a bug where when RaiseWrist was checked with SingleTap or
DoubleTap, the tap detection wouldn't work.

This commit fixes that bug.

Next commit will update the settings WakeUpMode select UI to reflect these changes.

Signed-off-by: Kozova1 <mug66kk@gmail.com>

* Updated UI to reflect multiple WakeUp sources being available.

Signed-off-by: Kozova1 <mug66kk@gmail.com>
 2021-07-14 20:51:51 +02:00
Riku Isokoski 5bc40c9287 Update touchpad driver 2021-07-14 17:11:16 +03:00
Riku Isokoski 95b8a56dd4 Merge branch 'develop' into fix_touchevent_tap 2021-07-14 09:59:56 +03:00
Jean-François Milants e2efb193c4 Merge branch 'lvgl_use_system_tick' of https://github.com/Riksu9000/InfiniTime into Riksu9000-lvgl_use_system_tick 
# Conflicts:
#	src/displayapp/screens/BatteryInfo.cpp
#	src/displayapp/screens/BatteryInfo.h
 2021-07-13 20:53:40 +02:00
Jean-François Milants 3e70554844 Merge branch 'develop' into notify-battery-level 
# Conflicts:
#	src/displayapp/screens/BatteryInfo.cpp
 2021-07-13 20:31:26 +02:00
Kieran Cawthray db99ac88d9 Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker 2021-07-12 13:01:11 +02:00
Jonathan Vander Mey 4f378e8726
Refactor trig functions into LUT (#476) 
Replaced the use of the standard library trig functions with a LUT-based
implementation instead. The standard library implementations produce
more accurate results but the usage here doesn't need that. This ends up
saving nearly 7kB of binary size.
 2021-07-11 20:18:07 +02:00
kieranc 748e31421d
Modify status text in BatteryInfo so it fits on screen (#437) 
* Modify status text in BatteryInfo so it fits on screen
 2021-07-11 17:48:16 +02:00
Jean-François Milants e21f6a7f41 Notify battery level every 10 minutes when connected to a BLE host. 
Refactor battery percent : only use uint8_t to store the battery % remaining.
 2021-07-11 16:55:06 +02:00
kieranc 6a91b83b12
Change step gauge range to 100 and calculate progress as percantage (#468) 2021-07-11 15:08:23 +02:00
Tim Taenny ffa51612fc Code optimizations in SettingSetDate and SettingSetTime 
Instead of calling lv_obj_align after each button click, the
labels have their auto_realign property set.
 2021-07-09 20:35:48 +02:00
Tim Taenny da36d4a5a1 Code optimizations in SettingSetTime 
The positions of the labels are controlled by #define's, just
like in SettingSetDate.
 2021-07-09 20:17:47 +02:00
Tim Taenny 0842a13339 Modified Settings menu as per suggestion 
Moved "Set date" and "Set time" to the second page of the
Settings menu.
 2021-07-09 17:49:35 +02:00
Tim Taenny 3e5ad49e3a Code optimizations in SettingSetDate 
Using static method of DateTimeController for retrieving month
texts instead of implementing it in SettingSetDate again.
 2021-07-09 17:46:17 +02:00
Tim Taenny 06dfe14251 Code optimizations in SettingSetTime 2021-07-09 17:13:29 +02:00
Tim Taenny f78c9bfcab Code optimizations in SettingSetDate 2021-07-09 16:57:59 +02:00
timaios 5ae4192d8d
Added new menu entries to Settings page 2021-07-09 14:22:45 +02:00
timaios c396925766
Added new screen: SettingSetDate 2021-07-09 14:12:26 +02:00
timaios c77634ce32
Added new screen: SettingSetTime 2021-07-09 14:11:20 +02:00
Riku Isokoski 99e26bdd4c LVGL use system tick 2021-07-07 15:47:47 +03:00
Riku Isokoski 61a4642221
Improve stopwatch (#432) 
* Improve stopwatch more

* Make sure sleep gets reenabled

* Cleanup and clang-format
 2021-07-04 20:23:03 +02:00
Avamander ab59b9b830
Whitespace and brace fixes (#456) 
* Brace style and whitespace fixes

* Additional whitespace fixes
 2021-07-04 20:06:50 +02:00
Riku Isokoski 3b0fcc2a73 clang-format 2021-07-04 20:05:39 +02:00
Riku Isokoski 94aefed98f Condense firmware validation code 2021-07-04 20:05:39 +02:00
Riku Isokoski 217f16d189 Improve paddle game 2021-07-03 10:40:30 +02:00
Bryton Hall 4e435e93e0
and metronome icon (#439) 
* add drum icon for metronome app
 2021-07-02 17:34:32 +02:00
Riku Isokoski 38f40034b0
Float voltage to int (#444) 
* Change voltage float to millivolt integer
* Explain the ADC to milliVolts conversion
 2021-07-02 17:30:32 +02:00
Riku Isokoski 7075b7f264 Fix call notification button alignment 2021-07-02 17:20:58 +02:00
Avamander bdb5965f1a static_cast cleanup 2021-07-02 16:27:41 +02:00
Avamander 2f479e5fc7 Fixed a bunch of format specifiers 2021-07-02 16:27:16 +02:00
Kieran Cawthray 2edf41be8e Fix bad merge 2021-06-29 21:15:39 +02:00
Kieran Cawthray 4f21748aa2 Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker 2021-06-29 21:10:36 +02:00
kieranc f317d54218
Add PineTimeStyle watchface (#334) 
* PineTimeStyle
* Move GPL license header
* Add step count gauge - replaces heartrate in sidebar
* Enable 12/24h functionality
* Set step gauge outer to be white when step goal is reached
* Add font source file
* Move static needle_colors array to member variable
* Add documentation on generating a font
* Replace .ttf with Google version, add link to font page

Co-authored-by: JF002 <JF002@users.noreply.github.com>
 2021-06-29 20:20:27 +02:00
Kieran Cawthray 660a8597f6 Add reset button, reduce button opacity 2021-06-27 15:24:17 +02:00
Neil O'Fix 0045fb16b6
SPI flash sleep if bootloader >= 1.0.0 (#322) 
* Retrieve and display bootloader version
- Display bootloader version on System Info screen
- Enable SPI flash sleep mode if bootloader version >= 1.0.0
* Wait for SPI flash to wakeup before starting OTA DFU
 2021-06-26 20:53:32 +02:00
Kieran Cawthray 6889cf1ed8 Fix the fix, whoops 2021-06-25 21:55:51 +02:00
Kieran Cawthray 800daecf90 Add a check to set default colors if all colors are white 2021-06-25 21:36:55 +02:00
Kieran Cawthray f3b40cb7a6 Make it loop around when you get to the end of the list of colors 2021-06-25 19:04:29 +02:00
Kieran Cawthray be22a9b1b8 Fix off-by-one error, reduce step gauge needle width 2021-06-25 15:09:18 +02:00
Kieran Cawthray 878dd1a776 Use colors from settings for PineTimeStyle watchface 2021-06-25 14:58:45 +02:00
Kieran Cawthray 50b92e5dd6 Move array to member variable, retrieve colors from settings for display 2021-06-25 14:47:56 +02:00
Kieran Cawthray d5d8438b60 Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker 2021-06-25 08:48:16 +02:00
Kieran Cawthray 8f16574992 PineTimeStyle color picker tidying 2021-06-24 21:51:23 +02:00
Kieran Cawthray 7edfc53481 PineTimeStyle color picker add settings integration 2021-06-24 21:49:04 +02:00
Kieran Cawthray 38ab0add48 PineTimeStyle color picker initial commit 2021-06-24 19:15:23 +02:00
Kieran Cawthray 14721e8f1e Move static needle_colors array to member variable 2021-06-23 22:14:34 +02:00
Jonathan Vander Mey ef999e8dd3
Fix typo in variable names (#430) 2021-06-22 20:34:46 +02:00
Avamander 572be3e857
Removed an illogical comparison from SystemInfo and St7789 driver (#449) 
* Removed an illogical comparison
 2021-06-22 20:31:31 +02:00
Kieran Cawthray be505fc15f Set step gauge outer to be white when step goal is reached 2021-06-21 20:06:47 +02:00
Kieran Cawthray 266573deff Enable 12/24h functionality 2021-06-20 21:57:28 +02:00
Kieran Cawthray 607af27ba8 Add step count gauge - replaces heartrate in sidebar 2021-06-20 21:53:09 +02:00
Kieran Cawthray b130ffa39c Merge remote-tracking branch 'upstream/develop' into pinetimestyle 2021-06-20 21:46:51 +02:00
JF002 c6dca25b9f
Add support for BMA425 acceleration sensor. (#440) 
* Add support for BMA425 acceleration sensor.
 2021-06-19 20:27:59 +02:00
hassless 84a6c88e98
Merge branch 'JF002:develop' into improve-battery-percentage-to-battery-icon-mapping 2021-06-18 17:17:26 +02:00
Kieran Cawthray f5d756928f Merge remote-tracking branch 'upstream/develop' into pinetimestyle 2021-06-16 16:33:34 +02:00
Jean-François Milants d6fcbe960e Fix build issues since Metronome app has been merged. 2021-06-12 15:14:14 +02:00
Bryton Hall c575754b42
add basic metronome app (#409) 
* add basic metronome app

* add bpb, tap to bpm, update widgets

* use event pressed for bpm tap

* move case statement break to the right place

* narrow bpm selection range, override touch events

* fix arc knob style

* re-enable sleeping in destructor
 2021-06-12 15:06:58 +02:00
JF002 58a8507b3d
Merge pull request #405 from Riksu9000/improve_stopwatch 
Improve stopwatch
 2021-06-12 14:27:51 +02:00
Jean-François Milants d7962617e4 Clock : initialize the actual clockface in initialization list instead of in the core of the ctro(). 2021-06-12 14:21:29 +02:00
JF002 17c6583937
Merge pull request #425 from Raupinger/remove-watch-tap 
Remove tap to switch Watchfaces
 2021-06-12 14:15:32 +02:00
Avamander 314a8ebba0
Changed the namespace of SystemInfo::sortById to avoid a name conflict (#360) 2021-06-12 11:18:19 +02:00
Riku Isokoski bf906bd573
Fix scrollbar (#382) 2021-06-12 11:12:39 +02:00
Riku Isokoski 239b5547ea Fix another regression 2021-06-11 14:55:37 +03:00
Riku Isokoski 123c6f1917 Fix touchevent tap 2021-06-11 13:26:28 +03:00
Florian 049174bd35 replace ScreenList with a single screen in Clock. This removes the tap to switch feature 2021-06-11 01:15:32 +02:00
Jean-François Milants b1925ff286 Minor improvements: use std::make_unique when creating unique_ptr, check the code is running from an IRQ before calling xQueueSendFromISR or xQueueSend) 2021-06-10 21:20:27 +02:00
hassless d0df278b0b
Update BatteryIcon.cpp 
Improvement to the mapping of battery percentage to the battery icon to be displayed.
 2021-06-09 13:47:22 +02:00
Jean-François Milants 7f9cc51b05 Initialize SystemTask, DisplayApp and HeartRateTask as global static variable instead of variables on the heap. We don't need them on the heap as we know their size at build time, it'll reduce memory fragmentation and it'll make memory analysis easier. 2021-06-06 15:56:03 +02:00
Kieran Cawthray f2d01166c3 Merge remote-tracking branch 'upstream/develop' into pinetimestyle 2021-06-04 08:57:40 +02:00
JF002 79f0fcb07a
Add the maximum memory used by LVGL in SystemInfo app. This will help the developers to size the memory buffer allocated to lvgl. (#408) 2021-06-01 21:03:29 +02:00
JF002 287399f993
Navigation app: reduce memory usage (#362) 
* Navigation app:
 - Renaming and reformatting according to coding conventions
 - declare iconMap as constexpr and use char* instead of std::string

This reduces the flash usage from 424644B to 419344B (-5300B)!
 2021-06-01 21:01:32 +02:00
Riku Isokoski c6969268fc Keep button visible, but disabled 2021-05-26 16:13:40 +03:00
Riku Isokoski b393105082 improve ui and optimize code 2021-05-26 15:15:10 +03:00
Kieran Cawthray 565601ef50 Merge remote-tracking branch 'upstream/develop' into pinetimestyle 2021-05-21 14:34:25 +02:00
Florian 13e3463276
Timer App (#355) 
* built timer app

* Style improvements

* making sure buttons stay hidden when the app is reopened and reappear after the timer runs out

* more sensible calculations of time deltas. eliminated that mysterious scaling factor

* changing the timer icon
 2021-05-20 20:43:54 +02:00
Florian 8c3b250dbf
removed an empty assignment that caused a compiler warning (#372) 2021-05-20 20:34:21 +02:00
Kieran Cawthray 5c413016a7 Move GPL license header 2021-05-19 17:27:42 +02:00
Kieran Cawthray 249b6db6f5 Remove newline modifications 2021-05-19 17:05:33 +02:00
Kieran Cawthray 5daaa5cf75 Tidying/formatting fixes 2021-05-19 11:03:33 +02:00
Kieran Cawthray 108bbc3642 Fix it again.. 2021-05-18 18:03:26 +02:00
Kieran Cawthray 6a92529272 Revert "Reset" 
This reverts commit 378fa6b401.
 2021-05-18 17:45:16 +02:00
Kieran Cawthray a4968b5029 PineTimeStyle 2021-05-18 15:33:25 +02:00
Kieran Cawthray 378fa6b401 Reset 2021-05-18 15:33:25 +02:00
JF002 5b2472c4bc
Merge pull request #347 from jedi2light/feature-show-git-commit-hash-short 
Feature: Store and show git short ref on PineTime alongside other firmware information
 2021-05-16 11:37:39 +02:00
Florian Kraupa 9e8dd9a1e6 NotificationItem now also redefines the start of the timeout 2021-05-16 00:42:31 +02:00
Florian Kraupa 56af4a0b83 cleaned up the code and reduced the size of the diff by removing things like additional whitespaces 2021-05-16 00:42:31 +02:00
Florian Kraupa 5da65494b3 only activate the timeout on call notification previews after they have been interacted with 2021-05-16 00:42:31 +02:00
Florian Kraupa d13dd6dee3 implemented continuous vibration pattern for incoming calls 2021-05-16 00:42:31 +02:00
Florian Kraupa 2627ef760e better handling of long notification titles 2021-05-16 00:16:33 +02:00
JF002 09977c28c0
Merge pull request #298 from joaquimorg/StepsApp 
New Steps app
 2021-05-15 22:32:40 +02:00
Stoian Minaiev a4de61e1f5 git: show git short ref hash on SystemInfo(first screen) and FirmwareValidation screen alongside other information 2021-05-14 01:09:40 +03:00
Stoian Minaiev 9a8824c35a
SystemInfo app screen 
First screen. Let the build date and build time string be centered as well as the others
 2021-05-10 15:13:33 +03:00
Martin Ashby 3a938236d4
Fix a possible double free in StopWatch::Refresh. 
The lv_obj_del is called on btnStopLap  when transitioning to the
initial state, however the variable isn't then set to null. A subsequent
call to Refresh would attempt to delete the already freed object. This
could be triggered by stopping the stop watch, then pressing the
physical button on the watch.

Fixes https://github.com/JF002/InfiniTime/issues/315
 2021-05-03 08:11:58 +01:00
JF002 65e4fe0310
Merge pull request #314 from eivindm/improved_heartbeat_in_watchface 
Improve design of heartbeat data in digital watchface
 2021-05-02 14:41:19 +02:00
Eivind Mork 3355afbbd1 Show heartbeat icon in watchface in gray if data is missing 2021-05-02 12:30:33 +02:00
JF002 9f15fd1820
Merge pull request #301 from petterhs/vib 
Short vibration when enabling it in quick settings menu
 2021-05-02 11:58:48 +02:00
petter 6e1726d1d0 short vibration when enabling it 2021-05-02 11:48:05 +02:00
JF002 d141888b82
Merge pull request #275 from panos/navigation-text 
Changed text in Navigation
 2021-05-02 11:45:08 +02:00
Joaquim cd0d85dff9 Merge branch 'develop' of 
https://github.com/JF002/InfiniTime into StepsApp
 2021-04-26 21:29:48 +01:00
Avamander 6989854519 Changed access modified indentation 2021-04-24 12:00:45 +03:00
Avamander 40d45d923b Reformatted all the files according to clang-format style 2021-04-24 11:39:53 +03:00
Jean-François Milants fefb429fb4 Fix formatting issue on the lap counter in Stopwatch (display lap counter on 2 characters). 2021-04-20 21:01:38 +02:00
Joaquim 5fc07a8df7 Fix button size and default step goal 2021-04-20 16:21:01 +01:00
Jean-François Milants 410cc821f4 Fix formatting issue on the lap counter in Stopwatch. 2021-04-19 20:30:51 +02:00
Joaquim cd4a3e1dfe New Steps app 
Settings to set the steps goal
More detail in Motion app
New 42px Font
 2021-04-19 15:28:38 +01:00
Jean-François Milants bbc24e88b0 Fix a display glitch when an OTA is initiated while an app (other than Clock) was open and while the device was in sleep mode. 2021-04-18 17:44:40 +02:00
Jean-François Milants a7114f21b7 Fix display consistency with the HR measurement when measurements are already running when the app is open. 2021-04-18 13:50:38 +02:00
JF002 6eaa395e7d
Merge pull request #285 from Peetz0r/fix-stopwatch-formatting 
Fix stopwatch formatting
 2021-04-18 10:47:46 +02:00
JF002 4152306bc3
Merge pull request #269 from petterhs/musicBtnTheme 
Apply theme to Music buttons
 2021-04-18 10:40:15 +02:00
Peetz0r b221cc1731 Stopwatch: improve variable naming 
msec => hundredths
 2021-04-17 23:47:53 +02:00
Peetz0r 7caeecc09b Stopwatch: improve number formatting 2021-04-17 23:47:02 +02:00
Panagiotis Vasilopoulos a26f64996a
Changed text in Navigation 2021-04-17 05:40:05 +03:00
Joaquim 3c413bdd52 In order to stabilize the battery reading, 
I modified the process to make 5 consecutive readings,
as the process is asynchronous,
there is no interference in the main process.
 2021-04-16 16:15:38 +01:00
petter 2f1ddad403 fix style formatting in 2048 game 2021-04-16 01:18:32 +02:00