From c4c18c4dae811bcd030ec22d5afe5ca4222fed1b Mon Sep 17 00:00:00 2001 From: Jonah Aden <151240959+adenjonah@users.noreply.github.com> Date: Wed, 22 May 2024 07:28:54 -0500 Subject: [PATCH] changes --- server/initdb.py | 4 ++- server/json_databases/DCUUIA.json | 2 +- server/json_databases/saved_rocks.json | 40 ++++++++------------------ 3 files changed, 16 insertions(+), 30 deletions(-) diff --git a/server/initdb.py b/server/initdb.py index a47e05d..2d73bac 100644 --- a/server/initdb.py +++ b/server/initdb.py @@ -37,7 +37,9 @@ DEFAULT_DATA_FILE_CONTENT = { "timestamp": "", "eva": {}, - "telemetry": {} + "telemetry": {}, + "warnings": {}, + "spec": {} } DEFAULT_INGRESS_EGRESS_PROCEDURES_DATA = { diff --git a/server/json_databases/DCUUIA.json b/server/json_databases/DCUUIA.json index 0cd08cb..5e352c9 100644 --- a/server/json_databases/DCUUIA.json +++ b/server/json_databases/DCUUIA.json @@ -1 +1 @@ -{"timestamp": "2024-05-22T03:13:22.774582", "dcu": {"eva1": {"batt": false, "oxy": false, "comm": false, "fan": false, "pump": false, "co2": false}, "eva2": {"batt": false, "oxy": false, "comm": false, "fan": false, "pump": false, "co2": false}}, "uia": {"eva1_power": false, "eva1_oxy": false, "eva1_water_supply": false, "eva1_water_waste": true, "eva2_power": false, "eva2_oxy": false, "eva2_water_supply": true, "eva2_water_waste": false, "oxy_vent": false, "depress": true}} \ No newline at end of file +{"timestamp": "2024-05-22T07:28:53.869186", "dcu": {"eva1": {"batt": false, "oxy": false, "comm": false, "fan": false, "pump": false, "co2": false}, "eva2": {"batt": false, "oxy": false, "comm": false, "fan": false, "pump": false, "co2": false}}, "uia": {"eva1_power": false, "eva1_oxy": false, "eva1_water_supply": false, "eva1_water_waste": false, "eva2_power": false, "eva2_oxy": false, "eva2_water_supply": false, "eva2_water_waste": false, "oxy_vent": false, "depress": false}} \ No newline at end of file diff --git a/server/json_databases/saved_rocks.json b/server/json_databases/saved_rocks.json index 76226bd..dbd8b48 100644 --- a/server/json_databases/saved_rocks.json +++ b/server/json_databases/saved_rocks.json @@ -1,35 +1,19 @@ { "saved rocks": [ { - "name": "default_rock", - "id": 0, + "name": "ilmenite_basalt", + "id": 7, "data": { - "SiO2": 1, - "TiO2": 1, - "Al2O3": 1, - "FeO": 1, - "MnO": 1, - "MgO": 1, - "CaO": 1, - "K2O": 1, - "P2O3": 1, - "other": 91 - } - }, - { - "name": "olivine_basalt_2", - "id": 6, - "data": { - "SiO2": 40.36, - "TiO2": 0.99, - "Al2O3": 2.32, - "FeO": 25.71, - "MnO": 0.58, - "MgO": 12.81, - "CaO": 5.95, - "K2O": 0.2, - "P2O3": 0.28, - "other": 10.8 + "SiO2": 43.98, + "TiO2": 1.04, + "Al2O3": 5.75, + "FeO": 20.4, + "MnO": 0.51, + "MgO": 6.02, + "CaO": 8.89, + "K2O": 0.71, + "P2O3": 1.09, + "other": 11.61 } } ]