Rémi Heredero 
							
						 
					 
					
						
						
							
						
						de288176d3 
					 
					
						
						
							
							Merge branch 'main' into improvement  
						
						
						
						
					 
					
						2023-06-09 12:34:37 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5878750109 
					 
					
						
						
							
							fix everything for merge Field  
						
						
						
						
					 
					
						2023-06-07 13:42:14 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d88329a50b 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/field' into improvement  
						
						... 
						
						
						
						# Conflicts:
#	src/main/java/ch/hevs/isi/core/DataPoint.java 
						
						
					 
					
						2023-06-07 07:49:24 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						76686c61ee 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/field' into improvement  
						
						... 
						
						
						
						# Conflicts:
#	src/main/java/ch/hevs/isi/field/FieldConnector.java 
						
						
					 
					
						2023-06-07 07:46:58 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Ritler 
							
						 
					 
					
						
						
							
						
						c478c0a7bf 
					 
					
						
						
							
							changed the field component, made some test and added some comments  
						
						
						
						
					 
					
						2023-06-06 17:50:17 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e973693faa 
					 
					
						
						
							
							optimize imports  
						
						
						
						
					 
					
						2023-06-06 13:55:53 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6f51ae0341 
					 
					
						
						
							
							fix some warnings  
						
						
						
						
					 
					
						2023-06-06 13:54:53 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fa54c5fbb3 
					 
					
						
						
							
							add web on main  
						
						
						
						
					 
					
						2023-06-06 13:51:28 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						be9c484001 
					 
					
						
						
							
							add comment on Core  
						
						
						
						
					 
					
						2023-06-06 13:38:49 +02:00 
						 
				 
			
				
					
						
							
							
								Rémi Heredero 
							
						 
					 
					
						
						
							
						
						11b2d220c6 
					 
					
						
						
							
							Merge branch 'smart' into main  
						
						
						
						
					 
					
						2023-06-02 16:54:53 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Ritler 
							
						 
					 
					
						
						
							
						
						2c4867204d 
					 
					
						
						
							
							started smartcontrol  
						
						
						
						
					 
					
						2023-06-02 16:04:44 +02:00 
						 
				 
			
				
					
						
							
							
								Rémi Heredero 
							
						 
					 
					
						
						
							
						
						1c05accfb8 
					 
					
						
						
							
							Field & Web componnent ( #13 )  
						
						... 
						
						
						
						* add LICENSE (AGPL 3.0)
* add Web part
* Field (#12 )
* ModbusAccessor finished and checked
* read and write Field done. pushToField to do
* field not finished, connection works
* read csv file and add some comments
---------
Co-authored-by: Nils Ritler <79571155+Slisls@users.noreply.github.com > 
						
						
					 
					
						2023-06-02 14:26:46 +02:00 
						 
				 
			
				
					
						
							
							
								Rémi Heredero 
							
						 
					 
					
						
						
							
						
						2dc1bf5dd5 
					 
					
						
						
							
							Merge branch 'main' into features  
						
						
						
						
					 
					
						2023-06-02 14:25:57 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Ritler 
							
						 
					 
					
						
						
							
						
						8446f991d3 
					 
					
						
						
							
							Field ( #12 )  
						
						... 
						
						
						
						* ModbusAccessor finished and checked
* read and write Field done. pushToField to do
* field not finished, connection works
* read csv file and add some comments 
						
						
					 
					
						2023-06-02 14:24:31 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Ritler 
							
						 
					 
					
						
						
							
						
						55fa80c4d4 
					 
					
						
						
							
							read csv file and add some comments  
						
						
						
						
					 
					
						2023-05-30 11:31:01 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Ritler 
							
						 
					 
					
						
						
							
						
						0d105fb64e 
					 
					
						
						
							
							field not finished, connection works  
						
						
						
						
					 
					
						2023-05-26 16:11:02 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						34da3f5409 
					 
					
						
						
							
							add Web part  
						
						
						
						
					 
					
						2023-05-26 16:02:00 +02:00 
						 
				 
			
				
					
						
							
							
								Rémi Heredero 
							
						 
					 
					
						
						
							
						
						d58097d723 
					 
					
						
						
							
							Subscription ( #7 )  
						
						... 
						
						
						
						* Change update DataPoints by a subscription way
* Remove unused import
* small polish 
						
						
					 
					
						2023-05-26 12:46:35 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Ritler 
							
						 
					 
					
						
						
							
						
						c3f15804b6 
					 
					
						
						
							
							read and write Field done. pushToField to do  
						
						
						
						
					 
					
						2023-05-23 16:02:16 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Ritler 
							
						 
					 
					
						
						
							
						
						88efeaf31a 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/features' into field  
						
						
						
						
					 
					
						2023-05-23 13:56:31 +02:00 
						 
				 
			
				
					
						
							
							
								Rémi Heredero 
							
						 
					 
					
						
						
							
						
						78fa8895f4 
					 
					
						
						
							
							add Database part  
						
						
						
						
					 
					
						2023-05-23 13:55:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a577e8a4ef 
					 
					
						
						
							
							add DEBUG_MODE  
						
						
						
						
					 
					
						2023-05-17 20:53:14 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						76279a5d0d 
					 
					
						
						
							
							fix true/false  
						
						
						
						
					 
					
						2023-05-17 20:52:53 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e306d5eacb 
					 
					
						
						
							
							implement full DatabaseConnector and do some tests  
						
						
						
						
					 
					
						2023-05-17 20:52:03 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Ritler 
							
						 
					 
					
						
						
							
						
						86aeae8b6f 
					 
					
						
						
							
							ModbusAccessor finished and checked  
						
						
						
						
					 
					
						2023-05-17 16:08:18 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Ritler 
							
						 
					 
					
						
						
							
						
						596740a474 
					 
					
						
						
							
							ModbusAccessor finished and checked  
						
						
						
						
					 
					
						2023-05-17 15:50:46 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ee64e95be3 
					 
					
						
						
							
							fix way to get DataPoint  
						
						
						
						
					 
					
						2023-05-17 14:13:55 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7e9ae2e1f1 
					 
					
						
						
							
							create DatabaseConnector and test it  
						
						
						
						
					 
					
						2023-05-17 14:13:27 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cdc5dddb80 
					 
					
						
						
							
							initial commit DataBase branche  
						
						
						
						
					 
					
						2023-05-15 09:43:50 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Ritler 
							
						 
					 
					
						
						
							
						
						43e45f8d66 
					 
					
						
						
							
							singleton pattern, readfloat and readboolean are done  
						
						
						
						
					 
					
						2023-05-12 16:09:45 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						184303ffdb 
					 
					
						
						
							
							some tests  
						
						
						
						
					 
					
						2023-05-05 16:26:16 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3b1d829bbf 
					 
					
						
						
							
							fix dataPointMap  
						
						
						
						
					 
					
						2023-05-05 16:25:15 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fe52981ba6 
					 
					
						
						
							
							Create singleton and connect with datapoint  
						
						... 
						
						
						
						TODO some test 
						
						
					 
					
						2023-05-05 15:54:03 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e0d0894040 
					 
					
						
						
							
							add DataPoint  
						
						
						
						
					 
					
						2023-05-05 13:51:58 +02:00 
						 
				 
			
				
					
						
							
							
								github-classroom[bot] 
							
						 
					 
					
						
						
							
						
						2c702c5b12 
					 
					
						
						
							
							Initial commit  
						
						
						
						
					 
					
						2023-05-02 11:57:51 +00:00