Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
519a204f95 HETEPT patch v10.1
Patch 10.1 corrects the operational heater setpoints of HE1 and HE2. In v10 the OH_SETPOINTS were calculated incorrectly due to incorrect scaling of OH_DC_ESTIMATE.
2024-06-20 15:40:49 +02:00
5e7450bdc9 Bug fix of the operational heater set point
The OH_SETPOINT was incorrect because OH_DC_ESTIMATE was not scaled correctly.
2024-06-20 15:37:27 +02:00
7 changed files with 65 additions and 2 deletions

View file

@ -0,0 +1,2 @@
msg(0x268d, 3, 0x007270e00a0c8600)
msg(0x000f, 3, 0x00000a6e000a0001)

View file

@ -0,0 +1,8 @@
<TCs>
<TC type="128" subtype="102" id="ZID52540" comment="" delta="00:00:03">
<parameter name="SensorID" id="PID00069">2</parameter>
<parameter name="Flags" id="PID00085">15</parameter>
<parameter name="NMessages" id="PID00086">2</parameter>
<parameter name="Messages" id="PID00075">e68d007270e00a0c8600c00f00000a6e000a0001</parameter>
</TC>
</TCs>

View file

@ -0,0 +1,43 @@
#!/usr/bin/python3
def main(cf_dir='./solo/configurations/'):
from solo.configtable import read_txt_table
from solo.hetept.config import fm1, fm2
from solo.cdpu.telecom import write_xml
from solo.cdpu.telecom import msg_telecommands
# load HET/EPT v10 configuration tables
fm1_v10 = read_txt_table(cf_dir + 'hetept1/v0010/hetept_config_fm1.txt')
fm2_v10 = read_txt_table(cf_dir + 'hetept2/v0010/hetept_config_fm2.txt')
# create new configuration tables from the current code base
fm1_v10_p1 = fm1()
fm2_v10_p1 = fm2()
# make a diff of the nominal configuration
patch1_fm1 = fm1_v10_p1[2] - fm1_v10[2]
patch1_fm2 = fm2_v10_p1[2] - fm2_v10[2]
# write messages
with open(cf_dir + 'hetept1/v0010/hetept_fm1_v0010_patch1.msgs', 'w') as f:
for m in patch1_fm1.msgs():
f.write(m+'\n')
with open(cf_dir + 'hetept2/v0010/hetept_fm2_v0010_patch1.msgs', 'w') as f:
for m in patch1_fm2.msgs():
f.write(m+'\n')
# write telecommands
fm1_tc = msg_telecommands(comment='', unit='HE1')
fm2_tc = msg_telecommands(comment='', unit='HE2')
patch1_fm1(fm1_tc)
patch1_fm2(fm2_tc)
write_xml(cf_dir + 'hetept1/v0010/hetept_fm1_v0010_patch1.tcs', fm1_tc.ad_gen())
write_xml(cf_dir + 'hetept2/v0010/hetept_fm2_v0010_patch1.tcs', fm2_tc.ad_gen())
if __name__ == "__main__":
import sys, os
sys.path[1:1] = [os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", ".."))]
print(os.getcwd())
main(cf_dir='../../')

View file

@ -0,0 +1,2 @@
msg(0x268d, 3, 0x007270e009188600)
msg(0x000f, 3, 0x00000aa2000a0001)

View file

@ -0,0 +1,8 @@
<TCs>
<TC type="128" subtype="102" id="ZID52540" comment="" delta="00:00:03">
<parameter name="SensorID" id="PID00069">3</parameter>
<parameter name="Flags" id="PID00085">15</parameter>
<parameter name="NMessages" id="PID00086">2</parameter>
<parameter name="Messages" id="PID00075">e68d007270e009188600c00f00000aa2000a0001</parameter>
</TC>
</TCs>

View file

@ -11,7 +11,7 @@ from .base_config import hetept_config, hetept_config_table
# attempt to reproduce what was flown 2021-2023
VERSION = 10
SUBVERSION = 0
SUBVERSION = 1
ENV = ["CLOSE", "FAR"]
TEMPERATURE = [25., 15. , 5. , -5.]

View file

@ -33,7 +33,7 @@ class hetept_ppss(ppss_table):
self.dps = dps
self.dps_us = dps_us
self.clear_us = clear_us
self.OH_SETPOINT = HK_T_to_ADC(OH_degC, dc_estimate=self.OH_DC_ESTIMATE, shift=self.OH_SHIFT)
self.OH_SETPOINT = HK_T_to_ADC(OH_degC, dc_estimate=self.OH_DC_ESTIMATE*192//100, shift=self.OH_SHIFT)
self.assemble()
def assemble(self):