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

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

Merged
merged 2 commits into from
Oct 26, 2023
Merged

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

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
a4c81e2
Add sagitta param
seki-hiro Oct 25, 2023
c1fc36b
Add comments
seki-hiro Oct 26, 2023
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
18 changes: 18 additions & 0 deletions database/CmdPlan/AOBC_SAGITTA_PARAMETER_SET.ops
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@
.AOBC_RT.DI_SAGITTA_SET_PARAMETER 6
.AOBC_RT.DI_SAGITTA_READ_PARAMETER 6
.#
.# DISTORTION
.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 8 0 1
.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 8 16 0.1
.AOBC_RT.DI_SAGITTA_SET_PARAMETER 8
.AOBC_RT.DI_SAGITTA_READ_PARAMETER 8
.#
.# CAMERA
.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 9 0 1
.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 9 23 1
Expand Down Expand Up @@ -115,6 +121,18 @@
.AOBC_RT.DI_SAGITTA_SET_PARAMETER 18
.AOBC_RT.DI_SAGITTA_READ_PARAMETER 18
.#
.# AUTO_THRESHOLD
.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 23 0 2
.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 23 4 0.1
.AOBC_RT.DI_SAGITTA_SET_PARAMETER 23
.AOBC_RT.DI_SAGITTA_READ_PARAMETER 23
.#
.# FAST_LISA
.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 25 0 0.3
.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 25 1 0.3
.AOBC_RT.DI_SAGITTA_SET_PARAMETER 25
.AOBC_RT.DI_SAGITTA_READ_PARAMETER 25
.#
.# ===== Sagittaコンポ側アサーションの確認 =====
.# Sagitta側の閾値（24-26）を超えて焦点距離を設定
.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 9 1 -3
Expand Down
6 changes: 3 additions & 3 deletions database/TLM_DB/AOBC_TLM_DB_AOBC_CONTROL.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

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

,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],
,UNLOADING.THRESHOLD.X.TARGET,float,(float)(unloading->angular_velocity_target_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],
,UNLOADING.THRESHOLD.X.LOWER,float,(float)(unloading->angular_velocity_lower_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],
,UNLOADING.THRESHOLD.Y.UPPER,float,(float)(unloading->angular_velocity_upper_threshold_rad_s[1]) ,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-Y [rad/s],
,UNLOADING.THRESHOLD.Y.UPPER,float,(float)(unloading->angular_velocity_upper_threshold_rad_s[1]),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-Y [rad/s],
,UNLOADING.THRESHOLD.Y.TARGET,float,(float)(unloading->angular_velocity_target_rad_s[1]),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-Y [rad/s],
,UNLOADING.THRESHOLD.Y.LOWER,float,(float)(unloading->angular_velocity_lower_threshold_rad_s[1]),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-Y [rad/s],
,UNLOADING.THRESHOLD.Z.UPPER,float,(float)(unloading->angular_velocity_upper_threshold_rad_s[2]) ,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-Z [rad/s],
,UNLOADING.THRESHOLD.Z.UPPER,float,(float)(unloading->angular_velocity_upper_threshold_rad_s[2]),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-Z [rad/s],
,UNLOADING.THRESHOLD.Z.TARGET,float,(float)(unloading->angular_velocity_target_rad_s[2]),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-Z [rad/s],
,UNLOADING.THRESHOLD.Z.LOWER,float,(float)(unloading->angular_velocity_lower_threshold_rad_s[2]),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-Z [rad/s],
,TARGET.CALC_MODE,uint8_t,(uint8_t)(target_attitude_calculator->mode),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=MANUAL@@ 1=CALCULATION_FROM_ORBIT@@ 2=INTERPOLATION,目標Quaternion計算方法,
Expand Down
Loading
Loading