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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Itai Nelken 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bd1a571399 
							
						 
					 
					
						
						
							
							Update Settings.cpp  
						
						 
						
						
						
						
					 
					
						2021-09-02 23:20:25 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							6f9f0e8b0e 
							
						 
					 
					
						
						
							
							Set version to 1.4.0.  
						
						 
						
						
						
						
					 
					
						2021-09-02 20:32:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF002 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f6248a88ba 
							
						 
					 
					
						
						
							
							Merge pull request  #579  from mabuch/fix-github-build  
						
						 
						
						... 
						
						
						
						fix Github Action build Firmware 
						
						
					 
					
						2021-09-01 20:53:28 +02: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 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							21d37d1e23 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into timer_battery_reading  
						
						 
						
						
						
						
					 
					
						2021-08-30 10:15:19 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hubmartin 
							
						 
					 
					
						
						
						
						
							
						
						
							8390d0ef72 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into pinmap  
						
						 
						
						
						
						
					 
					
						2021-08-29 11:43:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							6c023785e5 
							
						 
					 
					
						
						
							
							Fix wake on tap/double tap.  
						
						 
						
						
						
						
					 
					
						2021-08-28 21:30:31 +02: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 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF002 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ef9f809e14 
							
						 
					 
					
						
						
							
							Merge pull request  #458  from kieranc/pinetimestyle-colorpicker  
						
						 
						
						... 
						
						
						
						Add color picker for PineTimeStyle watchface 
						
						
					 
					
						2021-08-28 20:56:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF002 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2870d3ae6c 
							
						 
					 
					
						
						
							
							Merge pull request  #497  from Riksu9000/refresh_rework  
						
						 
						
						... 
						
						
						
						Rework Refresh 
						
						
					 
					
						2021-08-28 16:39:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							c2fae47391 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into refresh_rework  
						
						 
						
						
						
						
					 
					
						2021-08-28 17:25:50 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							085c9ab2e1 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into timer_battery_reading  
						
						 
						
						
						
						
					 
					
						2021-08-28 16:54:40 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							fab49f8557 
							
						 
					 
					
						
						
							
							Fix recovery firmware since last changes in DisplayApp.  
						
						 
						
						
						
						
					 
					
						2021-08-28 15:23:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							0313277ae6 
							
						 
					 
					
						
						
							
							Fix touchinfo typo in SystemTask.  
						
						 
						
						
						
						
					 
					
						2021-08-28 15:10:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							f895da8634 
							
						 
					 
					
						
						
							
							Merge branch 'Riksu9000-twimaster_rework' into develop  
						
						 
						
						
						
						
					 
					
						2021-08-28 15:09:16 +02: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 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF002 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							969de9a8bc 
							
						 
					 
					
						
						
							
							Merge pull request  #492  from Riksu9000/new_touch_handler  
						
						 
						
						... 
						
						
						
						New touch handler 
						
						
					 
					
						2021-08-28 15:06:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Colin Kinloch 
							
						 
					 
					
						
						
						
						
							
						
						
							b45d7c372d 
							
						 
					 
					
						
						
							
							Correct change test for wake up mode setting  
						
						 
						
						
						
						
					 
					
						2021-08-26 19:42:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabien Benetou 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d7293a44df 
							
						 
					 
					
						
						
							
							Infini-iOS  
						
						 
						
						
						
						
					 
					
						2021-08-26 15:11:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hubmartin 
							
						 
					 
					
						
						
						
						
							
						
						
							51c5257548 
							
						 
					 
					
						
						
							
							Update startup SCL toggling pinmap definitions  
						
						 
						
						
						
						
					 
					
						2021-08-22 22:17:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hubmartin 
							
						 
					 
					
						
						
						
						
							
						
						
							2a299fe275 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into pinmap  
						
						 
						
						
						
						
					 
					
						2021-08-22 22:11:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							8ac1ae70cc 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker  
						
						 
						
						
						
						
					 
					
						2021-08-19 15:14:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							2b30ff4fc6 
							
						 
					 
					
						
						
							
							Remove unused variables  
						
						 
						
						
						
						
					 
					
						2021-08-19 11:12:34 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							85c99797da 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into new_touch_handler  
						
						 
						
						
						
						
					 
					
						2021-08-18 22:07:02 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							40392d7b91 
							
						 
					 
					
						
						
							
							Use highest frequency and move mutex creation to Init  
						
						 
						
						
						
						
					 
					
						2021-08-18 21:40:27 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hubmartin 
							
						 
					 
					
						
						
						
						
							
						
						
							df8ea7fe52 
							
						 
					 
					
						
						
							
							Add memory print usage  
						
						 
						
						
						
						
					 
					
						2021-08-18 20:21:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							b91100573e 
							
						 
					 
					
						
						
							
							Fix music app buttons  
						
						 
						
						
						
						
					 
					
						2021-08-18 20:19:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							81a36dc31e 
							
						 
					 
					
						
						
							
							Simplify parameters and cleanup  
						
						 
						
						
						
						
					 
					
						2021-08-16 18:26:10 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							30b32e4c8a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker  
						
						 
						
						
						
						
					 
					
						2021-08-15 17:50:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							9851ed33d8 
							
						 
					 
					
						
						
							
							Fix potential edge case of sidebar being set black  
						
						 
						
						
						
						
					 
					
						2021-08-15 15:28:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							639fd3a9bd 
							
						 
					 
					
						
						
							
							More tidying following review  
						
						 
						
						
						
						
					 
					
						2021-08-15 15:00:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							5789f1527c 
							
						 
					 
					
						
						
							
							Avoid setting the sidebar black  
						
						 
						
						
						
						
					 
					
						2021-08-15 14:42:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							16ea069d55 
							
						 
					 
					
						
						
							
							Remove duplicate code, minor fixes  
						
						 
						
						
						
						
					 
					
						2021-08-15 14:05:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							3cef05b745 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into refresh_rework  
						
						 
						
						
						
						
					 
					
						2021-08-15 13:35:15 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							c0bb88799c 
							
						 
					 
					
						
						
							
							Add check for randomise button in case colors clash  
						
						 
						
						
						
						
					 
					
						2021-08-15 12:33:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							ee44b6ff49 
							
						 
					 
					
						
						
							
							Adjust inner padding in applist  
						
						 
						
						
						
						
					 
					
						2021-08-15 11:19:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							bc82905371 
							
						 
					 
					
						
						
							
							Clean up using variables  
						
						 
						
						
						
						
					 
					
						2021-08-15 11:19:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							637ed8033b 
							
						 
					 
					
						
						
							
							Adjust previously missed scrollbar and firmware validation buttons  
						
						 
						
						
						
						
					 
					
						2021-08-15 11:19:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							fc6458a35c 
							
						 
					 
					
						
						
							
							Add image with example layouts  
						
						 
						
						
						
						
					 
					
						2021-08-15 11:19:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							e0d01411d7 
							
						 
					 
					
						
						
							
							Ui update  
						
						 
						
						
						
						
					 
					
						2021-08-15 11:19:47 +02:00