Merge branch 'main' of...

Merge branch 'main' of git.rwth-aachen.de:fst-tuda/projects/lehre/praktikum_digitalisierung/calorimetry/calorimetry_laboratory

datasheets/actor_immersionHeater.json

@@ -12,8 +12,8 @@
 			"type": "DC voltage",
 			"source": {
 				"type": "adjustable laboratory power supply",
-				"model": "DPPS-32-20",
-				"manufacturer": "Voltcraft",
+				"model": "xxxxxxxxxxxx",
+				"manufacturer": "xxxxxxxxxxxx",
 				"power": "640 Watt",
 				"technology": "clocked power supply",
 				"voltage": "1...32 V",
@@ -22,4 +22,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}

datasheets/calorimeter.json

@@ -17,14 +17,14 @@
 		"medium": {
 			"type": "water",
 			"mass": {
-				"value": XXXXX,
+				"value": 0,
 				"unit": "gramm",
 				"accuracy": {
-					"value": XXXXX,
+					"value": 0,
 					"type": "absolute",
 					"unit": "gramm"
 				}
 			}
 		}
 	}
-}
\ No newline at end of file
+}

datasheets/group.json

@@ -5,13 +5,13 @@
 		"comment": "UUID6 is used"
 	},
 	"group": {
-		"number": "Group_XX",
+		"number": "xxxxxxxxxxxx_GroupXY",
 		"member": [
-			"member01",
-			"member02",
-			"member03"
+			"xxxxxxxxxxxx_member01",
+			"xxxxxxxxxxxx_member02",
+			"xxxxxxxxxxxx_member03"
 		],
 		"experiment": "calorimetry",
-		"testrig_number": "TR_X"
+		"testrig_number": "xxxxxxxxxxxx"
 	}
-}
\ No newline at end of file
+}

datasheets/instrument_raspPi.json

@@ -9,8 +9,8 @@
 		"type": "single_board_computer",
 		"manufacturer": "Raspberry Pi Foundation",
 		"model": "Raspberry Pi 4 Model B Rev. 1.5",
-		"serial": "10000000483672da",
+		"serial": "xxxxxxxxxxxx",
 		"operating_system": "Raspberry Pi OS",
 		"comment": "to get model and serial number put this code in the terminal: cat /proc/cpuinfo"
 	}
-}
\ No newline at end of file
+}

datasheets/sensor_tempCalorimeter1.json

@@ -13,7 +13,7 @@
 		"range": {
 			"min": -55,
 			"max": 125,
-			"units": "xxx"
+			"units": "degree_celsius"
 		},
 		"accuracy": {
 			"value": 0.5,
@@ -21,4 +21,4 @@
 			"unit": "degree_celsius"
 		}
 	}
-}
\ No newline at end of file
+}

datasheets/sensor_tempCalorimeter2.json

@@ -13,7 +13,7 @@
 		"range": {
 			"min": -55,
 			"max": 125,
-			"units": "xxx"
+			"units": "degree_celsius"
 		},
 		"accuracy": {
 			"value": 0.5,
@@ -21,4 +21,4 @@
 			"unit": "degree_celsius"
 		}
 	}
-}
\ No newline at end of file
+}

datasheets/sensor_tempCalorimeter3.json

@@ -13,7 +13,7 @@
 		"range": {
 			"min": -55,
 			"max": 125,
-			"units": "xxx"
+			"units": "degree_celsius"
 		},
 		"accuracy": {
 			"value": 0.5,
@@ -21,4 +21,4 @@
 			"unit": "degree_celsius"
 		}
 	}
-}
\ No newline at end of file
+}

datasheets/sensor_tempEnvironment.json

@@ -13,7 +13,7 @@
 		"range": {
 			"min": -55,
 			"max": 125,
-			"units": "xxx"
+			"units": "degree_celsius"
 		},
 		"accuracy": {
 			"value": 0.5,
@@ -21,4 +21,4 @@
 			"unit": "degree_celsius"
 		}
 	}
-}
\ No newline at end of file
+}

datasheets/sensor_tempHeatingBath.json

@@ -13,7 +13,7 @@
 		"range": {
 			"min": -55,
 			"max": 125,
-			"units": "xxx"
+			"units": "degree_celsius"
 		},
 		"accuracy": {
 			"value": 0.5,
@@ -21,4 +21,4 @@
 			"unit": "degree_celsius"
 		}
 	}
-}
\ No newline at end of file
+}