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 
							
						 
					 
					
						
						
						
						
							
						
						
							93ccbf38e8 
							
						 
					 
					
						
						
							
							Fix touch wakeup and code cleanup  
						
						 
						
						
						
						
					 
					
						2021-07-16 01:49:20 +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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7133287b76 
							
						 
					 
					
						
						
							
							Set correct refresh times for lvgl ( #488 )  
						
						 
						
						
						
						
					 
					
						2021-07-14 20:35:21 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							a07b6382ae 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:JF002/Pinetime into develop  
						
						 
						
						
						
						
					 
					
						2021-07-13 20:54:49 +02: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a5616b0bc8 
							
						 
					 
					
						
						
							
							Adjust displayapp delay to compensate time spent ( #482 )  
						
						 
						
						
						
						
					 
					
						2021-07-13 20:42:59 +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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f3f5eb5739 
							
						 
					 
					
						
						
							
							Added new screens to DisplayApp.cpp  
						
						 
						
						
						
						
					 
					
						2021-07-09 14:19:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								timaios 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6b3be0f5a1 
							
						 
					 
					
						
						
							
							Added new screens to the list of applications  
						
						 
						
						
						
						
					 
					
						2021-07-09 14:15:50 +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