Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SSのテレメ異常EHのカウンタをSSごとに設定 #289

Closed
wants to merge 2 commits into from
Closed

SSのテレメ異常EHのカウンタをSSごとに設定 #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a20ffc
Modify ss fdir params
seki-hiro May 7, 2024
4c5efc0
modify some
seki-hiro May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/src_user/Settings/SatelliteParameters/Sample/fdir_parameters.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,12 @@ const uint32_t FDIR_PARAMETERS_tlm_error_eh_reset_time_threshold_rm3100_ms = 200
const uint16_t FDIR_PARAMETERS_tlm_error_eh_switch_sensor_count_threshold_rm3100 = 10;
const uint32_t FDIR_PARAMETERS_tlm_error_eh_switch_sensor_time_threshold_rm3100_ms = 0;
// nanoSSOC D60
// Prevents EHs from firing at the same time due to an anomaly on the common I2C bus
const uint16_t FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_0 = 250;
const uint16_t FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_1 = 260;
const uint16_t FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_2 = 270;
const uint16_t FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_3 = 280;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[MUST] EHをサンセンサ1つずつに対して定義する場合、サンセンサの個数が最大6個までで可変なことを考えて実装する必要があります。

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

この修正起因というか、昔サンセンサ個数を任意に変更にした時に本来はここに最大6個分までのEHを登録する必要があったという感じですね。すみません。

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

はい、ただEH自体は1つではなく4つ定義されていて、6つにするのはTODOとなっています。
https://github.com/ut-issl/c2a-aobc/pull/289/files#diff-4765fd1a98eafaac9e712a19389fa46d3bd43f34f5164eca121f0acbe923adc6R134

なので、影響範囲が大きそうな4->6の拡張をするのではなく、ここでは現状の4つのEHを独立で定義できるように微修正するにとどめたいのですが、よろしいでしょうか？

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/ut-issl/c2a-aobc-onglaisat/pull/53#issuecomment-2099951115

こっちのコメントを後に見ました。このスレッドは一旦保留でお願いします。

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

今回は4つのままで進めるということでOKです。issue登録だけしておいてもらえると助かります。

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@200km 定義するのは4つのまま進めるけど、デフォルトで有効化するのは1つということで、各SSでカウントをずらすモチベーションがなくなってしまったので、このPRはクローズさせていただきます。

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ここでissue登録しました。#294

// Use same value for all sun sensors (Users can also change the value with command for each sun sensors)
const uint16_t FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60 = 250;
const uint32_t FDIR_PARAMETERS_tlm_error_eh_reset_time_threshold_nanossoc_d60_ms = 2000;
// STIM210
const uint16_t FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_stim210 = 100;
Expand Down
6 changes: 5 additions & 1 deletion src/src_user/Settings/SatelliteParameters/fdir_parameters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,12 @@ extern const uint32_t FDIR_PARAMETERS_tlm_error_eh_reset_time_threshold_rm3100_m
extern const uint16_t FDIR_PARAMETERS_tlm_error_eh_switch_sensor_count_threshold_rm3100; //!< TLM error detection event handler switch sensor count threshold for RM3100 AOBC
extern const uint32_t FDIR_PARAMETERS_tlm_error_eh_switch_sensor_time_threshold_rm3100_ms; //!< TLM error detection event handler switch sensor time threshold for RM3100 AOBC [ms]
// nanoSSOC D60
// Prevents EHs from firing at the same time due to an anomaly on the common I2C bus
extern const uint16_t FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_0; //!< TLM error detection event handler reset count threshold for nanoSSOC D60
extern const uint16_t FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_1; //!< TLM error detection event handler reset count threshold for nanoSSOC D60
extern const uint16_t FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_2; //!< TLM error detection event handler reset count threshold for nanoSSOC D60
extern const uint16_t FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_3; //!< TLM error detection event handler reset count threshold for nanoSSOC D60
// Use same value for all sun sensors (Users can also change the value with command for each sun sensors)
extern const uint16_t FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60; //!< TLM error detection event handler reset count threshold for nanoSSOC D60
extern const uint32_t FDIR_PARAMETERS_tlm_error_eh_reset_time_threshold_nanossoc_d60_ms; //!< TLM error detection event handler reset time threshold for nanoSSOC D60 [ms]
// STIM210
extern const uint16_t FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_stim210; //!< TLM error detection event handler reset count threshold for STIM210
Expand Down
16 changes: 8 additions & 8 deletions src/src_user/Settings/System/EventHandlerRules/event_handler_rule_tlmcmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void EH_load_rule_tlmcmd(void)
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
settings.condition.type = EH_RESPONSE_CONDITION_CONTINUOUS;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_0;
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;
Expand All @@ -101,7 +101,7 @@ void EH_load_rule_tlmcmd(void)
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
settings.condition.type = EH_RESPONSE_CONDITION_CONTINUOUS;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_1;
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;
Expand All @@ -113,7 +113,7 @@ void EH_load_rule_tlmcmd(void)
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
settings.condition.type = EH_RESPONSE_CONDITION_CONTINUOUS;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_2;
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;
Expand All @@ -125,7 +125,7 @@ void EH_load_rule_tlmcmd(void)
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
settings.condition.type = EH_RESPONSE_CONDITION_CONTINUOUS;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_3;
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;
Expand Down Expand Up @@ -334,7 +334,7 @@ void EH_load_rule_tlmcmd(void)
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
settings.condition.type = EH_RESPONSE_CONDITION_CONTINUOUS;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_0;
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;
Expand All @@ -346,7 +346,7 @@ void EH_load_rule_tlmcmd(void)
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
settings.condition.type = EH_RESPONSE_CONDITION_CONTINUOUS;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_1;
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;
Expand All @@ -358,7 +358,7 @@ void EH_load_rule_tlmcmd(void)
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
settings.condition.type = EH_RESPONSE_CONDITION_CONTINUOUS;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_2;
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;
Expand All @@ -370,7 +370,7 @@ void EH_load_rule_tlmcmd(void)
settings.event.err_level = EL_ERROR_LEVEL_HIGH;
settings.should_match_err_level = 1;
settings.condition.type = EH_RESPONSE_CONDITION_CONTINUOUS;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60;
settings.condition.count_threshold = FDIR_PARAMETERS_tlm_error_eh_reset_count_threshold_nanossoc_d60_3;
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;
Expand Down
Loading