json updates from sw

oresat · Oct 1, 2023 · 31f2177 · 31f2177
1 parent 727ec80
commit 31f2177
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 25 deletions.
diff --git a/oresat_od_db/base/jsons/c3.json b/oresat_od_db/base/jsons/c3.json
@@ -117,8 +117,26 @@
     {
       "name": "opd_current",
       "data_type": "uint8",
-      "description": "opd current draw in 0.02mA",
+      "description": "opd current draw in mA",
       "access_type": "ro"
+    },
+    {
+      "name": "tx_enable",
+      "data_type": "bool",
+      "description": "tx status",
+      "access_type": "ro"
+    },
+    {
+      "name": "beacon_delay",
+      "data_type": "uint32",
+      "description": "delay between beacons in seconds",
+      "access_type": "const"
+    },
+    {
+      "name": "beacon_send",
+      "data_type": "bool",
+      "description": "send a beacon",
+      "access_type": "wo"
     }
   ],
   "tpdos": {

diff --git a/oresat_od_db/base/jsons/cfc.json b/oresat_od_db/base/jsons/cfc.json
@@ -1,20 +1,20 @@
 {
   "objects": [
     {
-      "name": "sw_version",
-      "data_type": "str",
-      "description": "software version",
-      "access_type": "const"
+      "name": "camera_num_of_capture",
+      "data_type": "uint8",
+      "description": "number of images to capture, 0 for endless",
+      "default": 1
     },
     {
-      "name": "num_of_images",
-      "data_type": "uint8",
-      "description": "number of images to capture, 0 for endless"
+      "name": "camera_delay",
+      "data_type": "uint32",
+      "description": "delay between captures in milliseconds"
     },
     {
-      "name": "camera_delay_ms",
+      "name": "camera_integration",
       "data_type": "uint32",
-      "description": "delay between captures in ms"
+      "description": "camera integration time in milliseconds"
     },
     {
       "name": "camera_status",
@@ -33,6 +33,19 @@
       "description": "the last capture convert to nice display image",
       "access_type": "ro"
     },
+    {
+      "name": "camera_last_capture_time",
+      "data_type": "uint64",
+      "description": "the last capture timestamp",
+      "access_type": "ro"
+    },
+    {
+      "name": "camera_save_captures",
+      "data_type": "bool",
+      "description": "flag to save captured images",
+      "access_type": "rw",
+      "default": true
+    },
     {
       "name": "camera_temperature",
       "data_type": "int8",
@@ -44,17 +57,17 @@
       "data_type": "bool",
       "description": "the tec controller status"
     },
-    {
-      "name": "tec_target_temperature",
-      "data_type": "int8",
-      "description": "the tec target temperature in celsius"
-    },
     {
       "name": "tec_saturated",
       "data_type": "bool",
       "description": "the tec is saturated",
       "access_type": "ro"
     },
+    {
+      "name": "tec_pid_setpoint",
+      "data_type": "int8",
+      "description": "the tec target temperature in celsius"
+    },
     {
       "name": "tec_pid_p",
       "data_type": "float32",

diff --git a/oresat_od_db/base/jsons/fw_common.json b/oresat_od_db/base/jsons/fw_common.json
@@ -23,13 +23,22 @@
       "name": "db_version",
       "data_type": "str",
       "description": "oresat od db version",
-      "access_type": "const"
+      "access_type": "const",
+      "default": "0.0.0"
     },
     {
       "name": "fw_version",
       "data_type": "str",
       "description": "app fw version",
-      "access_type": "const"
+      "access_type": "const",
+      "default": "0.0"
+    },
+    {
+      "name": "hw_version",
+      "data_type": "str",
+      "description": "card hw version",
+      "access_type": "const",
+      "default": "0.0"
     },
     {
       "name": "mcu_temperature",

diff --git a/oresat_od_db/base/jsons/gps.json b/oresat_od_db/base/jsons/gps.json
@@ -19,7 +19,7 @@
       "access_type": "ro"
     },
     {
-      "name": "num_of_sv",
+      "name": "number_of_sv",
       "data_type": "uint8",
       "description": "number of gps satellites locked onto. max 12",
       "access_type": "ro"
@@ -160,7 +160,7 @@
     "7": {
       "fields": [
         "status",
-        "num_of_sv",
+        "number_of_sv",
         "time_syncd"
       ]
     },

diff --git a/oresat_od_db/base/jsons/sw_common.json b/oresat_od_db/base/jsons/sw_common.json
@@ -23,19 +23,29 @@
       "name": "db_version",
       "data_type": "str",
       "description": "oresat od db version",
-      "access_type": "const"
+      "access_type": "const",
+      "default": "0.0.0"
     },
     {
       "name": "olaf_version",
       "data_type": "str",
       "description": "olaf lib version",
-      "access_type": "const"
+      "access_type": "const",
+      "default": "0.0.0"
     },
     {
       "name": "sw_version",
       "data_type": "str",
       "description": "app sw version",
-      "access_type": "const"
+      "access_type": "const",
+      "default": "0.0.0"
+    },
+    {
+      "name": "hw_version",
+      "data_type": "str",
+      "description": "card hw version",
+      "access_type": "const",
+      "default": "0.0"
     },
     {
       "name": "flight_mode",
@@ -103,7 +113,7 @@
       "data_type": "str",
       "description": "all file names of files in fwrite cache as a JSON",
       "access_type": "ro",
-      "default": "{}"
+      "default": "[]"
     },
     {
       "name": "fwrite_cache_file_name",

diff --git a/oresat_od_db/oresat0/jsons/beacon.json b/oresat_od_db/oresat0/jsons/beacon.json
@@ -96,7 +96,7 @@
     ["gps", "updater_status"],
     ["gps", "update_cache_len"],
     ["gps", "status"],
-    ["gps", "num_of_sv"],
+    ["gps", "number_of_sv"],
     ["gps", "ecef_x"],
     ["gps", "ecef_y"],
     ["gps", "ecef_z"],

diff --git a/oresat_od_db/oresat0_5/jsons/beacon.json b/oresat_od_db/oresat0_5/jsons/beacon.json
@@ -104,7 +104,7 @@
     ["star_tracker_1", "time_since_midnight"],
     ["gps", "storage_percent"],
     ["gps", "status"],
-    ["gps", "num_of_sv"],
+    ["gps", "number_of_sv"],
     ["gps", "ecef_x"],
     ["gps", "ecef_y"],
     ["gps", "ecef_z"],