eive/eive-tmtc
eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 2 Projects Releases 97 Wiki Activity

v1.9.0 #53

Merged
muellerr merged 354 commits from develop into master 2022-04-07 17:39:42 +02:00
Conversation 0 Commits 354 Files Changed 125 +1 -5
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4b918b3da0 - Show all commits

6
pus_tc/devs/ploc_mpsoc.py
View File

@ -25,9 +25,8 @@ flash_write_file_dict = {
} }
mpsoc_file_dict = { mpsoc_file_dict = {
"1": ["0:/EM16/231", "0:/EM16/231"],
MANUAL_INPUT: ["manual input", ""], MANUAL_INPUT: ["manual input", ""],
"2": ["/tmp/flash_write", "/tmp/flash_write.bin"], "2": ["0:/EM16/231", "0:/EM16/231"],
} }
@ -41,15 +40,12 @@ class CommandIds(enum.IntEnum):
TC_REPLAY_WRITE_SEQUENCE = 13 TC_REPLAY_WRITE_SEQUENCE = 13
TC_DOWNLINK_PWR_ON = 14 TC_DOWNLINK_PWR_ON = 14
TC_DOWNLINK_PWR_OFF = 15 TC_DOWNLINK_PWR_OFF = 15
<<<<<<< HEAD
OBSW_RESET_SEQ_COUNT = 50 OBSW_RESET_SEQ_COUNT = 50
=======
TC_MODE_REPLAY = 16 TC_MODE_REPLAY = 16
class MemAddresses(enum.IntEnum): class MemAddresses(enum.IntEnum):
DEADBEEF = 0x40000000 DEADBEEF = 0x40000000
>>>>>>> 6572a5df6169772b517f2de2f3e4a1ba8f6471f4
class PlocReplyIds: class PlocReplyIds: