Georg 
							
						 
					 
					
						
						
							
						
						531b4c847f 
					 
					
						
						
							
							Added Support for Dataextration via Serial  
						
						
						
						
					 
					
						2018-03-26 10:52:25 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0ff99e00f3 
					 
					
						
						
							
							implemented delete  
						
						... 
						
						
						
						implemented namechange
fixed bug in saving credits
added reset all counts!
added less outputmode to print Person JSON 
						
						
					 
					
						2016-07-29 21:32:49 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1bb6704d6e 
					 
					
						
						
							
							Fixed Wrong files getting detected as persons  
						
						... 
						
						
						
						Added HardwareSerial* as parameter to print person
Fixed bug in check for file
Added RFID and Finger revoke mechanisms
Added user scan
Added set user credits
Enabled creditsystem 
						
						
					 
					
						2016-07-08 12:51:21 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						df94ff0654 
					 
					
						
						
							
							moved maxID to beerbox struct and update in readPerson  
						
						... 
						
						
						
						moved drinksMax to beerbox struct and refactored to maxDrink
added if(debug) to all serial write and serial print statements
Moved BLE com to seperat file and added command and subcommandparsing
Added filename JSON method 
						
						
					 
					
						2016-07-07 09:52:14 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bed4087886 
					 
					
						
						
							
							added debug enable for serial output  
						
						
						
						
					 
					
						2016-07-04 15:37:55 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						aefe7ce93c 
					 
					
						
						
							
							dotclean  
						
						
						
						
					 
					
						2015-11-19 22:35:19 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d8141ca455 
					 
					
						
						
							
							Added readme  
						
						
						
						
					 
					
						2015-11-19 20:42:18 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b492867bd2 
					 
					
						
						
							
							Added missing files  
						
						
						
						
					 
					
						2015-11-19 20:38:42 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4c18ae050f 
					 
					
						
						
							
							Enroll working, fixed array sizeof with workaround  
						
						
						
						
					 
					
						2015-09-25 13:19:26 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9ac2327812 
					 
					
						
						
							
							Started adding Enroll funktions and ble parsing  
						
						
						
						
					 
					
						2015-09-24 23:23:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7e482344d2 
					 
					
						
						
							
							Finally fixed the mem issuecd beerbox/! Basic Reading,writing and counting now working  
						
						
						
						
					 
					
						2015-09-24 20:01:51 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e96cf8e996 
					 
					
						
						
							
							Added print to rfid and finger; fixed getIndex methods; added drink counts to read; added global person array  
						
						
						
						
					 
					
						2015-09-22 22:51:27 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4b854998c8 
					 
					
						
						
							
							Changed Line Structure for config and person files, added credits_left to person, fixed read_person  
						
						
						
						
					 
					
						2015-09-22 21:32:18 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ac39f31527 
					 
					
						
						
							
							changed file extension  
						
						
						
						
					 
					
						2015-09-19 11:47:46 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a149928996 
					 
					
						
						
							
							Lots of changes, bug in read_person...  
						
						
						
						
					 
					
						2015-09-19 11:46:46 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						835c455762 
					 
					
						
						
							
							Added basic Button and Display IO  
						
						
						
						
					 
					
						2015-09-18 19:32:11 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						dbf9fc1d4f 
					 
					
						
						
							
							Added RFID and Finger checking  
						
						
						
						
					 
					
						2015-07-16 15:39:44 +02:00 
						 
				 
			
				
					
						
							
							
								Lukas 
							
						 
					 
					
						
						
							
						
						2ed3fe415d 
					 
					
						
						
							
							added finger  
						
						
						
						
					 
					
						2015-07-13 19:38:17 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander Junk 
							
						 
					 
					
						
						
							
						
						398e5784e8 
					 
					
						
						
							
							Merge branch 'master' of ssh://84.200.240.140/home/git/beerBoxGit  
						
						... 
						
						
						
						merged 
						
						
					 
					
						2015-07-13 19:32:53 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander Junk 
							
						 
					 
					
						
						
							
						
						13bbc2d1b1 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2015-07-13 19:32:39 +02:00 
						 
				 
			
				
					
						
							
							
								Lukas 
							
						 
					 
					
						
						
							
						
						d6e332a656 
					 
					
						
						
							
							bla LB  
						
						
						
						
					 
					
						2015-07-13 19:31:57 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander Junk 
							
						 
					 
					
						
						
							
						
						e82e5729aa 
					 
					
						
						
							
							Save  
						
						
						
						
					 
					
						2015-07-13 19:09:27 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander Junk 
							
						 
					 
					
						
						
							
						
						173e464808 
					 
					
						
						
							
							Merged berbox.cpp with main sketch  
						
						
						
						
					 
					
						2015-07-13 18:23:51 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander Junk 
							
						 
					 
					
						
						
							
						
						3a1796123a 
					 
					
						
						
							
							Second commit  
						
						
						
						
					 
					
						2015-07-13 16:59:02 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander Junk 
							
						 
					 
					
						
						
							
						
						995fd9b815 
					 
					
						
						
							
							First commit  
						
						
						
						
					 
					
						2015-07-13 16:49:36 +02:00