JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							583c7ee22f 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into motionservice_fix_typo_in_include  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:59:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Stephanie 
							
						 
					 
					
						
						
						
						
							
						
						
							4257073a02 
							
						 
					 
					
						
						
							
							Fixed container to use clang-format-12 and format on save  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:57:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							67e077348c 
							
						 
					 
					
						
						
							
							Merge branch 'NeroBurner-restructure_includes' into develop  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:53:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							298f0f4335 
							
						 
					 
					
						
						
							
							Merge branch 'restructure_includes' of  https://github.com/NeroBurner/InfiniTime  into NeroBurner-restructure_includes  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	doc/contribute.md
#	src/displayapp/screens/BatteryInfo.h 
						
						
					 
					
						2021-11-28 13:53:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							d5e8e3ca44 
							
						 
					 
					
						
						
							
							Split updating and about software. Remove big Contributing section from README  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							45a90e4967 
							
						 
					 
					
						
						
							
							Update getting started. New pics. More information.  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							caec4a560b 
							
						 
					 
					
						
						
							
							Replace some "we"  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							a326e22986 
							
						 
					 
					
						
						
							
							Add line break  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							3375c4e187 
							
						 
					 
					
						
						
							
							Add missing periods  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							c12fc5e313 
							
						 
					 
					
						
						
							
							Improvements to Apps.md and Intro.md  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							d1583035d9 
							
						 
					 
					
						
						
							
							Link to companion apps  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							5eaae4175c 
							
						 
					 
					
						
						
							
							Fix versioning  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							e53f1bfd66 
							
						 
					 
					
						
						
							
							Summarize updating-softare  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							88e55b2504 
							
						 
					 
					
						
						
							
							Update updating instructions  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							a0c7b48b8e 
							
						 
					 
					
						
						
							
							Replace companionapp pages with links. Add companion apps  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							2314c41ad6 
							
						 
					 
					
						
						
							
							Reorganize bootloader readme  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							52d1906589 
							
						 
					 
					
						
						
							
							Separate and update coding conventions and contributing pages  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							1d3098baa7 
							
						 
					 
					
						
						
							
							Update ui_guidelines  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							c3c5ab3473 
							
						 
					 
					
						
						
							
							Reorganization  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							cf9332f0e5 
							
						 
					 
					
						
						
							
							Crop and shrink photos  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							4aaf3d06bc 
							
						 
					 
					
						
						
							
							Documentation cleanup and reorganization  
						
						 
						
						
						
						
					 
					
						2021-11-28 13:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dc25e7a887 
							
						 
					 
					
						
						
							
							Merge pull request  #820  from Riksu9000/fix-anim-dir  
						
						 
						
						... 
						
						
						
						Fix animation when long pressing on screens adjacent to watch face 
						
						
					 
					
						2021-11-28 13:26:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							894e3cebc0 
							
						 
					 
					
						
						
							
							Merge pull request  #829  from Riksu9000/clang-tidy-update  
						
						 
						
						... 
						
						
						
						Remove some clang-tidy checks 
						
						
					 
					
						2021-11-28 13:21:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e8eee76b48 
							
						 
					 
					
						
						
							
							Merge pull request  #832  from mabuch/fix-doc-motionservice-uuid  
						
						 
						
						... 
						
						
						
						fix Motion Service UUID in doc and code comments 
						
						
					 
					
						2021-11-28 13:21:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							279e63c97a 
							
						 
					 
					
						
						
							
							Merge pull request  #833  from NeroBurner/BatteryInfo_remove_unused_include  
						
						 
						
						... 
						
						
						
						BatteryInfo: remove unused FreeRTOS.h and timer.h includes 
						
						
					 
					
						2021-11-28 13:20:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arsen6331 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							47f73269bb 
							
						 
					 
					
						
						
							
							Add BLE FS docs link to BLE docs  
						
						 
						
						
						
						
					 
					
						2021-11-24 22:22:04 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arsen6331 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7322f3286b 
							
						 
					 
					
						
						
							
							Add documentation for BLE FS  
						
						 
						
						
						
						
					 
					
						2021-11-22 00:35:50 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							1b2a8a5a04 
							
						 
					 
					
						
						
							
							Improve notification icon alignment  
						
						 
						
						
						
						
					 
					
						2021-11-16 18:18:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							bea5c60a11 
							
						 
					 
					
						
						
							
							Revert "Fix notification icon alignment"  
						
						 
						
						... 
						
						
						
						This reverts commit 29bb359e90bff68bdfca67bbd42baeac73dae6ae. 
						
						
					 
					
						2021-11-16 18:10:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							29bb359e90 
							
						 
					 
					
						
						
							
							Fix notification icon alignment  
						
						 
						
						
						
						
					 
					
						2021-11-16 00:06:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							50406adc34 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into pts-settings  
						
						 
						
						
						
						
					 
					
						2021-11-15 22:21:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Reinhold Gschweicher 
							
						 
					 
					
						
						
						
						
							
						
						
							3a41bff9ea 
							
						 
					 
					
						
						
							
							docs: add non-relative includes to coding standard  
						
						 
						
						
						
						
					 
					
						2021-11-15 22:02:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Reinhold Gschweicher 
							
						 
					 
					
						
						
						
						
							
						
						
							241d36471d 
							
						 
					 
					
						
						
							
							Move up file header include to top  
						
						 
						
						
						
						
					 
					
						2021-11-15 22:02:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Reinhold Gschweicher 
							
						 
					 
					
						
						
						
						
							
						
						
							1b937a77b9 
							
						 
					 
					
						
						
							
							remove unused libs/ prefix from lvgl includes as not needed  
						
						 
						
						
						
						
					 
					
						2021-11-15 22:02:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Reinhold Gschweicher 
							
						 
					 
					
						
						
						
						
							
						
						
							f2918709d9 
							
						 
					 
					
						
						
							
							Add missing standard includes  
						
						 
						
						
						
						
					 
					
						2021-11-15 22:02:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Reinhold Gschweicher 
							
						 
					 
					
						
						
						
						
							
						
						
							ac7b2da611 
							
						 
					 
					
						
						
							
							Update includes to to be relative to src directory  
						
						 
						
						... 
						
						
						
						Don't use relative imports like `../foo.h` as those depend on the
relative position of both files. Rather than that use imports relative
to the `src` directory, which explicitly is part of the include
directories. 
						
						
					 
					
						2021-11-15 22:02:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Reinhold Gschweicher 
							
						 
					 
					
						
						
						
						
							
						
						
							c4f2fb2fa4 
							
						 
					 
					
						
						
							
							BatteryInfo: remove unused FreeRTOS.h and timer.h includes  
						
						 
						
						
						
						
					 
					
						2021-11-15 21:56:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							624429b54c 
							
						 
					 
					
						
						
							
							Merge pull request  #830  from InfiniTimeOrg/fix-unresponsive-touchpanel  
						
						 
						
						... 
						
						
						
						Fix unresponsive touch panel after update to 1.7 
						
						
					 
					
						2021-11-15 20:44:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mabuch 
							
						 
					 
					
						
						
						
						
							
						
						
							a631fa3518 
							
						 
					 
					
						
						
							
							fix Motion Service UUID in doc and code comments  
						
						 
						
						
						
						
					 
					
						2021-11-15 20:41:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kieran Cawthray 
							
						 
					 
					
						
						
						
						
							
						
						
							5a0cf8e348 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into pts-settings  
						
						 
						
						
						
						
					 
					
						2021-11-15 19:38:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kieranc 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2fa63c7f37 
							
						 
					 
					
						
						
							
							Merge pull request  #1  from Riksu9000/pts-settings-fix  
						
						 
						
						... 
						
						
						
						Close customizer menu with button in PTS 
						
						
					 
					
						2021-11-15 19:21:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							9671a8451f 
							
						 
					 
					
						
						
							
							Fix unresponsive touch panel after update to 1.7 : don't care if device ids are not the ones we expected (until we know more about these communication and IDs issues).  
						
						 
						
						
						
						
					 
					
						2021-11-14 20:32:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							71a64974c0 
							
						 
					 
					
						
						
							
							Remove some clang-tidy checks  
						
						 
						
						
						
						
					 
					
						2021-11-13 13:37:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							2e7b51c8e1 
							
						 
					 
					
						
						
							
							clang-format and clang-tidy PineTimeStyle  
						
						 
						
						
						
						
					 
					
						2021-11-13 13:11:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							39157f2f19 
							
						 
					 
					
						
						
							
							Close menu with button  
						
						 
						
						
						
						
					 
					
						2021-11-13 13:02:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							a57fda6ba4 
							
						 
					 
					
						
						
							
							Set version to 1.7.0  
						
						 
						
						
						
						
					 
					
						2021-11-11 09:54:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							72900ca8aa 
							
						 
					 
					
						
						
							
							Merge pull request  #816  from Riksu9000/fix_alarm_crash  
						
						 
						
						... 
						
						
						
						Fix Alarm app crashing on buttonpress 
						
						
					 
					
						2021-11-11 09:16:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Russell 
							
						 
					 
					
						
						
						
						
							
						
						
							947ece0bc9 
							
						 
					 
					
						
						
							
							Status bar displays time in 12 or 24 hour format based on settings  
						
						 
						
						
						
						
					 
					
						2021-11-10 20:11:09 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							bdf7e5293f 
							
						 
					 
					
						
						
							
							Fix animation when long pressing on screens adjacent to watch face  
						
						 
						
						
						
						
					 
					
						2021-11-10 13:45:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							1d6455c289 
							
						 
					 
					
						
						
							
							Fix Alarm app crashing on buttonpress  
						
						 
						
						
						
						
					 
					
						2021-11-09 11:38:19 +02:00