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.

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

SagittaのFirmware update 10.3 -> 10.7対応 #250

Merged
merged 2 commits into from
Oct 26, 2023

Conversation

seki-hiro
Copy link
Member

@seki-hiro seki-hiro commented Oct 25, 2023

Issue

NA

詳細

以下のパラメータ設定機能を追加した。各パラメータの詳細はICD参照。

  • Distortion
  • Fast LISA

テレコマジェネレータの過程でAOBC_CONTROLにバグがあったので解消した。

検証結果

SILSでAOBC内で保持しているparameter値の変更ができることを確認した。

ビルドチェック (どちらもチェック)

  • SILSでのビルドチェックに通った(CIで確認)
  • vMicroでのビルドチェックに通った

動作確認チェック (いずれかをチェック)

  • SILSでアルゴリズムが想定通りに動いた
  • 実機でアルゴリズムが想定通りに動いた
  • (テレコマ試験の場合)コマンドファイルを使った試験をパスした

試験結果詳細記述場所 or 詳細ログ保存場所へのリンク

NA

補足

NA

@seki-hiro seki-hiro added 🚗 priority::low priority low 🐬 minor update Minor update labels Oct 25, 2023
@seki-hiro seki-hiro added this to the v8.1.0 Minor update milestone Oct 25, 2023
@seki-hiro seki-hiro requested review from sksat and a team as code owners October 25, 2023 09:41
@seki-hiro seki-hiro self-assigned this Oct 25, 2023
@seki-hiro seki-hiro requested review from 200km, suzuki-toshihir0, t-hosonuma and conjikidow and removed request for a team October 25, 2023 09:41
@@ -46,13 +46,13 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,,
,CONTROL.ERROR.SUN_DIRECTION_rad,float,(float)(aocs_manager->sun_vec_error_rad),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,制御太陽角度誤差 [rad],
,UNLOADING.CONTROL_GAIN,float,(float)(unloading->control_gain),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,アンローディングにおけるMTQ出力ゲイン,
,UNLOADING.EXEC_IS_ENABLE,uint8_t,(uint8_t)(unloading->exec_is_enable),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),STATUS,,,,,,,0=ENABLE@@ 1=DISABLE,アンローディング出力が有効かどうか,
,UNLOADING.THRESHOLD.X.UPPER,float,(float)(unloading->angular_velocity_upper_threshold_rad_s[0]) ,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,アンローディング上限閾値 RW-X [rad/s],
Copy link
Member

Choose a reason for hiding this comment

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

[NITS] スターセンサと関係ない部分に修正が入っているようです。

Copy link
Member Author

Choose a reason for hiding this comment

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

ここの不具合を解消しないとテレコマジェネレーターが使えなかったので、修正を加えました。

Copy link
Member

Choose a reason for hiding this comment

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

そうなんですね。謎ですね。。。

*/
typedef struct
{
uint8_t mode;
Copy link
Member

Choose a reason for hiding this comment

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

[NITS] 変数を説明するコメントがあるとうれしいです。

Copy link
Member Author

Choose a reason for hiding this comment

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

コメントを追加しました。

@seki-hiro seki-hiro requested a review from 200km October 26, 2023 00:42
Copy link
Member

@200km 200km left a comment

Choose a reason for hiding this comment

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

コメント追記ありがとうございます。

@seki-hiro seki-hiro merged commit e3c5881 into develop Oct 26, 2023
9 of 11 checks passed
@seki-hiro seki-hiro deleted the feature/add_sagitta_param branch October 26, 2023 05:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants