update oresat0.5 beacon

oresat · Jan 8, 2024 · 2146bfe · 2146bfe
1 parent cb68c1d
commit 2146bfe
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/oresat_configs/base/c3.yaml b/oresat_configs/base/c3.yaml
@@ -187,6 +187,12 @@ objects:
         description: lband si41xx synthesizer lock indicator
         access_type: ro
 
+      - subindex: 0x5
+        name: synth_relock_count
+        data_type: uint8
+        description: lband si41xx synthesizer relock count since boot
+        access_type: ro
+
   - index: 0x4007
     name: uhf
     object_type: record
@@ -577,6 +583,17 @@ objects:
         not_found: 4
         dead: 0xff
 
+  - index: 0x400e
+    name: adcs_manager
+    object_type: record
+    subindexes:
+      - subindex: 0x1
+        name: mode
+        data_type: uint8
+        description: current adcs mode
+        access_type: ro
+
+
 tpdos:
   - num: 1 # time sync TPDO
     fields:

diff --git a/oresat_configs/base/gps.yaml b/oresat_configs/base/gps.yaml
@@ -188,6 +188,7 @@ tpdos:
     fields:
       - [status]
       - [skytraq, number_of_sv]
+      - [skytraq, fix_mode]
       - [time_syncd]
 
   - num: 16 # the time sync TPDO

diff --git a/oresat_configs/base/imu.yaml b/oresat_configs/base/imu.yaml
@@ -361,6 +361,3 @@ tpdos:
       - [magnetorquer, current_z]
       - [magnetorquer, pwm_z]
     event_timer_ms: 1000
-
-
-
diff --git a/oresat_configs/oresat0_5/beacon.yaml b/oresat_configs/oresat0_5/beacon.yaml
@@ -22,12 +22,16 @@ fields:
   - [lband, rx_bytes]
   - [lband, rx_packets]
   - [lband, rssi]
-  - [lband, synth_lock]
+  - [lband, synth_relock_count]
   - [uhf, rx_bytes]
   - [uhf, rx_packets]
   - [uhf, rssi]
   - [edl, sequence_count]
   - [edl, rejected_count]
+  - [fread_cache, length]
+  - [fwrite_cache, length]
+  - [updater, cache_length]
+  - [adcs_manager, mode]
   # battery_1
   - [battery_1, pack_1_vbatt]
   - [battery_1, pack_1_vcell]
@@ -118,26 +122,15 @@ fields:
   # star_tracker_1
   - [star_tracker_1, system_storage_percent]
   - [star_tracker_1, status]
-  - [star_tracker_1, orientation_right_ascension]
-  - [star_tracker_1, orientation_declination]
-  - [star_tracker_1, orientation_roll]
-  - [star_tracker_1, orientation_time_since_midnight]
   # gps
   - [gps, system_storage_percent]
   - [gps, status]
   - [gps, skytraq_number_of_sv]
-  - [gps, skytraq_ecef_x]
-  - [gps, skytraq_ecef_y]
-  - [gps, skytraq_ecef_z]
-  - [gps, skytraq_ecef_vx]
-  - [gps, skytraq_ecef_vy]
-  - [gps, skytraq_ecef_vz]
-  - [gps, skytraq_time_since_midnight]
+  - [gps, skytraq_fix_mode]
   # adcs
   - [adcs, gyroscope_roll_rate]
   - [adcs, gyroscope_pitch_rate]
   - [adcs, gyroscope_yaw_rate]
-  - [adcs, temperature]
   # dxwifi
   - [dxwifi, system_storage_percent]
   - [dxwifi, status]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -361,6 +361,3 @@ tpdos:
		- [magnetorquer, current_z]
		- [magnetorquer, pwm_z]
		event_timer_ms: 1000