Skip to content

Commit

Permalink
adcs: Remove VDD 12V CV for ADCS System HK
Browse files Browse the repository at this point in the history
The 12V VDD will not be used in our initial operations, and the 3V3
DRV, which serves as the power supply for the CV monitor we monitor,
will also not be enabled. Therefore, it will be removed from the
System HK during the initial operations.

Signed-off-by: Takuya Sasaki <takuya.sasaki@spacecubics.com>
  • Loading branch information
sasataku committed Nov 18, 2024
1 parent 8bf843a commit a6eb52d
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 20 deletions.
11 changes: 0 additions & 11 deletions adcs/src/mon/cv.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ static void cv_monitor(struct k_work *work)
ADCS_VDD_3V3_IMU_SHUNT, ADCS_VDD_3V3_IMU_BUS, ADCS_VDD_3V3_GPS_SHUNT,
ADCS_VDD_3V3_GPS_BUS, ADCS_VDD_3V3_DRV_SHUNT, ADCS_VDD_3V3_DRV_BUS,
};
enum rw_cv_pos rw_pos_list[] = {
ADCS_VDD_12V_DRVX_SHUNT, ADCS_VDD_12V_DRVX_BUS, ADCS_VDD_12V_DRVY_SHUNT,
ADCS_VDD_12V_DRVY_BUS, ADCS_VDD_12V_DRVZ_SHUNT, ADCS_VDD_12V_DRVZ_BUS,
};

for (pos = 0; pos < ARRAY_SIZE(obc_pos_list); pos++) {
msg.obc[pos].status = sc_bhm_get_obc_cv(obc_pos_list[pos], &msg.obc[pos].cv);
Expand All @@ -61,13 +57,6 @@ static void cv_monitor(struct k_work *work)
}
}

for (pos = 0; pos < ARRAY_SIZE(rw_pos_list); pos++) {
msg.rw[pos].status = get_rw_cv(rw_pos_list[pos], &msg.rw[pos].cv);
if (msg.rw[pos].status < 0) {
msg.rw[pos].cv = CV_INVALID_INT;
}
}

zbus_chan_pub(&cv_chan, &msg, K_NO_WAIT);
}

Expand Down
1 change: 0 additions & 1 deletion adcs/src/mon/cv.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ struct cv_msg {
struct cv_int32_entry obc[OBC_CV_POS_NUM];
struct cv_float_entry xadc[OBC_XADC_CV_POS_NUM];
struct cv_int32_entry adcs[ADCS_CV_POS_NUM];
struct cv_float_entry rw[ADCS_RW_CV_POS_NUM];
};

void start_cv_monitor(void);
9 changes: 1 addition & 8 deletions adcs/src/tlm/syshk.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ZBUS_SUBSCRIBER_DEFINE(syshk_sub, CONFIG_SCSAT1_ADCS_SYSHK_SUB_QUEUE_SIZE);

#define SYSHK_SYSTEM_BLOCK_SIZE (33U)
#define SYSHK_TEMP_BLOCK_SIZE (35U)
#define SYSHK_CV_BLOCK_SIZE (135U)
#define SYSHK_CV_BLOCK_SIZE (105U)

struct syshk_tlm {
uint8_t telemetry_id;
Expand Down Expand Up @@ -124,13 +124,6 @@ static void copy_cv_to_syshk(struct cv_msg *msg)
memcpy(cv_block, &msg->adcs[pos].cv, sizeof(msg->adcs[pos].cv));
cv_block += sizeof(msg->adcs[pos].cv);
}

for (pos = 0; pos < ADCS_RW_CV_POS_NUM; pos++) {
memcpy(cv_block, &msg->rw[pos].status, sizeof(msg->rw[pos].status));
cv_block += sizeof(msg->rw[pos].status);
memcpy(cv_block, &msg->rw[pos].cv, sizeof(msg->rw[pos].cv));
cv_block += sizeof(msg->rw[pos].cv);
}
}

static void syshk_sub_task(void *sub)
Expand Down

0 comments on commit a6eb52d

Please sign in to comment.