JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9e9010c725 
							
						 
					 
					
						
						
							
							Merge pull request  #876  from yehoshuapw/hrs-driver-changes  
						
						 
						
						... 
						
						
						
						Hrs driver changes 
						
						
					 
					
						2022-01-26 21:39:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							458f5b8eb8 
							
						 
					 
					
						
						
							
							Merge pull request  #903  from Riksu9000/improved_notif_timeout  
						
						 
						
						... 
						
						
						
						Improved notification timeout 
						
						
					 
					
						2022-01-26 21:38:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bbb823b170 
							
						 
					 
					
						
						
							
							Merge pull request  #939  from NeroBurner/buttonHandler_relative_include  
						
						 
						
						... 
						
						
						
						ButtonHandler: includes relative to src dir 
						
						
					 
					
						2022-01-26 21:35:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a1880ca3b8 
							
						 
					 
					
						
						
							
							Merge pull request  #940  from NeroBurner/systemTask_queue_include  
						
						 
						
						... 
						
						
						
						SystemTask: add missing queue.h include for QueueHandle_t 
						
						
					 
					
						2022-01-26 21:34:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a354650a9c 
							
						 
					 
					
						
						
							
							Merge pull request  #944  from NeroBurner/no_generated_files_in_source_dir  
						
						 
						
						... 
						
						
						
						Create Version.h in binary dir instead of src dir 
						
						
					 
					
						2022-01-26 21:33:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							6bf6bb7e2a 
							
						 
					 
					
						
						
							
							PTS and digital watchface code cleanups  
						
						 
						
						
						
						
					 
					
						2022-01-20 16:04:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Reinhold Gschweicher 
							
						 
					 
					
						
						
						
						
							
						
						
							688dc2fed7 
							
						 
					 
					
						
						
							
							Create Version.h in binary dir instead of src dir  
						
						 
						
						... 
						
						
						
						Don't use source directory for generated files. Use the binary (build)
directory instead. 
						
						
					 
					
						2022-01-17 21:26:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Reinhold Gschweicher 
							
						 
					 
					
						
						
						
						
							
						
						
							bbc5af078d 
							
						 
					 
					
						
						
							
							SystemTask: add missing queue.h include for QueueHandle_t  
						
						 
						
						
						
						
					 
					
						2022-01-16 22:47:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Reinhold Gschweicher 
							
						 
					 
					
						
						
						
						
							
						
						
							48e9458301 
							
						 
					 
					
						
						
							
							ButtonHandler: includes relative to src dir  
						
						 
						
						
						
						
					 
					
						2022-01-16 20:59:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							97cbe34963 
							
						 
					 
					
						
						
							
							Update shakewake menu option  
						
						 
						
						
						
						
					 
					
						2022-01-06 15:44:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e8fc46ba20 
							
						 
					 
					
						
						
							
							Merge pull request  #912  from SteveAmor/chimesradio  
						
						 
						
						... 
						
						
						
						Updates radio button style for Chimes Option 
						
						
					 
					
						2022-01-05 10:42:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SteveAmor 
							
						 
					 
					
						
						
						
						
							
						
						
							b1b9937ff7 
							
						 
					 
					
						
						
							
							Updates radio button style  
						
						 
						
						
						
						
					 
					
						2022-01-04 21:28:37 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-François Milants 
							
						 
					 
					
						
						
						
						
							
						
						
							bef3e708f6 
							
						 
					 
					
						
						
							
							Merge branch 'ShakeWake' of  https://github.com/geekbozu/InfiniTime  into geekbozu-ShakeWake  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/screens/settings/Settings.cpp 
						
						
					 
					
						2022-01-04 21:48:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SteveAmor 
							
						 
					 
					
						
						
						
						
							
						
						
							15c3807a76 
							
						 
					 
					
						
						
							
							Adds enum class for chimes option  
						
						 
						
						
						
						
					 
					
						2022-01-04 19:32:29 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							e82469bffa 
							
						 
					 
					
						
						
							
							Fix setting removing it self from wake settings when opening calibration window twice.  
						
						 
						
						
						
						
					 
					
						2022-01-04 02:06:16 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							f86c71b2bb 
							
						 
					 
					
						
						
							
							Made calibration window enable Accel wakeups for setting and calibration even when wake mode is inactive.  
						
						 
						
						
						
						
					 
					
						2022-01-04 02:02:01 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							92b1e83e3e 
							
						 
					 
					
						
						
							
							Remove "fancy" settings display and always show ShakeWakeThresholdSetting  
						
						 
						
						
						
						
					 
					
						2022-01-04 02:01:31 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							98ac447bdb 
							
						 
					 
					
						
						
							
							Fixed button color changing  
						
						 
						
						
						
						
					 
					
						2022-01-04 02:00:03 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							b9c40100f6 
							
						 
					 
					
						
						
							
							Added visual aide for shake strength  
						
						 
						
						... 
						
						
						
						Added delay to starting calibration 
						
						
					 
					
						2022-01-04 02:00:03 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							8f38bd911b 
							
						 
					 
					
						
						
							
							Raise calibration timeout to 7.5 seconds  
						
						 
						
						... 
						
						
						
						Added button toggle state for cleaner user interaction 
						
						
					 
					
						2022-01-04 02:00:03 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							5c13200238 
							
						 
					 
					
						
						
							
							Fix crash upon leaving app.  
						
						 
						
						... 
						
						
						
						Code formatting 
						
						
					 
					
						2022-01-04 02:00:03 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							d6b22645e3 
							
						 
					 
					
						
						
							
							Make arc moveable, and clear previous setting on calibrate  
						
						 
						
						
						
						
					 
					
						2022-01-04 02:00:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							f780ac999a 
							
						 
					 
					
						
						
							
							Actually save the threshold  
						
						 
						
						... 
						
						
						
						Prevent a few crashes due to an LV task being active when it shouldnt be. 
						
						
					 
					
						2022-01-04 02:00:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							d2510d7926 
							
						 
					 
					
						
						
							
							Better Sensitivity UI, Calibration button added  
						
						 
						
						
						
						
					 
					
						2022-01-04 02:00:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							6d74820698 
							
						 
					 
					
						
						
							
							Add averaging to wake threshold. Makes it take more then just a "flick" to turn on  
						
						 
						
						
						
						
					 
					
						2022-01-04 01:59:01 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							3ebf002f9d 
							
						 
					 
					
						
						
							
							Add start of settings app for senstivity.  
						
						 
						
						... 
						
						
						
						really just debugging. I want to make it more configurable then high med low.
Position of setting needs a new location...dynamicly adding it currently at the end. Which honestly im fine with. 
						
						
					 
					
						2022-01-04 01:59:01 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							ad42cdf120 
							
						 
					 
					
						
						
							
							Cleanup  
						
						 
						
						
						
						
					 
					
						2022-01-04 01:57:18 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Keller 
							
						 
					 
					
						
						
						
						
							
						
						
							d270275bd2 
							
						 
					 
					
						
						
							
							Added Shake to wake  
						
						 
						
						
						
						
					 
					
						2022-01-04 01:57:18 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SteveAmor 
							
						 
					 
					
						
						
						
						
							
						
						
							7a0f72ed8b 
							
						 
					 
					
						
						
							
							resolve conflicts  
						
						 
						
						
						
						
					 
					
						2022-01-02 22:33:23 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SteveAmor 
							
						 
					 
					
						
						
						
						
							
						
						
							cc259b6a4a 
							
						 
					 
					
						
						
							
							resolves conflicts  
						
						 
						
						
						
						
					 
					
						2022-01-02 22:27:43 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SteveAmor 
							
						 
					 
					
						
						
						
						
							
						
						
							94561b2331 
							
						 
					 
					
						
						
							
							resolves conflicts  
						
						 
						
						
						
						
					 
					
						2022-01-02 21:49:18 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							5e6868d9eb 
							
						 
					 
					
						
						
							
							Improved notification timeout  
						
						 
						
						
						
						
					 
					
						2022-01-01 16:22:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Stephanie 
							
						 
					 
					
						
						
						
						
							
						
						
							e0013e7304 
							
						 
					 
					
						
						
							
							Ran clang-format  
						
						 
						
						
						
						
					 
					
						2021-12-30 21:51:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Stephanie 
							
						 
					 
					
						
						
						
						
							
						
						
							a65f173e3c 
							
						 
					 
					
						
						
							
							Renamed confusing variables and general cleanup  
						
						 
						
						
						
						
					 
					
						2021-12-30 21:51:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Stephanie 
							
						 
					 
					
						
						
						
						
							
						
						
							7eff1dbcc6 
							
						 
					 
					
						
						
							
							Changed text to left pad  
						
						 
						
						
						
						
					 
					
						2021-12-30 21:51:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Stephanie 
							
						 
					 
					
						
						
						
						
							
						
						
							f7d1b3f368 
							
						 
					 
					
						
						
							
							Moved trip meter update to MotionController and changed trip meter logic  
						
						 
						
						
						
						
					 
					
						2021-12-30 21:51:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Stephanie 
							
						 
					 
					
						
						
						
						
							
						
						
							fb87fdb2d9 
							
						 
					 
					
						
						
							
							Changed lap counter to trip meter  
						
						 
						
						
						
						
					 
					
						2021-12-30 21:51:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Stephanie 
							
						 
					 
					
						
						
						
						
							
						
						
							d034bd131e 
							
						 
					 
					
						
						
							
							Added "lap" button to step counter  
						
						 
						
						
						
						
					 
					
						2021-12-30 21:51:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							54f588ce63 
							
						 
					 
					
						
						
							
							Add missing break  
						
						 
						
						
						
						
					 
					
						2021-12-30 21:41:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Isokoski 
							
						 
					 
					
						
						
						
						
							
						
						
							86d180a855 
							
						 
					 
					
						
						
							
							Improve gesture consistency across the firmware  
						
						 
						
						
						
						
					 
					
						2021-12-30 21:41:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							395590d2d8 
							
						 
					 
					
						
						
							
							Merge pull request  #718  from kieranc/pts-settings  
						
						 
						
						... 
						
						
						
						Integrate color picker into PineTimeStyle watchface 
						
						
					 
					
						2021-12-30 21:36:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Reinhold Gschweicher 
							
						 
					 
					
						
						
						
						
							
						
						
							5b7915b5c9 
							
						 
					 
					
						
						
							
							InfiniPaint: add missing include algorithm for std::fill  
						
						 
						
						
						
						
					 
					
						2021-12-30 20:58:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hubmartin 
							
						 
					 
					
						
						
						
						
							
						
						
							204fc56672 
							
						 
					 
					
						
						
							
							Use Bluetooth brand color for BLE logo #0082FC  
						
						 
						
						
						
						
					 
					
						2021-12-30 20:50:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hubmartin 
							
						 
					 
					
						
						
						
						
							
						
						
							f52d6bfa67 
							
						 
					 
					
						
						
							
							Real white now  
						
						 
						
						
						
						
					 
					
						2021-12-30 20:50:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hubmartin 
							
						 
					 
					
						
						
						
						
							
						
						
							86ee7a70b7 
							
						 
					 
					
						
						
							
							WatchFaceDigital - BLE symbol changed to white color  
						
						 
						
						
						
						
					 
					
						2021-12-30 20:50:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James A. Jerkins 
							
						 
					 
					
						
						
						
						
							
						
						
							eca0588c23 
							
						 
					 
					
						
						
							
							Optional secure pairing with a passkey  
						
						 
						
						... 
						
						
						
						Support passkey pairing when requested by the central
Fix a comment and reorder warning 
						
						
					 
					
						2021-12-21 16:02:01 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yehoshua Pesach Wallach 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							464b689a03 
							
						 
					 
					
						
						
							
							changed ReadHrs and ReadAls to uint32, and did static_cast instead of hidden cast when using it  
						
						 
						
						
						
						
					 
					
						2021-12-13 12:47:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yehoshua Pesach Wallach 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4cc95091ab 
							
						 
					 
					
						
						
							
							order ReadHrs, ReadAls bitwise according to bit ordering  
						
						 
						
						
						
						
					 
					
						2021-12-13 12:39:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JF 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6a5946c4e3 
							
						 
					 
					
						
						
							
							Merge pull request  #874  from evergreen22/alarm-break  
						
						 
						
						... 
						
						
						
						FIX: AlarmTriggered fall through to ShowPairingKey 
						
						
					 
					
						2021-12-12 17:40:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James A. Jerkins 
							
						 
					 
					
						
						
						
						
							
						
						
							645a071b70 
							
						 
					 
					
						
						
							
							FIX: AlarmTriggered fall through to ShowPairingKey  
						
						 
						
						
						
						
					 
					
						2021-12-11 21:34:51 -06:00