CCF_100
/
InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,077 Commits
1 Branch
0 Tags
45 MiB
Commit Graph

1077 Commits (d86ae69961231aaa177ed146ad829c93943f600c)
 

Author SHA1 Message Date
James A. Jerkins d69a8e84fa Fix race condition, connect->disconnect->discovery 2021-09-01 22:48:01 +07:00
JF002 f6248a88ba
Merge pull request #579 from mabuch/fix-github-build 
fix Github Action build Firmware
 2021-09-01 20:53:28 +07:00
Jean-François Milants 1635bfafb3 Fix notifications that wouldn't auto close when the timeout elapsed (in preview mode). 2021-08-31 21:56:21 +07:00
James A. Jerkins 00a3f84ea7 Completely reset connection state on fail 2021-08-30 23:17:16 +07:00
Riku Isokoski 21d37d1e23 Merge remote-tracking branch 'upstream/develop' into timer_battery_reading 2021-08-30 10:15:19 +07:00
James A. Jerkins be31f417db WIP Refactor ble advertising 
Refactor ble advertising based on ble standards and conventions.
Changes are based on the bleprph example code, bluetooth docs, and nimble docs.
 2021-08-29 15:50:04 +07:00
hubmartin 8390d0ef72 Merge branch 'develop' into pinmap 2021-08-29 11:43:50 +07:00
Jean-François Milants 6c023785e5 Fix wake on tap/double tap. 2021-08-28 21:30:31 +07:00
Jean-François Milants 31bc47d1cb Settings : use enums instead of ints to store colors. Group all PTS settings into a struct. 
PTS/SettingsPTS : Convert to/from LVGL color and Settings::Color, add functions to reduce code duplication.
Adapt SettingPineTimeStyle with the last Screen Interface
 2021-08-28 21:02:11 +07:00
JF002 ef9f809e14
Merge pull request #458 from kieranc/pinetimestyle-colorpicker 
Add color picker for PineTimeStyle watchface
 2021-08-28 20:56:34 +07:00
JF002 2870d3ae6c
Merge pull request #497 from Riksu9000/refresh_rework 
Rework Refresh
 2021-08-28 16:39:48 +07:00
Riku Isokoski c2fae47391 Merge branch 'develop' into refresh_rework 2021-08-28 17:25:50 +07:00
Riku Isokoski 085c9ab2e1 Merge branch 'develop' into timer_battery_reading 2021-08-28 16:54:40 +07:00
Jean-François Milants fab49f8557 Fix recovery firmware since last changes in DisplayApp. 2021-08-28 15:23:13 +07:00
Jean-François Milants 0313277ae6 Fix touchinfo typo in SystemTask. 2021-08-28 15:10:14 +07:00
Jean-François Milants f895da8634 Merge branch 'Riksu9000-twimaster_rework' into develop 2021-08-28 15:09:16 +07:00
Jean-François Milants 45e7638fc2 Merge branch 'twimaster_rework' of https://github.com/Riksu9000/InfiniTime into Riksu9000-twimaster_rework 
# Conflicts:
#	src/systemtask/SystemTask.cpp
 2021-08-28 15:08:50 +07:00
JF002 969de9a8bc
Merge pull request #492 from Riksu9000/new_touch_handler 
New touch handler
 2021-08-28 15:06:03 +07:00
Colin Kinloch b45d7c372d Correct change test for wake up mode setting 2021-08-26 19:42:02 +07:00
Fabien Benetou d7293a44df
Infini-iOS 2021-08-26 15:11:20 +07:00
Tim Keller 110c82c225 Move noinit to after BSS segment, 
Now dynamically allocates noinit area size
stores it after the bss before the heap and stack.
 2021-08-23 20:13:26 +07:00
hubmartin 51c5257548 Update startup SCL toggling pinmap definitions 2021-08-22 22:17:57 +07:00
hubmartin 2a299fe275 Merge branch 'develop' into pinmap 2021-08-22 22:11:57 +07:00
Kieran Cawthray 8ac1ae70cc Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker 2021-08-19 15:14:04 +07:00
Riku Isokoski 2b30ff4fc6 Remove unused variables 2021-08-19 11:12:34 +07:00
Tim Keller c9dedfd402 Add some VSCODE stuff to gitignore... 
Allow settings to stop naggin me that it has added assosiation types
 2021-08-19 00:51:42 +07:00
Tim Keller 4f6d7e2c63 Move Backup to the system task. 2021-08-19 00:51:12 +07:00
Tim Keller 2dd7b8ba2c Add clearing of noinit segment on bad word 
Code readability cleanup
 2021-08-19 00:44:22 +07:00
Tim Keller 16502b788f Add MCUBOOT linker changes 
use better linker constant names
 2021-08-19 00:14:42 +07:00
Riku Isokoski 85c99797da Merge branch 'develop' into new_touch_handler 2021-08-18 22:07:02 +07:00
Riku Isokoski 40392d7b91 Use highest frequency and move mutex creation to Init 2021-08-18 21:40:27 +07:00
hubmartin df8ea7fe52 Add memory print usage 2021-08-18 20:21:10 +07:00
Riku Isokoski b91100573e Fix music app buttons 2021-08-18 20:19:02 +07:00
Tim Keller 55f8908769 Make Clock Persistant. 2021-08-17 23:53:57 +07:00
Riku Isokoski 81a36dc31e Simplify parameters and cleanup 2021-08-16 18:26:10 +07:00
Kieran Cawthray 30b32e4c8a Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker 2021-08-15 17:50:56 +07:00
Kieran Cawthray 9851ed33d8 Fix potential edge case of sidebar being set black 2021-08-15 15:28:40 +07:00
Kieran Cawthray 639fd3a9bd More tidying following review 2021-08-15 15:00:54 +07:00
Kieran Cawthray 5789f1527c Avoid setting the sidebar black 2021-08-15 14:42:30 +07:00
Kieran Cawthray 16ea069d55 Remove duplicate code, minor fixes 2021-08-15 14:05:21 +07:00
Riku Isokoski 3cef05b745 Merge branch 'develop' into refresh_rework 2021-08-15 13:35:15 +07:00
Kieran Cawthray c0bb88799c Add check for randomise button in case colors clash 2021-08-15 12:33:32 +07:00
Riku Isokoski ee44b6ff49 Adjust inner padding in applist 2021-08-15 11:19:47 +07:00
Riku Isokoski bc82905371 Clean up using variables 2021-08-15 11:19:47 +07:00
Riku Isokoski 637ed8033b Adjust previously missed scrollbar and firmware validation buttons 2021-08-15 11:19:47 +07:00
Riku Isokoski fc6458a35c Add image with example layouts 2021-08-15 11:19:47 +07:00
Riku Isokoski e0d01411d7 Ui update 2021-08-15 11:19:47 +07:00
Kieran Cawthray 477ff32edc Add randomise button to color picker 2021-08-15 10:41:00 +07:00
Riku Isokoski 044036e884 Merge branch 'develop' into timer_battery_reading 2021-08-14 23:02:23 +07:00
Jean-François Milants df8d396472 Merge branch 'Riksu9000-call-improvements' into develop 2021-08-14 21:54:15 +07:00