Skip to content

Commit

Permalink
Merge pull request #293 from ut-issl/feature/modify-el-eh
Browse files Browse the repository at this point in the history 
Update EL/EH
  • Loading branch information
@conjikidow
conjikidow authored May 10, 2024
2 parents 137f92a + 5416a21 commit 3153faf
Show file tree
Hide file tree
Showing 19 changed files with 181 additions and 84 deletions.
2 changes: 1 addition & 1 deletion src/src_user/Applications/DriverInstances/di_nanossoc_d60.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static void DI_NANOSSOC_D60_update_(void)
NANOSSOC_D60_CHECKSUM_STATE state = nanossoc_d60_driver_[NANOSSOC_D60_idx_counter_].info.checksum_state;
if (state != NANOSSOC_D60_CHECKSUM_STATE_OK)
{
EL_record_event(EL_GROUP_ERROR_NANOSSOC, (uint32_t)NANOSSOC_D60_idx_counter_, EL_ERROR_LEVEL_HIGH, (uint32_t)NANOSSOC_D60_EL_NOTE_CHECKSUM_ERROR);
EL_record_event(EL_GROUP_CHECKSUM_ERROR_NANOSSOC, (uint32_t)NANOSSOC_D60_idx_counter_, EL_ERROR_LEVEL_HIGH, (uint32_t)state);
}

DI_NANOSSOC_D60_update_idx_counter_();
Expand Down
3 changes: 1 addition & 2 deletions src/src_user/Applications/DriverInstances/di_nanossoc_d60.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ typedef enum
*/
typedef enum
{
NANOSSOC_D60_EL_NOTE_CHECKSUM_ERROR = 0,
NANOSSOC_D60_EL_NOTE_NOISE_REMOVED,
NANOSSOC_D60_EL_NOTE_NOISE_REMOVED = 0,
NANOSSOC_D60_EL_NOTE_MAX,
} NANOSSOC_D60_EL_NOTE;

Expand Down
2 changes: 1 addition & 1 deletion src/src_user/Applications/DriverInstances/di_oem7600.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static void DI_OEM7600_update_(void)
OEM7600_CRC_STATE state = oem7600_driver_->info.crc_state;
if (state != OEM7600_CRC_STATE_OK)
{
EL_record_event(EL_GROUP_ERROR_OEM7600, (uint32_t)oem_id, EL_ERROR_LEVEL_HIGH, (uint32_t)OEM7600_EL_NOTE_CRC_ERROR);
EL_record_event(EL_GROUP_CRC_ERROR_OEM7600, (uint32_t)oem_id, EL_ERROR_LEVEL_HIGH, (uint32_t)state);
}

}
Expand Down
3 changes: 1 addition & 2 deletions src/src_user/Applications/DriverInstances/di_oem7600.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ typedef enum
*/
typedef enum
{
OEM7600_EL_NOTE_CRC_ERROR = 0,
OEM7600_EL_NOTE_NOISE_REMOVED,
OEM7600_EL_NOTE_NOISE_REMOVED = 0,
OEM7600_EL_NOTE_MAX,
} OEM7600_EL_NOTE;

Expand Down
3 changes: 2 additions & 1 deletion src/src_user/Applications/DriverInstances/di_rw0003.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ static void DI_RW0003_update_(void)
{
DS_CMD_ERR_CODE ret;
EL_GROUP el_group_tlm_error = (EL_GROUP)(EL_GROUP_TLM_ERROR_RW0003X + DI_RW0003_idx_counter_);
EL_GROUP el_group_crc_error = (EL_GROUP)(EL_GROUP_CRC_ERROR_RW0003X + DI_RW0003_idx_counter_);
EL_GROUP el_group_error = (EL_GROUP)(EL_GROUP_ERROR_RW0003X + DI_RW0003_idx_counter_);

ret = RW0003_observe_speed(&rw0003_driver_[DI_RW0003_idx_counter_]);
Expand Down Expand Up @@ -157,7 +158,7 @@ static void DI_RW0003_update_(void)
RW0003_REC_CRC_STATE state = rw0003_driver_[DI_RW0003_idx_counter_].info.crc_state;
if (state != RW0003_REC_CRC_STATE_OK)
{
EL_record_event(el_group_error, (uint32_t)DI_RW0003_idx_counter_, EL_ERROR_LEVEL_HIGH, (uint32_t)RW0003_EL_NOTE_CRC_ERROR);
EL_record_event(el_group_crc_error, (uint32_t)DI_RW0003_idx_counter_, EL_ERROR_LEVEL_HIGH, (uint32_t)state);
}
}

Expand Down
3 changes: 1 addition & 2 deletions src/src_user/Applications/DriverInstances/di_rw0003.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ typedef enum
*/
typedef enum
{
RW0003_EL_NOTE_CRC_ERROR = 0,
RW0003_EL_NOTE_NOISE_REMOVED,
RW0003_EL_NOTE_NOISE_REMOVED = 0,
RW0003_EL_NOTE_TORQUE_CMD,
RW0003_EL_NOTE_FAULT_STATE,
RW0003_EL_NOTE_MAX,
Expand Down
2 changes: 1 addition & 1 deletion src/src_user/Applications/DriverInstances/di_sagitta.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static void DI_SAGITTA_update_(void)
SAGITTA_XXHASH_STATE state = sagitta_driver_->info.xxhash_state;
if (state != SAGITTA_XXHASH_STATE_OK)
{
EL_record_event(EL_GROUP_ERROR_SAGITTA, (uint32_t)SAGITTA_IDX_IN_UNIT, EL_ERROR_LEVEL_HIGH, (uint32_t)SAGITTA_EL_NOTE_XXHASH_ERROR);
EL_record_event(EL_GROUP_XXHASH_ERROR_SAGITTA, (uint32_t)SAGITTA_IDX_IN_UNIT, EL_ERROR_LEVEL_HIGH, (uint32_t)state);
}
}
return;
Expand Down
3 changes: 1 addition & 2 deletions src/src_user/Applications/DriverInstances/di_sagitta.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ typedef enum
*/
typedef enum
{
SAGITTA_EL_NOTE_XXHASH_ERROR = 0,
SAGITTA_EL_NOTE_NOISE_REMOVED,
SAGITTA_EL_NOTE_NOISE_REMOVED = 0,
SAGITTA_EL_NOTE_MAX,
} SAGITTA_EL_NOTE;

Expand Down
2 changes: 1 addition & 1 deletion src/src_user/Applications/DriverInstances/di_stim210.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ static void DI_STIM210_update_(void)

if (state != STIM210_CRC_STATE_OK)
{
EL_record_event(EL_GROUP_ERROR_STIM210, (uint32_t)STIM210_IDX_IN_UNIT, EL_ERROR_LEVEL_HIGH, (uint32_t)STIM210_EL_NOTE_CRC_ERROR);
EL_record_event(EL_GROUP_CRC_ERROR_STIM210, (uint32_t)STIM210_IDX_IN_UNIT, EL_ERROR_LEVEL_HIGH, (uint32_t)state);
}
else if (status != 0)
{
Expand Down
3 changes: 1 addition & 2 deletions src/src_user/Applications/DriverInstances/di_stim210.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ typedef enum
*/
typedef enum
{
STIM210_EL_NOTE_CRC_ERROR = 0,
STIM210_EL_NOTE_STATUS_ERROR,
STIM210_EL_NOTE_STATUS_ERROR = 0,
STIM210_EL_NOTE_NOISE_REMOVED,
STIM210_EL_NOTE_MAX,
} STIM210_EL_NOTE;
Expand Down
36 changes: 18 additions & 18 deletions src/src_user/Settings/System/EventHandlerRules/event_handler_rule_tlmcmd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ void EH_load_rule_tlmcmd(void)
settings.condition.time_threshold_ms = FDIR_PARAMETERS_tlm_error_eh_reset_time_threshold_nanossoc_d60_ms;
settings.deploy_bct_id = BC_RESET_NANOSSOC_D60;
settings.is_active = 0;
EH_register_rule(EH_RULE_TLM_ERROR_NANOSSOC_D60, &settings);
EH_register_rule(EH_RULE_TLM_ERROR_NANOSSOC_D60_0, &settings);

// NANOSSOC D60 1 TLM ERROR
settings.event.group = EL_GROUP_TLM_ERROR_NANOSSOC;
Expand All @@ -105,7 +105,7 @@ void EH_load_rule_tlmcmd(void)
settings.condition.time_threshold_ms = FDIR_PARAMETERS_tlm_error_eh_reset_time_threshold_nanossoc_d60_ms;
settings.deploy_bct_id = BC_RESET_NANOSSOC_D60;
settings.is_active = 0;
EH_register_rule(EH_RULE_TLM_ERROR_NANOSSOC_D60, &settings);
EH_register_rule(EH_RULE_TLM_ERROR_NANOSSOC_D60_1, &settings);

// NANOSSOC D60 2 TLM ERROR
settings.event.group = EL_GROUP_TLM_ERROR_NANOSSOC;
Expand All @@ -117,7 +117,7 @@ void EH_load_rule_tlmcmd(void)
settings.condition.time_threshold_ms = FDIR_PARAMETERS_tlm_error_eh_reset_time_threshold_nanossoc_d60_ms;
settings.deploy_bct_id = BC_RESET_NANOSSOC_D60;
settings.is_active = 0;
EH_register_rule(EH_RULE_TLM_ERROR_NANOSSOC_D60, &settings);
EH_register_rule(EH_RULE_TLM_ERROR_NANOSSOC_D60_2, &settings);

// NANOSSOC D60 3 TLM ERROR
settings.event.group = EL_GROUP_TLM_ERROR_NANOSSOC;
Expand All @@ -129,7 +129,7 @@ void EH_load_rule_tlmcmd(void)
settings.condition.time_threshold_ms = FDIR_PARAMETERS_tlm_error_eh_reset_time_threshold_nanossoc_d60_ms;
settings.deploy_bct_id = BC_RESET_NANOSSOC_D60;
settings.is_active = 0;
EH_register_rule(EH_RULE_TLM_ERROR_NANOSSOC_D60, &settings);
EH_register_rule(EH_RULE_TLM_ERROR_NANOSSOC_D60_3, &settings);

// TODO Add TLM error for other sun sensors

Expand Down Expand Up @@ -329,7 +329,7 @@ void EH_load_rule_tlmcmd(void)
EH_register_rule(EH_RULE_TLM_ERROR_INA260_RW0003_Z, &settings);

// NANOSSOC D60 0 CHECKSUM ERROR
settings.event.group = EL_GROUP_ERROR_NANOSSOC;
settings.event.group = EL_GROUP_CHECKSUM_ERROR_NANOSSOC;
settings.event.local = NANOSSOC_D60_IDX_0;
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
Expand All @@ -338,10 +338,10 @@ void EH_load_rule_tlmcmd(void)
settings.condition.time_threshold_ms = FDIR_PARAMETERS_tlm_error_eh_reset_time_threshold_nanossoc_d60_ms;
settings.deploy_bct_id = BC_RESET_NANOSSOC_D60;
settings.is_active = 0;
EH_register_rule(EH_RULE_CHECKSUM_ERROR_NANOSSOC_D60, &settings);
EH_register_rule(EH_RULE_CHECKSUM_ERROR_NANOSSOC_D60_0, &settings);

// NANOSSOC D60 1 CHECKSUM ERROR
settings.event.group = EL_GROUP_ERROR_NANOSSOC;
settings.event.group = EL_GROUP_CHECKSUM_ERROR_NANOSSOC;
settings.event.local = NANOSSOC_D60_IDX_1;
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
Expand All @@ -350,10 +350,10 @@ void EH_load_rule_tlmcmd(void)
settings.condition.time_threshold_ms = FDIR_PARAMETERS_tlm_error_eh_reset_time_threshold_nanossoc_d60_ms;
settings.deploy_bct_id = BC_RESET_NANOSSOC_D60;
settings.is_active = 0;
EH_register_rule(EH_RULE_CHECKSUM_ERROR_NANOSSOC_D60, &settings);
EH_register_rule(EH_RULE_CHECKSUM_ERROR_NANOSSOC_D60_1, &settings);

// NANOSSOC D60 2 CHECKSUM ERROR
settings.event.group = EL_GROUP_ERROR_NANOSSOC;
settings.event.group = EL_GROUP_CHECKSUM_ERROR_NANOSSOC;
settings.event.local = NANOSSOC_D60_IDX_2;
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
Expand All @@ -362,10 +362,10 @@ void EH_load_rule_tlmcmd(void)
settings.condition.time_threshold_ms = FDIR_PARAMETERS_tlm_error_eh_reset_time_threshold_nanossoc_d60_ms;
settings.deploy_bct_id = BC_RESET_NANOSSOC_D60;
settings.is_active = 0;
EH_register_rule(EH_RULE_CHECKSUM_ERROR_NANOSSOC_D60, &settings);
EH_register_rule(EH_RULE_CHECKSUM_ERROR_NANOSSOC_D60_2, &settings);

// NANOSSOC D60 3 CHECKSUM ERROR
settings.event.group = EL_GROUP_ERROR_NANOSSOC;
settings.event.group = EL_GROUP_CHECKSUM_ERROR_NANOSSOC;
settings.event.local = NANOSSOC_D60_IDX_3;
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
Expand All @@ -374,12 +374,12 @@ void EH_load_rule_tlmcmd(void)
settings.condition.time_threshold_ms = FDIR_PARAMETERS_tlm_error_eh_reset_time_threshold_nanossoc_d60_ms;
settings.deploy_bct_id = BC_RESET_NANOSSOC_D60;
settings.is_active = 0;
EH_register_rule(EH_RULE_CHECKSUM_ERROR_NANOSSOC_D60, &settings);
EH_register_rule(EH_RULE_CHECKSUM_ERROR_NANOSSOC_D60_3, &settings);

// TODO Add other sun sensors

// STIM210 CRC ERROR
settings.event.group = EL_GROUP_ERROR_STIM210;
settings.event.group = EL_GROUP_CRC_ERROR_STIM210;
settings.event.local = STIM210_IDX_IN_UNIT;
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
Expand All @@ -403,7 +403,7 @@ void EH_load_rule_tlmcmd(void)
EH_register_rule(EH_RULE_CRC_ERROR_STIM210_BROKEN, &settings);

// SAGITTA XXHASH ERROR
settings.event.group = EL_GROUP_ERROR_SAGITTA;
settings.event.group = EL_GROUP_XXHASH_ERROR_SAGITTA;
settings.event.local = SAGITTA_IDX_IN_UNIT;
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
Expand All @@ -415,7 +415,7 @@ void EH_load_rule_tlmcmd(void)
EH_register_rule(EH_RULE_XXHASH_ERROR_SAGITTA, &settings);

// OEM7600 CRC ERROR
settings.event.group = EL_GROUP_ERROR_OEM7600;
settings.event.group = EL_GROUP_CRC_ERROR_OEM7600;
settings.event.local = OEM7600_IDX_IN_UNIT;
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
Expand All @@ -427,7 +427,7 @@ void EH_load_rule_tlmcmd(void)
EH_register_rule(EH_RULE_CRC_ERROR_OEM7600, &settings);

// RWX CRC ERROR
settings.event.group = EL_GROUP_ERROR_RW0003X;
settings.event.group = EL_GROUP_CRC_ERROR_RW0003X;
settings.event.local = RW0003_IDX_ON_X;
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
Expand All @@ -439,7 +439,7 @@ void EH_load_rule_tlmcmd(void)
EH_register_rule(EH_RULE_CRC_ERROR_RWX, &settings);

// RWY CRC ERROR
settings.event.group = EL_GROUP_ERROR_RW0003Y;
settings.event.group = EL_GROUP_CRC_ERROR_RW0003Y;
settings.event.local = RW0003_IDX_ON_Y;
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
Expand All @@ -451,7 +451,7 @@ void EH_load_rule_tlmcmd(void)
EH_register_rule(EH_RULE_CRC_ERROR_RWY, &settings);

// RWZ CRC ERROR
settings.event.group = EL_GROUP_ERROR_RW0003Z;
settings.event.group = EL_GROUP_CRC_ERROR_RW0003Z;
settings.event.local = RW0003_IDX_ON_Z;
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
Expand Down
10 changes: 8 additions & 2 deletions src/src_user/Settings/System/EventHandlerRules/event_handler_rules.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ typedef enum
EH_RULE_TLM_ERROR_RM3100_ON_AOBC_BROKEN = 2,
EH_RULE_TLM_ERROR_RM3100_EXTERNAL = 3,
EH_RULE_TLM_ERROR_RM3100_EXTERNAL_BROKEN = 4,
EH_RULE_TLM_ERROR_NANOSSOC_D60 = 5,
EH_RULE_TLM_ERROR_NANOSSOC_D60_0 = 5,
EH_RULE_TLM_ERROR_NANOSSOC_D60_1 = 6,
EH_RULE_TLM_ERROR_NANOSSOC_D60_2 = 7,
EH_RULE_TLM_ERROR_NANOSSOC_D60_3 = 8,
EH_RULE_TLM_ERROR_STIM210 = 9,
EH_RULE_TLM_ERROR_STIM210_BROKEN = 10,
EH_RULE_TLM_ERROR_SAGITTA = 11,
Expand All @@ -36,7 +39,10 @@ typedef enum
EH_RULE_TLM_ERROR_INA260_RW0003_X = 23,
EH_RULE_TLM_ERROR_INA260_RW0003_Y = 24,
EH_RULE_TLM_ERROR_INA260_RW0003_Z = 25,
EH_RULE_CHECKSUM_ERROR_NANOSSOC_D60 = 26,
EH_RULE_CHECKSUM_ERROR_NANOSSOC_D60_0 = 26,
EH_RULE_CHECKSUM_ERROR_NANOSSOC_D60_1 = 27,
EH_RULE_CHECKSUM_ERROR_NANOSSOC_D60_2 = 28,
EH_RULE_CHECKSUM_ERROR_NANOSSOC_D60_3 = 29,
EH_RULE_CRC_ERROR_STIM210 = 30,
EH_RULE_CRC_ERROR_STIM210_BROKEN = 31,
EH_RULE_XXHASH_ERROR_SAGITTA = 32,
Expand Down
78 changes: 44 additions & 34 deletions src/src_user/Settings/System/event_logger_group.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,45 +17,55 @@ typedef enum
// C2A CORE: 0-49
// src_core/System/EventManager/event_logger.h の EL_CORE_GROUP にて定義

// CDH: 50-69 通信・不揮発メモリエラーなど
EL_GROUP_TLM_ERROR_INA260 = 50, // TLMエラー:INA260
EL_GROUP_TLM_ERROR_MPU9250, // TLMエラー:MPU9250
EL_GROUP_TLM_ERROR_RM3100, // TLMエラー:RM3100
EL_GROUP_TLM_ERROR_NANOSSOC, // TLMエラー:NANOSSOC-D60
EL_GROUP_TLM_ERROR_STIM210, // TLMエラー:STIM210
EL_GROUP_TLM_ERROR_SAGITTA, // TLMエラー:SAGITTA
EL_GROUP_TLM_ERROR_OEM7600, // TLMエラー:OEM7600
EL_GROUP_TLM_ERROR_RW0003X, // TLMエラー:RW0003 x axis
EL_GROUP_TLM_ERROR_RW0003Y, // TLMエラー:RW0003 y axis
EL_GROUP_TLM_ERROR_RW0003Z, // TLMエラー:RW0003 z axis
// EL_GROUP_OTHER_ERROR_INA260, // その他エラー:INA260 [TODO_L] 使用時はコンポON/OFF時にenable/disableする
EL_GROUP_ERROR_MPU9250, // その他エラー:MPU9250
EL_GROUP_ERROR_RM3100, // その他エラー:RM3100
EL_GROUP_ERROR_NANOSSOC, // その他エラー:NANOSSOC-D60
EL_GROUP_ERROR_STIM210, // その他エラー:STIM210
EL_GROUP_ERROR_SAGITTA, // その他エラー:SAGITTA
EL_GROUP_ERROR_OEM7600, // その他エラー:OEM7600
EL_GROUP_ERROR_RW0003X, // その他エラー:RW0003 x axis
EL_GROUP_ERROR_RW0003Y, // その他エラー:RW0003 y axis
EL_GROUP_ERROR_RW0003Z, // その他エラー:RW0003 z axis
// CDH: 50-79 通信・不揮発メモリエラーなど
EL_GROUP_TLM_ERROR_INA260 = 50, // TLMエラー:INA260
EL_GROUP_TLM_ERROR_MPU9250 = 51, // TLMエラー:MPU9250
EL_GROUP_TLM_ERROR_RM3100 = 52, // TLMエラー:RM3100
EL_GROUP_TLM_ERROR_NANOSSOC = 53, // TLMエラー:NANOSSOC-D60
EL_GROUP_TLM_ERROR_STIM210 = 54, // TLMエラー:STIM210
EL_GROUP_TLM_ERROR_SAGITTA = 55, // TLMエラー:SAGITTA
EL_GROUP_TLM_ERROR_OEM7600 = 56, // TLMエラー:OEM7600
EL_GROUP_TLM_ERROR_RW0003X = 57, // TLMエラー:RW0003 x axis
EL_GROUP_TLM_ERROR_RW0003Y = 58, // TLMエラー:RW0003 y axis
EL_GROUP_TLM_ERROR_RW0003Z = 59, // TLMエラー:RW0003 z axis

// POWER: 70-79 過電流など
EL_GROUP_SW_OC = 70,
EL_GROUP_HW_OC,
// 一の位をコンポごとに統一するため，以下のように数字を割り当てる
EL_GROUP_CHECKSUM_ERROR_NANOSSOC = 63, // CHECKSUMエラー:NANOSSOC-D60
EL_GROUP_CRC_ERROR_STIM210 = 64, // CRCエラー:STIM210
EL_GROUP_XXHASH_ERROR_SAGITTA = 65, // XXHASHエラー:SAGITTA
EL_GROUP_CRC_ERROR_OEM7600 = 66, // CRCエラー:OEM7600
EL_GROUP_CRC_ERROR_RW0003X = 67, // CRCエラー:RW0003 x axis
EL_GROUP_CRC_ERROR_RW0003Y = 68, // CRCエラー:RW0003 y axis
EL_GROUP_CRC_ERROR_RW0003Z = 69, // CRCエラー:RW0003 z axis

// THERMAL: 80-89 温度異常など
EL_GROUP_TEMPERATURE_HIGH = 80, // 高温異常
EL_GROUP_TEMPERATURE_LOW, // 低温異常
// EL_GROUP_OTHER_ERROR_INA260 = 70, // その他エラー:INA260 [TODO_L] 使用時はコンポON/OFF時にenable/disableする
EL_GROUP_ERROR_MPU9250 = 71, // その他エラー:MPU9250
EL_GROUP_ERROR_RM3100 = 72, // その他エラー:RM3100
EL_GROUP_ERROR_NANOSSOC = 73, // その他エラー:NANOSSOC-D60
EL_GROUP_ERROR_STIM210 = 74, // その他エラー:STIM210
EL_GROUP_ERROR_SAGITTA = 75, // その他エラー:SAGITTA
EL_GROUP_ERROR_OEM7600 = 76, // その他エラー:OEM7600
EL_GROUP_ERROR_RW0003X = 77, // その他エラー:RW0003 x axis
EL_GROUP_ERROR_RW0003Y = 78, // その他エラー:RW0003 y axis
EL_GROUP_ERROR_RW0003Z = 79, // その他エラー:RW0003 z axis

// AOCS: 90-119 制御異常など
EL_GROUP_AUTO_MODE_TRANSITION = 90, //!< 自動モード遷移
EL_GROUP_CALCULATION_ERROR, //!< アルゴリズム計算内での計算異常
// POWER: 80-89 過電流など
EL_GROUP_SW_OC = 80,
EL_GROUP_HW_OC = 81,

// THERMAL: 90-99 温度異常など
EL_GROUP_TEMPERATURE_HIGH = 90, // 高温異常
EL_GROUP_TEMPERATURE_LOW = 91, // 低温異常

// AOCS: 100-119 制御異常など
EL_GROUP_AUTO_MODE_TRANSITION = 100, //!< 自動モード遷移
EL_GROUP_CALCULATION_ERROR = 101, //!< アルゴリズム計算内での計算異常

// その他: 120-127
EL_GROUP_DR_WRITE = 120, //!< DR書き込みエラー
EL_GROUP_DR_READ, //!< DR読み出しエラー
EL_GROUP_NVM_TRIPLE_REDUNDANT, //!< 不揮発メモリ三重冗長エラー
EL_GROUP_NVM_BC, //!< 不揮発BC操作時のエラー
EL_GROUP_DR_WRITE = 120, //!< DR書き込みエラー
EL_GROUP_DR_READ = 121, //!< DR読み出しエラー
EL_GROUP_NVM_TRIPLE_REDUNDANT = 122, //!< 不揮発メモリ三重冗長エラー
EL_GROUP_NVM_BC = 123, //!< 不揮発BC操作時のエラー

// とりあえず最大値は0x7f(127)に！
EL_GROUP_MAX = 0x80 // これはいじらない！
Expand Down
13 changes: 7 additions & 6 deletions src/src_user/Settings/System/event_logger_settings.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ void EL_load_default_settings(void)
EL_disable_logging(EL_GROUP_TLM_ERROR_RW0003X);
EL_disable_logging(EL_GROUP_TLM_ERROR_RW0003Y);
EL_disable_logging(EL_GROUP_TLM_ERROR_RW0003Z);
EL_disable_logging(EL_GROUP_CHECKSUM_ERROR_NANOSSOC);
EL_disable_logging(EL_GROUP_CRC_ERROR_STIM210);
EL_disable_logging(EL_GROUP_XXHASH_ERROR_SAGITTA);
EL_disable_logging(EL_GROUP_CRC_ERROR_OEM7600);
EL_disable_logging(EL_GROUP_CRC_ERROR_RW0003X);
EL_disable_logging(EL_GROUP_CRC_ERROR_RW0003Y);
EL_disable_logging(EL_GROUP_CRC_ERROR_RW0003Z);
EL_disable_logging(EL_GROUP_ERROR_MPU9250);
EL_disable_logging(EL_GROUP_ERROR_RM3100);
EL_disable_logging(EL_GROUP_ERROR_NANOSSOC);
Expand All @@ -31,12 +38,6 @@ void EL_load_default_settings(void)
EL_disable_logging(EL_GROUP_ERROR_RW0003Z);
EL_disable_logging(EL_GROUP_SW_OC);
EL_disable_logging(EL_GROUP_HW_OC);

// 電源OFFなので
// EL_disable_logging(EL_GROUP_IMU);
// EL_disable_logging(EL_GROUP_STT);
// EL_disable_logging(EL_GROUP_RW);
// EL_disable_logging(EL_GROUP_XACT);
}

#pragma section
Loading

0 comments on commit 3153faf

Please sign in to comment.