diff --git a/data/Heat_Capacity/actor_immersionHeater_1ee21744-0355-6023-94b4-d5c041dd32cd.json b/data/Heat_Capacity/actor_immersionHeater_1ee21744-0355-6023-94b4-d5c041dd32cd.json new file mode 100644 index 0000000000000000000000000000000000000000..1bddfee49fa805fe4aa02959f2c9b728e665bcde --- /dev/null +++ b/data/Heat_Capacity/actor_immersionHeater_1ee21744-0355-6023-94b4-d5c041dd32cd.json @@ -0,0 +1,25 @@ +{ + "JSON": { + "ID": "1ee21744-0355-6023-94b4-d5c041dd32cd", + "label": "", + "comment": "UUID6 is used" + }, + "actor": { + "type": "immersion heater", + "manufacturer": "Zhuodingsen", + "power_supply": { + "voltage": 12, + "type": "DC voltage", + "source": { + "type": "adjustable laboratory power supply", + "model": "DPPS-32-20", + "manufacturer": "VOLTCRAFT", + "power": "640 Watt", + "technology": "clocked power supply", + "voltage": "1...32 V", + "current": "0...20 A", + "residual ripple": "<5 mV" + } + } + } +} diff --git a/data/Heat_Capacity/calorimeter_1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753.json b/data/Heat_Capacity/calorimeter_1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753.json new file mode 100644 index 0000000000000000000000000000000000000000..64d7f03f47b5f985d8191014fa1cc712b4875ccc --- /dev/null +++ b/data/Heat_Capacity/calorimeter_1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753.json @@ -0,0 +1,30 @@ +{ + "JSON": { + "ID": "1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753", + "label": "", + "comment": "UUID6 is used" + }, + "calorimeter": { + "type": "heat flow calorimeter", + "manufacturer": "Fluidsystemtechnik", + "container": { + "type": "beaker", + "volume": { + "value": 600, + "unit": "milliliter" + } + }, + "medium": { + "type": "water", + "mass": { + "value": 400, + "unit": "gramm", + "accuracy": { + "value": 0, + "type": "absolute", + "unit": "gramm" + } + } + } + } +} diff --git a/data/Heat_Capacity/data.h5 b/data/Heat_Capacity/data.h5 new file mode 100644 index 0000000000000000000000000000000000000000..83dd96e90362691034d1e0a65a075e36bd753101 Binary files /dev/null and b/data/Heat_Capacity/data.h5 differ diff --git a/data/Heat_Capacity/group_1ee5ec0a-1830-63f5-ac3e-6f8ce4468546.json b/data/Heat_Capacity/group_1ee5ec0a-1830-63f5-ac3e-6f8ce4468546.json new file mode 100644 index 0000000000000000000000000000000000000000..8fc29ede0167dcc6502105bff4180c939be042ac --- /dev/null +++ b/data/Heat_Capacity/group_1ee5ec0a-1830-63f5-ac3e-6f8ce4468546.json @@ -0,0 +1,17 @@ +{ + "JSON": { + "ID": "1ee5ec0a-1830-63f5-ac3e-6f8ce4468546", + "label": "", + "comment": "UUID6 is used" + }, + "group": { + "number": "Laborversuch_Group37", + "author": [ + "Diogo Fernandes Costa", + "Zidane Bürmann", + "Santiago Ramirez Saldana" + ], + "experiment": "calorimetry", + "testrig_number": "1" + } +} diff --git a/data/Heat_Capacity/instrument_raspPi_1ee5ec0d-e77c-68b7-90f7-2e33485ff91c.json b/data/Heat_Capacity/instrument_raspPi_1ee5ec0d-e77c-68b7-90f7-2e33485ff91c.json new file mode 100644 index 0000000000000000000000000000000000000000..1ab46543b103012ff2421fe990004facd9783c8e --- /dev/null +++ b/data/Heat_Capacity/instrument_raspPi_1ee5ec0d-e77c-68b7-90f7-2e33485ff91c.json @@ -0,0 +1,16 @@ +{ + "JSON": { + "ID": "1ee5ec0d-e77c-68b7-90f7-2e33485ff91c", + "label": "", + "comment": "UUID6 is used" + }, + "instrument": { + "name": "raspberry_pi", + "type": "single_board_computer", + "manufacturer": "Raspberry Pi Foundation", + "model": "Raspberry Pi 4 Model B Rev. 1.5", + "serial": "10000000dbd18662", + "operating_system": "Raspberry Pi OS", + "comment": "to get model and serial number put this code in the terminal: cat /proc/cpuinfo" + } +} diff --git a/data/Heat_Capacity/sensor_tempCalorimeter1_1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde.json b/data/Heat_Capacity/sensor_tempCalorimeter1_1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde.json new file mode 100644 index 0000000000000000000000000000000000000000..9fcacf2b0c9d5cffb81aeb2bd5584a04ac279fd5 --- /dev/null +++ b/data/Heat_Capacity/sensor_tempCalorimeter1_1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c01f0956007", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/Heat_Capacity/sensor_tempCalorimeter2_1ee5ec03-7e64-6071-8ca3-98dbab0a7719.json b/data/Heat_Capacity/sensor_tempCalorimeter2_1ee5ec03-7e64-6071-8ca3-98dbab0a7719.json new file mode 100644 index 0000000000000000000000000000000000000000..3e200b065ef23da817170de8d51703768795665f --- /dev/null +++ b/data/Heat_Capacity/sensor_tempCalorimeter2_1ee5ec03-7e64-6071-8ca3-98dbab0a7719.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec03-7e64-6071-8ca3-98dbab0a7719", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3cf9e3818fb8", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/Heat_Capacity/sensor_tempCalorimeter3_1ee5ec04-30cd-678f-a64b-0ce7544ef5e8.json b/data/Heat_Capacity/sensor_tempCalorimeter3_1ee5ec04-30cd-678f-a64b-0ce7544ef5e8.json new file mode 100644 index 0000000000000000000000000000000000000000..9dc48a4cbaea55ac292c3fa9b540c3dd1185123c --- /dev/null +++ b/data/Heat_Capacity/sensor_tempCalorimeter3_1ee5ec04-30cd-678f-a64b-0ce7544ef5e8.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec04-30cd-678f-a64b-0ce7544ef5e8", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c01f095b066", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/Heat_Capacity/sensor_tempEnvironment_1ee5ec04-c845-69e2-853a-25c11543466f.json b/data/Heat_Capacity/sensor_tempEnvironment_1ee5ec04-c845-69e2-853a-25c11543466f.json new file mode 100644 index 0000000000000000000000000000000000000000..1d3fb06980b468dc31f1daecc44f2c736894ca00 --- /dev/null +++ b/data/Heat_Capacity/sensor_tempEnvironment_1ee5ec04-c845-69e2-853a-25c11543466f.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec04-c845-69e2-853a-25c11543466f", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c01f095d465", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/Heat_Capacity/setup_constant.json b/data/Heat_Capacity/setup_constant.json new file mode 100644 index 0000000000000000000000000000000000000000..1496fb866b7e944095233759a9e9d22541554a53 --- /dev/null +++ b/data/Heat_Capacity/setup_constant.json @@ -0,0 +1,50 @@ +{ + "JSON": { + "ID": "1ee5ec1a-e3f7-66be-b5a8-ad82b1e18627", + "label": "", + "comment": "UUID6 is used" + }, + "comment": "this setup is used to measure the calorimeter constant by bringing in a known amount of energy, while measuring the temperature", + "setup": { + "1ee5ec0a-1830-63f5-ac3e-6f8ce4468546": { + "type": "group_info", + "name": "group_info", + "comment": "" + }, + "1ee5ec0d-e77c-68b7-90f7-2e33485ff91c": { + "type": "instrument", + "name": "raspberry_pi", + "comment": "" + }, + "1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753": { + "type": "calorimeter", + "name": "calorimeter", + "comment": "" + }, + "1ee21744-0355-6023-94b4-d5c041dd32cd": { + "type": "actor", + "name": "immersion_heater", + "comment": "this heater is used to warm up the water in the calorimeter for measuring the calorimeter constant" + }, + "1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde": { + "type": "sensor", + "name": "temperature_calorimeter_1", + "comment": "" + }, + "1ee5ec03-7e64-6071-8ca3-98dbab0a7719": { + "type": "sensor", + "name": "temperature_calorimeter_2", + "comment": "" + }, + "1ee5ec04-30cd-678f-a64b-0ce7544ef5e8": { + "type": "sensor", + "name": "temperature_calorimeter_3", + "comment": "" + }, + "1ee5ec04-c845-69e2-853a-25c11543466f": { + "type": "sensor", + "name": "temperature_environment", + "comment": "" + } + } +} \ No newline at end of file diff --git a/data/PDC003/PDC003.h5 b/data/PDC003/PDC003.h5 new file mode 100644 index 0000000000000000000000000000000000000000..3ecf950e5800eefd60268e422230e0cdb00a0180 Binary files /dev/null and b/data/PDC003/PDC003.h5 differ diff --git a/data/PDC003/actor_sousvide_1ee21750-5282-63bc-86e9-b4de622ee43e.json b/data/PDC003/actor_sousvide_1ee21750-5282-63bc-86e9-b4de622ee43e.json new file mode 100644 index 0000000000000000000000000000000000000000..03d46343c68c072c18bbe0b3240047630c3cfcd9 --- /dev/null +++ b/data/PDC003/actor_sousvide_1ee21750-5282-63bc-86e9-b4de622ee43e.json @@ -0,0 +1,23 @@ +{ + "JSON": { + "ID": "1ee21750-5282-63bc-86e9-b4de622ee43e", + "label": "", + "comment": "UUID6 is used" + }, + "actor": { + "type": "Sous Vide cooker", + "model": "DE310B", + "manufacturer": "KitchenBoss", + "power_supply": { + "voltage": "230 V", + "type": "AC voltage", + "power": "1100 W" + }, + "temperature_range": { + "min": 40, + "max": 90, + "unit": "degree Celsius" + }, + "circulation": "available" + } +} \ No newline at end of file diff --git a/data/PDC003/calorimeter_1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753.json b/data/PDC003/calorimeter_1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753.json new file mode 100644 index 0000000000000000000000000000000000000000..64d7f03f47b5f985d8191014fa1cc712b4875ccc --- /dev/null +++ b/data/PDC003/calorimeter_1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753.json @@ -0,0 +1,30 @@ +{ + "JSON": { + "ID": "1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753", + "label": "", + "comment": "UUID6 is used" + }, + "calorimeter": { + "type": "heat flow calorimeter", + "manufacturer": "Fluidsystemtechnik", + "container": { + "type": "beaker", + "volume": { + "value": 600, + "unit": "milliliter" + } + }, + "medium": { + "type": "water", + "mass": { + "value": 400, + "unit": "gramm", + "accuracy": { + "value": 0, + "type": "absolute", + "unit": "gramm" + } + } + } + } +} diff --git a/data/PDC003/group_1ee5ec0a-1830-63f5-ac3e-6f8ce4468546.json b/data/PDC003/group_1ee5ec0a-1830-63f5-ac3e-6f8ce4468546.json new file mode 100644 index 0000000000000000000000000000000000000000..8fc29ede0167dcc6502105bff4180c939be042ac --- /dev/null +++ b/data/PDC003/group_1ee5ec0a-1830-63f5-ac3e-6f8ce4468546.json @@ -0,0 +1,17 @@ +{ + "JSON": { + "ID": "1ee5ec0a-1830-63f5-ac3e-6f8ce4468546", + "label": "", + "comment": "UUID6 is used" + }, + "group": { + "number": "Laborversuch_Group37", + "author": [ + "Diogo Fernandes Costa", + "Zidane Bürmann", + "Santiago Ramirez Saldana" + ], + "experiment": "calorimetry", + "testrig_number": "1" + } +} diff --git a/data/PDC003/instrument_raspPi_1ee5ec0d-e77c-68b7-90f7-2e33485ff91c.json b/data/PDC003/instrument_raspPi_1ee5ec0d-e77c-68b7-90f7-2e33485ff91c.json new file mode 100644 index 0000000000000000000000000000000000000000..1ab46543b103012ff2421fe990004facd9783c8e --- /dev/null +++ b/data/PDC003/instrument_raspPi_1ee5ec0d-e77c-68b7-90f7-2e33485ff91c.json @@ -0,0 +1,16 @@ +{ + "JSON": { + "ID": "1ee5ec0d-e77c-68b7-90f7-2e33485ff91c", + "label": "", + "comment": "UUID6 is used" + }, + "instrument": { + "name": "raspberry_pi", + "type": "single_board_computer", + "manufacturer": "Raspberry Pi Foundation", + "model": "Raspberry Pi 4 Model B Rev. 1.5", + "serial": "10000000dbd18662", + "operating_system": "Raspberry Pi OS", + "comment": "to get model and serial number put this code in the terminal: cat /proc/cpuinfo" + } +} diff --git a/data/PDC003/sensor_tempCalorimeter1_1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde.json b/data/PDC003/sensor_tempCalorimeter1_1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde.json new file mode 100644 index 0000000000000000000000000000000000000000..9fcacf2b0c9d5cffb81aeb2bd5584a04ac279fd5 --- /dev/null +++ b/data/PDC003/sensor_tempCalorimeter1_1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c01f0956007", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/PDC003/sensor_tempCalorimeter2_1ee5ec03-7e64-6071-8ca3-98dbab0a7719.json b/data/PDC003/sensor_tempCalorimeter2_1ee5ec03-7e64-6071-8ca3-98dbab0a7719.json new file mode 100644 index 0000000000000000000000000000000000000000..3e200b065ef23da817170de8d51703768795665f --- /dev/null +++ b/data/PDC003/sensor_tempCalorimeter2_1ee5ec03-7e64-6071-8ca3-98dbab0a7719.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec03-7e64-6071-8ca3-98dbab0a7719", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3cf9e3818fb8", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/PDC003/sensor_tempCalorimeter3_1ee5ec04-30cd-678f-a64b-0ce7544ef5e8.json b/data/PDC003/sensor_tempCalorimeter3_1ee5ec04-30cd-678f-a64b-0ce7544ef5e8.json new file mode 100644 index 0000000000000000000000000000000000000000..9dc48a4cbaea55ac292c3fa9b540c3dd1185123c --- /dev/null +++ b/data/PDC003/sensor_tempCalorimeter3_1ee5ec04-30cd-678f-a64b-0ce7544ef5e8.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec04-30cd-678f-a64b-0ce7544ef5e8", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c01f095b066", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/PDC003/sensor_tempEnvironment_1ee5ec04-c845-69e2-853a-25c11543466f.json b/data/PDC003/sensor_tempEnvironment_1ee5ec04-c845-69e2-853a-25c11543466f.json new file mode 100644 index 0000000000000000000000000000000000000000..1d3fb06980b468dc31f1daecc44f2c736894ca00 --- /dev/null +++ b/data/PDC003/sensor_tempEnvironment_1ee5ec04-c845-69e2-853a-25c11543466f.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec04-c845-69e2-853a-25c11543466f", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c01f095d465", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/PDC003/sensor_tempHeatingBath_1ee5ec05-4aea-68f6-ad82-53b16fffae49.json b/data/PDC003/sensor_tempHeatingBath_1ee5ec05-4aea-68f6-ad82-53b16fffae49.json new file mode 100644 index 0000000000000000000000000000000000000000..e30bb9f995bdcf547a7e3d020bdead8ad5d5a079 --- /dev/null +++ b/data/PDC003/sensor_tempHeatingBath_1ee5ec05-4aea-68f6-ad82-53b16fffae49.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec05-4aea-68f6-ad82-53b16fffae49", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c25f6490937", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/datasheets/setup_PDCX.json b/data/PDC003/setup_PDC003.json similarity index 95% rename from datasheets/setup_PDCX.json rename to data/PDC003/setup_PDC003.json index 3e5b1e00cbbaacc382d62402e6b6d9fea00b42c2..f06e5acdf523e7b89d913967ba2ae0073ab502c9 100644 --- a/datasheets/setup_PDCX.json +++ b/data/PDC003/setup_PDC003.json @@ -51,9 +51,9 @@ "name": "temperature_hot_water_bath", "comment": "" }, - "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx": { + "1ee87a91-8f66-67a2-9cf8-36ce3b859240": { "type": "probe", - "name": "probe_PDCXXX", + "name": "probe_PDC003", "comment": "" } } diff --git a/data/PDC012/PDC012.h5 b/data/PDC012/PDC012.h5 new file mode 100644 index 0000000000000000000000000000000000000000..bbca40c307556fa5667d37838b5e31963bd2e0f6 Binary files /dev/null and b/data/PDC012/PDC012.h5 differ diff --git a/data/PDC012/actor_sousvide_1ee21750-5282-63bc-86e9-b4de622ee43e.json b/data/PDC012/actor_sousvide_1ee21750-5282-63bc-86e9-b4de622ee43e.json new file mode 100644 index 0000000000000000000000000000000000000000..03d46343c68c072c18bbe0b3240047630c3cfcd9 --- /dev/null +++ b/data/PDC012/actor_sousvide_1ee21750-5282-63bc-86e9-b4de622ee43e.json @@ -0,0 +1,23 @@ +{ + "JSON": { + "ID": "1ee21750-5282-63bc-86e9-b4de622ee43e", + "label": "", + "comment": "UUID6 is used" + }, + "actor": { + "type": "Sous Vide cooker", + "model": "DE310B", + "manufacturer": "KitchenBoss", + "power_supply": { + "voltage": "230 V", + "type": "AC voltage", + "power": "1100 W" + }, + "temperature_range": { + "min": 40, + "max": 90, + "unit": "degree Celsius" + }, + "circulation": "available" + } +} \ No newline at end of file diff --git a/data/PDC012/calorimeter_1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753.json b/data/PDC012/calorimeter_1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753.json new file mode 100644 index 0000000000000000000000000000000000000000..64d7f03f47b5f985d8191014fa1cc712b4875ccc --- /dev/null +++ b/data/PDC012/calorimeter_1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753.json @@ -0,0 +1,30 @@ +{ + "JSON": { + "ID": "1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753", + "label": "", + "comment": "UUID6 is used" + }, + "calorimeter": { + "type": "heat flow calorimeter", + "manufacturer": "Fluidsystemtechnik", + "container": { + "type": "beaker", + "volume": { + "value": 600, + "unit": "milliliter" + } + }, + "medium": { + "type": "water", + "mass": { + "value": 400, + "unit": "gramm", + "accuracy": { + "value": 0, + "type": "absolute", + "unit": "gramm" + } + } + } + } +} diff --git a/data/PDC012/group_1ee5ec0a-1830-63f5-ac3e-6f8ce4468546.json b/data/PDC012/group_1ee5ec0a-1830-63f5-ac3e-6f8ce4468546.json new file mode 100644 index 0000000000000000000000000000000000000000..8fc29ede0167dcc6502105bff4180c939be042ac --- /dev/null +++ b/data/PDC012/group_1ee5ec0a-1830-63f5-ac3e-6f8ce4468546.json @@ -0,0 +1,17 @@ +{ + "JSON": { + "ID": "1ee5ec0a-1830-63f5-ac3e-6f8ce4468546", + "label": "", + "comment": "UUID6 is used" + }, + "group": { + "number": "Laborversuch_Group37", + "author": [ + "Diogo Fernandes Costa", + "Zidane Bürmann", + "Santiago Ramirez Saldana" + ], + "experiment": "calorimetry", + "testrig_number": "1" + } +} diff --git a/data/PDC012/instrument_raspPi_1ee5ec0d-e77c-68b7-90f7-2e33485ff91c.json b/data/PDC012/instrument_raspPi_1ee5ec0d-e77c-68b7-90f7-2e33485ff91c.json new file mode 100644 index 0000000000000000000000000000000000000000..1ab46543b103012ff2421fe990004facd9783c8e --- /dev/null +++ b/data/PDC012/instrument_raspPi_1ee5ec0d-e77c-68b7-90f7-2e33485ff91c.json @@ -0,0 +1,16 @@ +{ + "JSON": { + "ID": "1ee5ec0d-e77c-68b7-90f7-2e33485ff91c", + "label": "", + "comment": "UUID6 is used" + }, + "instrument": { + "name": "raspberry_pi", + "type": "single_board_computer", + "manufacturer": "Raspberry Pi Foundation", + "model": "Raspberry Pi 4 Model B Rev. 1.5", + "serial": "10000000dbd18662", + "operating_system": "Raspberry Pi OS", + "comment": "to get model and serial number put this code in the terminal: cat /proc/cpuinfo" + } +} diff --git a/data/PDC012/sensor_tempCalorimeter1_1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde.json b/data/PDC012/sensor_tempCalorimeter1_1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde.json new file mode 100644 index 0000000000000000000000000000000000000000..9fcacf2b0c9d5cffb81aeb2bd5584a04ac279fd5 --- /dev/null +++ b/data/PDC012/sensor_tempCalorimeter1_1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c01f0956007", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/PDC012/sensor_tempCalorimeter2_1ee5ec03-7e64-6071-8ca3-98dbab0a7719.json b/data/PDC012/sensor_tempCalorimeter2_1ee5ec03-7e64-6071-8ca3-98dbab0a7719.json new file mode 100644 index 0000000000000000000000000000000000000000..3e200b065ef23da817170de8d51703768795665f --- /dev/null +++ b/data/PDC012/sensor_tempCalorimeter2_1ee5ec03-7e64-6071-8ca3-98dbab0a7719.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec03-7e64-6071-8ca3-98dbab0a7719", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3cf9e3818fb8", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/PDC012/sensor_tempCalorimeter3_1ee5ec04-30cd-678f-a64b-0ce7544ef5e8.json b/data/PDC012/sensor_tempCalorimeter3_1ee5ec04-30cd-678f-a64b-0ce7544ef5e8.json new file mode 100644 index 0000000000000000000000000000000000000000..9dc48a4cbaea55ac292c3fa9b540c3dd1185123c --- /dev/null +++ b/data/PDC012/sensor_tempCalorimeter3_1ee5ec04-30cd-678f-a64b-0ce7544ef5e8.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec04-30cd-678f-a64b-0ce7544ef5e8", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c01f095b066", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/PDC012/sensor_tempEnvironment_1ee5ec04-c845-69e2-853a-25c11543466f.json b/data/PDC012/sensor_tempEnvironment_1ee5ec04-c845-69e2-853a-25c11543466f.json new file mode 100644 index 0000000000000000000000000000000000000000..1d3fb06980b468dc31f1daecc44f2c736894ca00 --- /dev/null +++ b/data/PDC012/sensor_tempEnvironment_1ee5ec04-c845-69e2-853a-25c11543466f.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec04-c845-69e2-853a-25c11543466f", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c01f095d465", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/PDC012/sensor_tempHeatingBath_1ee5ec05-4aea-68f6-ad82-53b16fffae49.json b/data/PDC012/sensor_tempHeatingBath_1ee5ec05-4aea-68f6-ad82-53b16fffae49.json new file mode 100644 index 0000000000000000000000000000000000000000..e30bb9f995bdcf547a7e3d020bdead8ad5d5a079 --- /dev/null +++ b/data/PDC012/sensor_tempHeatingBath_1ee5ec05-4aea-68f6-ad82-53b16fffae49.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec05-4aea-68f6-ad82-53b16fffae49", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c25f6490937", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/datasheets/setup_PDCXX.json b/data/PDC012/setup_PDC012.json similarity index 95% rename from datasheets/setup_PDCXX.json rename to data/PDC012/setup_PDC012.json index 3fecbb3f9cfb20154733309b9cf3dd6c2579c981..ed7ab41b44389385905ce771917f9f731902d888 100644 --- a/datasheets/setup_PDCXX.json +++ b/data/PDC012/setup_PDC012.json @@ -51,9 +51,9 @@ "name": "temperature_hot_water_bath", "comment": "" }, - "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx": { + "1ee87a9d-9978-6070-b6c2-f287dc7964ab": { "type": "probe", - "name": "probe_PDCXXX", + "name": "probe_PDC012", "comment": "" } } diff --git a/data/PDC028/PDC028.h5 b/data/PDC028/PDC028.h5 new file mode 100644 index 0000000000000000000000000000000000000000..750d1ddab0013d159d84ba22c93b4711c1bed3ad Binary files /dev/null and b/data/PDC028/PDC028.h5 differ diff --git a/data/PDC028/actor_sousvide_1ee21750-5282-63bc-86e9-b4de622ee43e.json b/data/PDC028/actor_sousvide_1ee21750-5282-63bc-86e9-b4de622ee43e.json new file mode 100644 index 0000000000000000000000000000000000000000..03d46343c68c072c18bbe0b3240047630c3cfcd9 --- /dev/null +++ b/data/PDC028/actor_sousvide_1ee21750-5282-63bc-86e9-b4de622ee43e.json @@ -0,0 +1,23 @@ +{ + "JSON": { + "ID": "1ee21750-5282-63bc-86e9-b4de622ee43e", + "label": "", + "comment": "UUID6 is used" + }, + "actor": { + "type": "Sous Vide cooker", + "model": "DE310B", + "manufacturer": "KitchenBoss", + "power_supply": { + "voltage": "230 V", + "type": "AC voltage", + "power": "1100 W" + }, + "temperature_range": { + "min": 40, + "max": 90, + "unit": "degree Celsius" + }, + "circulation": "available" + } +} \ No newline at end of file diff --git a/data/PDC028/calorimeter_1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753.json b/data/PDC028/calorimeter_1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753.json new file mode 100644 index 0000000000000000000000000000000000000000..64d7f03f47b5f985d8191014fa1cc712b4875ccc --- /dev/null +++ b/data/PDC028/calorimeter_1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753.json @@ -0,0 +1,30 @@ +{ + "JSON": { + "ID": "1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753", + "label": "", + "comment": "UUID6 is used" + }, + "calorimeter": { + "type": "heat flow calorimeter", + "manufacturer": "Fluidsystemtechnik", + "container": { + "type": "beaker", + "volume": { + "value": 600, + "unit": "milliliter" + } + }, + "medium": { + "type": "water", + "mass": { + "value": 400, + "unit": "gramm", + "accuracy": { + "value": 0, + "type": "absolute", + "unit": "gramm" + } + } + } + } +} diff --git a/data/PDC028/group_1ee5ec0a-1830-63f5-ac3e-6f8ce4468546.json b/data/PDC028/group_1ee5ec0a-1830-63f5-ac3e-6f8ce4468546.json new file mode 100644 index 0000000000000000000000000000000000000000..8fc29ede0167dcc6502105bff4180c939be042ac --- /dev/null +++ b/data/PDC028/group_1ee5ec0a-1830-63f5-ac3e-6f8ce4468546.json @@ -0,0 +1,17 @@ +{ + "JSON": { + "ID": "1ee5ec0a-1830-63f5-ac3e-6f8ce4468546", + "label": "", + "comment": "UUID6 is used" + }, + "group": { + "number": "Laborversuch_Group37", + "author": [ + "Diogo Fernandes Costa", + "Zidane Bürmann", + "Santiago Ramirez Saldana" + ], + "experiment": "calorimetry", + "testrig_number": "1" + } +} diff --git a/data/PDC028/instrument_raspPi_1ee5ec0d-e77c-68b7-90f7-2e33485ff91c.json b/data/PDC028/instrument_raspPi_1ee5ec0d-e77c-68b7-90f7-2e33485ff91c.json new file mode 100644 index 0000000000000000000000000000000000000000..1ab46543b103012ff2421fe990004facd9783c8e --- /dev/null +++ b/data/PDC028/instrument_raspPi_1ee5ec0d-e77c-68b7-90f7-2e33485ff91c.json @@ -0,0 +1,16 @@ +{ + "JSON": { + "ID": "1ee5ec0d-e77c-68b7-90f7-2e33485ff91c", + "label": "", + "comment": "UUID6 is used" + }, + "instrument": { + "name": "raspberry_pi", + "type": "single_board_computer", + "manufacturer": "Raspberry Pi Foundation", + "model": "Raspberry Pi 4 Model B Rev. 1.5", + "serial": "10000000dbd18662", + "operating_system": "Raspberry Pi OS", + "comment": "to get model and serial number put this code in the terminal: cat /proc/cpuinfo" + } +} diff --git a/data/PDC028/sensor_tempCalorimeter1_1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde.json b/data/PDC028/sensor_tempCalorimeter1_1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde.json new file mode 100644 index 0000000000000000000000000000000000000000..9fcacf2b0c9d5cffb81aeb2bd5584a04ac279fd5 --- /dev/null +++ b/data/PDC028/sensor_tempCalorimeter1_1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c01f0956007", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/PDC028/sensor_tempCalorimeter2_1ee5ec03-7e64-6071-8ca3-98dbab0a7719.json b/data/PDC028/sensor_tempCalorimeter2_1ee5ec03-7e64-6071-8ca3-98dbab0a7719.json new file mode 100644 index 0000000000000000000000000000000000000000..3e200b065ef23da817170de8d51703768795665f --- /dev/null +++ b/data/PDC028/sensor_tempCalorimeter2_1ee5ec03-7e64-6071-8ca3-98dbab0a7719.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec03-7e64-6071-8ca3-98dbab0a7719", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3cf9e3818fb8", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/PDC028/sensor_tempCalorimeter3_1ee5ec04-30cd-678f-a64b-0ce7544ef5e8.json b/data/PDC028/sensor_tempCalorimeter3_1ee5ec04-30cd-678f-a64b-0ce7544ef5e8.json new file mode 100644 index 0000000000000000000000000000000000000000..9dc48a4cbaea55ac292c3fa9b540c3dd1185123c --- /dev/null +++ b/data/PDC028/sensor_tempCalorimeter3_1ee5ec04-30cd-678f-a64b-0ce7544ef5e8.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec04-30cd-678f-a64b-0ce7544ef5e8", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c01f095b066", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/PDC028/sensor_tempEnvironment_1ee5ec04-c845-69e2-853a-25c11543466f.json b/data/PDC028/sensor_tempEnvironment_1ee5ec04-c845-69e2-853a-25c11543466f.json new file mode 100644 index 0000000000000000000000000000000000000000..1d3fb06980b468dc31f1daecc44f2c736894ca00 --- /dev/null +++ b/data/PDC028/sensor_tempEnvironment_1ee5ec04-c845-69e2-853a-25c11543466f.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec04-c845-69e2-853a-25c11543466f", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c01f095d465", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/data/PDC028/sensor_tempHeatingBath_1ee5ec05-4aea-68f6-ad82-53b16fffae49.json b/data/PDC028/sensor_tempHeatingBath_1ee5ec05-4aea-68f6-ad82-53b16fffae49.json new file mode 100644 index 0000000000000000000000000000000000000000..e30bb9f995bdcf547a7e3d020bdead8ad5d5a079 --- /dev/null +++ b/data/PDC028/sensor_tempHeatingBath_1ee5ec05-4aea-68f6-ad82-53b16fffae49.json @@ -0,0 +1,24 @@ +{ + "JSON": { + "ID": "1ee5ec05-4aea-68f6-ad82-53b16fffae49", + "label": "", + "comment": "UUID6 is used" + }, + "sensor": { + "name": "Temperature_Sensor", + "type": "DS18B20", + "manufacturer": "keyestudio", + "serial": "3c25f6490937", + "comment": "", + "range": { + "min": -55, + "max": 125, + "units": "degree_celsius" + }, + "accuracy": { + "value": 0.5, + "type": "absolute", + "unit": "degree_celsius" + } + } +} diff --git a/datasheets/setup_PDCXXX.json b/data/PDC028/setup_PDC028.json similarity index 95% rename from datasheets/setup_PDCXXX.json rename to data/PDC028/setup_PDC028.json index 70c637a66bcd9e9611bd1145d00273800d961f53..81d51eb0278ad4a56e8a1f8f27bca8b616e49e10 100644 --- a/datasheets/setup_PDCXXX.json +++ b/data/PDC028/setup_PDC028.json @@ -51,9 +51,9 @@ "name": "temperature_hot_water_bath", "comment": "" }, - "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx": { + "1ee87a9e-b060-62d2-8fe3-41db0cd25253": { "type": "probe", - "name": "probe_PDCXXX", + "name": "probe_PDC028", "comment": "" } } diff --git a/datasheets/actor_immersionHeater.json b/datasheets/actor_immersionHeater.json index 65b414adc5addf0bf882a9d887434413cb4fa221..1bddfee49fa805fe4aa02959f2c9b728e665bcde 100644 --- a/datasheets/actor_immersionHeater.json +++ b/datasheets/actor_immersionHeater.json @@ -12,8 +12,8 @@ "type": "DC voltage", "source": { "type": "adjustable laboratory power supply", - "model": "xxxxxxxxxxxx", - "manufacturer": "xxxxxxxxxxxx", + "model": "DPPS-32-20", + "manufacturer": "VOLTCRAFT", "power": "640 Watt", "technology": "clocked power supply", "voltage": "1...32 V", diff --git a/datasheets/calorimeter.json b/datasheets/calorimeter.json index 1919a3f6e318a0000afb3785f5140eaac96dcb24..64d7f03f47b5f985d8191014fa1cc712b4875ccc 100644 --- a/datasheets/calorimeter.json +++ b/datasheets/calorimeter.json @@ -17,7 +17,7 @@ "medium": { "type": "water", "mass": { - "value": 0, + "value": 400, "unit": "gramm", "accuracy": { "value": 0, diff --git a/datasheets/group.json b/datasheets/group.json index b404906015f7a357573affb974d7a6a1c89fb856..8fc29ede0167dcc6502105bff4180c939be042ac 100644 --- a/datasheets/group.json +++ b/datasheets/group.json @@ -5,13 +5,13 @@ "comment": "UUID6 is used" }, "group": { - "number": "xxxxxxxxxxxx_GroupXY", + "number": "Laborversuch_Group37", "author": [ - "xxxxxxxxxxxx_member01", - "xxxxxxxxxxxx_member02", - "xxxxxxxxxxxx_member03" + "Diogo Fernandes Costa", + "Zidane Bürmann", + "Santiago Ramirez Saldana" ], "experiment": "calorimetry", - "testrig_number": "xxxxxxxxxxxx" + "testrig_number": "1" } } diff --git a/datasheets/instrument_raspPi.json b/datasheets/instrument_raspPi.json index 00aa4f0a53b8460153c441a210a3215b059539ab..1ab46543b103012ff2421fe990004facd9783c8e 100644 --- a/datasheets/instrument_raspPi.json +++ b/datasheets/instrument_raspPi.json @@ -9,7 +9,7 @@ "type": "single_board_computer", "manufacturer": "Raspberry Pi Foundation", "model": "Raspberry Pi 4 Model B Rev. 1.5", - "serial": "xxxxxxxxxxxx", + "serial": "10000000dbd18662", "operating_system": "Raspberry Pi OS", "comment": "to get model and serial number put this code in the terminal: cat /proc/cpuinfo" } diff --git a/datasheets/probe_PDC003.json b/datasheets/probe_PDC003.json new file mode 100644 index 0000000000000000000000000000000000000000..7a0cf930d2133d170efb5866b0a3f97928bbc905 --- /dev/null +++ b/datasheets/probe_PDC003.json @@ -0,0 +1,33 @@ +{ + "JSON": { + "ID": "1ee57b2e-d878-640b-b947-b68f86e0e1c9", + "label": "PDC003", + "comment": "UUID6 is used" + }, + "probe": { + "material": "Edelstahl", + "mass": { + "value": 610, + "unit": "gramm", + "uncertainty": { + "value": 1, + "type": "absolut", + "unit": "gramm" + } + }, + "dimensions": { + "height": { + "value": 40, + "unit": "millimeter" + }, + "diameter": { + "value": 60, + "unit": "millimeter" + }, + "volume": { + "value": 80570, + "unit": "cubic millimeter" + } + } + } +} \ No newline at end of file diff --git a/datasheets/probe_PDC012.json b/datasheets/probe_PDC012.json new file mode 100644 index 0000000000000000000000000000000000000000..febbd7dd306282918705bb40a189c093a8e9fc65 --- /dev/null +++ b/datasheets/probe_PDC012.json @@ -0,0 +1,33 @@ +{ + "JSON": { + "ID": "1ee57b38-1b08-63da-8b38-63a271236a0b", + "label": "PDC012", + "comment": "UUID6 is used" + }, + "probe": { + "material": "Messing", + "mass": { + "value": 667, + "unit": "gramm", + "uncertainty": { + "value": 1, + "type": "absolut", + "unit": "gramm" + } + }, + "dimensions": { + "height": { + "value": 40, + "unit": "millimeter" + }, + "diameter": { + "value": 60, + "unit": "millimeter" + }, + "volume": { + "value": 80570, + "unit": "cubic millimeter" + } + } + } +} \ No newline at end of file diff --git a/datasheets/probe_PDC028.json b/datasheets/probe_PDC028.json new file mode 100644 index 0000000000000000000000000000000000000000..e9f28aeebbf3c70085ccaa58700cdbfc27d96a70 --- /dev/null +++ b/datasheets/probe_PDC028.json @@ -0,0 +1,33 @@ +{ + "JSON": { + "ID": "1ee7d44b-07b6-6af8-adbe-d5e4818c9942", + "label": "PDC028", + "comment": "UUID6 is used" + }, + "probe": { + "material": "PA_6_6", + "mass": { + "value": 92, + "unit": "gramm", + "uncertainty": { + "value": 1, + "type": "absolut", + "unit": "gramm" + } + }, + "dimensions": { + "height": { + "value": 40, + "unit": "millimeter" + }, + "diameter": { + "value": 60, + "unit": "millimeter" + }, + "volume": { + "value": 80570, + "unit": "cubic millimeter" + } + } + } +} \ No newline at end of file diff --git a/datasheets/sensor_tempCalorimeter1.json b/datasheets/sensor_tempCalorimeter1.json index a9b1636e25674b2ff0d258dfa6b60fd28af780ec..9fcacf2b0c9d5cffb81aeb2bd5584a04ac279fd5 100644 --- a/datasheets/sensor_tempCalorimeter1.json +++ b/datasheets/sensor_tempCalorimeter1.json @@ -8,7 +8,7 @@ "name": "Temperature_Sensor", "type": "DS18B20", "manufacturer": "keyestudio", - "serial": "xxxxxxxxxxxx", + "serial": "3c01f0956007", "comment": "", "range": { "min": -55, diff --git a/datasheets/sensor_tempCalorimeter2.json b/datasheets/sensor_tempCalorimeter2.json index a9f9a9dc9a46f56b0c73b9478011ab70561f2e98..3e200b065ef23da817170de8d51703768795665f 100644 --- a/datasheets/sensor_tempCalorimeter2.json +++ b/datasheets/sensor_tempCalorimeter2.json @@ -8,7 +8,7 @@ "name": "Temperature_Sensor", "type": "DS18B20", "manufacturer": "keyestudio", - "serial": "xxxxxxxxxxxx", + "serial": "3cf9e3818fb8", "comment": "", "range": { "min": -55, diff --git a/datasheets/sensor_tempCalorimeter3.json b/datasheets/sensor_tempCalorimeter3.json index b7983610bf08e2919b625c7bba6f90f8c24df7a4..9dc48a4cbaea55ac292c3fa9b540c3dd1185123c 100644 --- a/datasheets/sensor_tempCalorimeter3.json +++ b/datasheets/sensor_tempCalorimeter3.json @@ -8,7 +8,7 @@ "name": "Temperature_Sensor", "type": "DS18B20", "manufacturer": "keyestudio", - "serial": "xxxxxxxxxxxx", + "serial": "3c01f095b066", "comment": "", "range": { "min": -55, diff --git a/datasheets/sensor_tempEnvironment.json b/datasheets/sensor_tempEnvironment.json index 65a78c1ae162881556a3f0bd757637a5451984ce..1d3fb06980b468dc31f1daecc44f2c736894ca00 100644 --- a/datasheets/sensor_tempEnvironment.json +++ b/datasheets/sensor_tempEnvironment.json @@ -8,7 +8,7 @@ "name": "Temperature_Sensor", "type": "DS18B20", "manufacturer": "keyestudio", - "serial": "xxxxxxxxxxxx", + "serial": "3c01f095d465", "comment": "", "range": { "min": -55, diff --git a/datasheets/sensor_tempHeatingBath.json b/datasheets/sensor_tempHeatingBath.json index 02c3611891c54471c0d3ad03333a4c5b4f1b3146..e30bb9f995bdcf547a7e3d020bdead8ad5d5a079 100644 --- a/datasheets/sensor_tempHeatingBath.json +++ b/datasheets/sensor_tempHeatingBath.json @@ -8,7 +8,7 @@ "name": "Temperature_Sensor", "type": "DS18B20", "manufacturer": "keyestudio", - "serial": "xxxxxxxxxxxx", + "serial": "3c25f6490937", "comment": "", "range": { "min": -55, diff --git a/datasheets/setup_PDC003.json b/datasheets/setup_PDC003.json new file mode 100644 index 0000000000000000000000000000000000000000..f06e5acdf523e7b89d913967ba2ae0073ab502c9 --- /dev/null +++ b/datasheets/setup_PDC003.json @@ -0,0 +1,60 @@ +{ + "JSON": { + "ID": "1ee5ec2a-3557-61fd-88c5-45f35110e2ad", + "label": "", + "comment": "UUID6 is used" + }, + "comment": "this setup is used to measure the specific heat capacity of a probe", + "setup": { + "1ee5ec0a-1830-63f5-ac3e-6f8ce4468546": { + "type": "group_info", + "name": "group_info", + "comment": "" + }, + "1ee5ec0d-e77c-68b7-90f7-2e33485ff91c": { + "type": "instrument", + "name": "raspberry_pi", + "comment": "" + }, + "1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753": { + "type": "calorimeter", + "name": "calorimeter", + "comment": "" + }, + "1ee21750-5282-63bc-86e9-b4de622ee43e": { + "type": "actor", + "name": "sous_vide heater", + "comment": "this heater is used to heat the water in the hot water bath for the samples" + }, + "1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde": { + "type": "sensor", + "name": "temperature_calorimeter_1", + "comment": "" + }, + "1ee5ec03-7e64-6071-8ca3-98dbab0a7719": { + "type": "sensor", + "name": "temperature_calorimeter_2", + "comment": "" + }, + "1ee5ec04-30cd-678f-a64b-0ce7544ef5e8": { + "type": "sensor", + "name": "temperature_calorimeter_3", + "comment": "" + }, + "1ee5ec04-c845-69e2-853a-25c11543466f": { + "type": "sensor", + "name": "temperature_environment", + "comment": "" + }, + "1ee5ec05-4aea-68f6-ad82-53b16fffae49": { + "type": "sensor", + "name": "temperature_hot_water_bath", + "comment": "" + }, + "1ee87a91-8f66-67a2-9cf8-36ce3b859240": { + "type": "probe", + "name": "probe_PDC003", + "comment": "" + } + } +} \ No newline at end of file diff --git a/datasheets/setup_PDC012.json b/datasheets/setup_PDC012.json new file mode 100644 index 0000000000000000000000000000000000000000..ed7ab41b44389385905ce771917f9f731902d888 --- /dev/null +++ b/datasheets/setup_PDC012.json @@ -0,0 +1,60 @@ +{ + "JSON": { + "ID": "1ee5ec2a-9a12-6199-af26-20cb6ca9e9ca", + "label": "", + "comment": "UUID6 is used" + }, + "comment": "this setup is used to measure the specific heat capacity of a probe", + "setup": { + "1ee5ec0a-1830-63f5-ac3e-6f8ce4468546": { + "type": "group_info", + "name": "group_info", + "comment": "" + }, + "1ee5ec0d-e77c-68b7-90f7-2e33485ff91c": { + "type": "instrument", + "name": "raspberry_pi", + "comment": "" + }, + "1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753": { + "type": "calorimeter", + "name": "calorimeter", + "comment": "" + }, + "1ee21750-5282-63bc-86e9-b4de622ee43e": { + "type": "actor", + "name": "sous_vide heater", + "comment": "this heater is used to heat the water in the hot water bath for the samples" + }, + "1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde": { + "type": "sensor", + "name": "temperature_calorimeter_1", + "comment": "" + }, + "1ee5ec03-7e64-6071-8ca3-98dbab0a7719": { + "type": "sensor", + "name": "temperature_calorimeter_2", + "comment": "" + }, + "1ee5ec04-30cd-678f-a64b-0ce7544ef5e8": { + "type": "sensor", + "name": "temperature_calorimeter_3", + "comment": "" + }, + "1ee5ec04-c845-69e2-853a-25c11543466f": { + "type": "sensor", + "name": "temperature_environment", + "comment": "" + }, + "1ee5ec05-4aea-68f6-ad82-53b16fffae49": { + "type": "sensor", + "name": "temperature_hot_water_bath", + "comment": "" + }, + "1ee87a9d-9978-6070-b6c2-f287dc7964ab": { + "type": "probe", + "name": "probe_PDC012", + "comment": "" + } + } +} \ No newline at end of file diff --git a/datasheets/setup_PDC028.json b/datasheets/setup_PDC028.json new file mode 100644 index 0000000000000000000000000000000000000000..81d51eb0278ad4a56e8a1f8f27bca8b616e49e10 --- /dev/null +++ b/datasheets/setup_PDC028.json @@ -0,0 +1,60 @@ +{ + "JSON": { + "ID": "1ee5ec28-ea53-67a4-ac3a-a2b7aab8e64a", + "label": "", + "comment": "UUID6 is used" + }, + "comment": "this setup is used to measure the specific heat capacity of a probe", + "setup": { + "1ee5ec0a-1830-63f5-ac3e-6f8ce4468546": { + "type": "group_info", + "name": "group_info", + "comment": "" + }, + "1ee5ec0d-e77c-68b7-90f7-2e33485ff91c": { + "type": "instrument", + "name": "raspberry_pi", + "comment": "" + }, + "1ee5ec0c-0b57-68cd-9d39-c9b7e9b18753": { + "type": "calorimeter", + "name": "calorimeter", + "comment": "" + }, + "1ee21750-5282-63bc-86e9-b4de622ee43e": { + "type": "actor", + "name": "sous_vide heater", + "comment": "this heater is used to heat the water in the hot water bath for the samples" + }, + "1ee5ec00-4a00-68a1-bb1e-873c2dd4dbde": { + "type": "sensor", + "name": "temperature_calorimeter_1", + "comment": "" + }, + "1ee5ec03-7e64-6071-8ca3-98dbab0a7719": { + "type": "sensor", + "name": "temperature_calorimeter_2", + "comment": "" + }, + "1ee5ec04-30cd-678f-a64b-0ce7544ef5e8": { + "type": "sensor", + "name": "temperature_calorimeter_3", + "comment": "" + }, + "1ee5ec04-c845-69e2-853a-25c11543466f": { + "type": "sensor", + "name": "temperature_environment", + "comment": "" + }, + "1ee5ec05-4aea-68f6-ad82-53b16fffae49": { + "type": "sensor", + "name": "temperature_hot_water_bath", + "comment": "" + }, + "1ee87a9e-b060-62d2-8fe3-41db0cd25253": { + "type": "probe", + "name": "probe_PDC028", + "comment": "" + } + } +} \ No newline at end of file diff --git a/functions/m_labor.py b/functions/m_labor.py index 50f3f0bd25a7e21515af6d04570786f3ce953f3e..95959307db2ff883dc6604142770a23f160f296f 100644 --- a/functions/m_labor.py +++ b/functions/m_labor.py @@ -50,7 +50,7 @@ def logging_heater(path: str, uuid: str) -> dict[str, dict[str, float]]: # as this comment. # raise NotImplementedError( # "Delete these 3 lines if you have finished the code or want to test it.".upper() - ) + # DONE # @@ -115,7 +115,7 @@ def logging_heater(path: str, uuid: str) -> dict[str, dict[str, float]]: # as this comment. # raise NotImplementedError( # "Delete these 3 lines if you have finished the code or want to test it.".upper() - ) + # DONE # diff --git a/functions/m_pck.py b/functions/m_pck.py index 140e67271023b54b25ad12025986af90ecb2bc48..0e249faa380c42b744c3df3a055bf9504e0909f0 100644 --- a/functions/m_pck.py +++ b/functions/m_pck.py @@ -178,7 +178,7 @@ def logging_calorimetry( #Erstellen einer Gruppe, die beide Sensoren beinhaltet sensors = grp_raw.create_group('Sensors') - sensor_number = [1,2] + sensor_number = [1,2,3,4] for j in sensor_number: #Erhalt der jeweiligen UUIDs der beiden Sensoren sensor_uuid = metadata['sensor']['values'][j-1] @@ -199,10 +199,3 @@ def logging_calorimetry( -if __name__ == "__main__": - # Test and debug. - - data = get_meas_data_calorimetry({'group_info': {'values': ['1ee80acb-d532-61a7-b550-d931a74b773b']}, 'instrument': {'values': ['1ee80acc-346f-6430-9c68-69c8e8396c06']}, 'probe': {'values': ['1ee80acd-0e3f-6071-aefe-e13195f4cb72']}, 'sensor': {'values': ['1ee7d8b5-12ad-6faa-a891-1cee8d14824f', '1ee7d8bb-aacf-6654-84cf-8593bfc4d1ea'], 'serial': ['3ce104578aa8', '3ce1e3805090']}}) - dictn = m_json.get_metadata_from_setup('/home/pi/calorimetry_home/datasheets/setup_newton.json') - upt_dictn = m_json.add_temperature_sensor_serials('/home/pi/calorimetry_home/datasheets', dictn) - logging_calorimetry(data,dictn,'/home/pi/calorimetry_home/archiv','/home/pi/calorimetry_home/datasheets') \ No newline at end of file diff --git a/main.py b/main.py index 5cacbbe5afd345b30da22e2d0e5a199400810aa9..0de46268f86acd9dacd0710570f800a24dc35a35 100644 --- a/main.py +++ b/main.py @@ -22,7 +22,7 @@ from functions import m_labor # Define the path to the datasheets folder. path_json = "./datasheets" # Define the path to the test rig setup file. -path_setup = "" +path_setup = "/home/pi/calorimetry_laboratory/datasheets/setup_constant.json" # path_setup = "" # Ask for the type of experiment to be performed until the user gives a valid answer. @@ -84,7 +84,7 @@ m_json.archiv_json(path_json, path_setup, path_logging) if is_log_heater: # Read heater's uuid from metadata. heater_uuid = metadata["actor"]["values"][ - metadata["actor"]["names"].index("immersion_heater") + metadata["actor"]["name"].index("immersion_heater") ] # Save heater-related data to an HDF5 file. data = m_labor.logging_heater(