eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller
2022-05-04 16:47:49 +02:00
parent 06df558be0 8315a03efc
commit 3458c272ad
79 changed files with 3269 additions and 1116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
generators/bsp_q7s_events.csv
View File

@ -80,6 +80,7 @@
11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a swithc state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
11303;0x2c27;FDIR_REACTION_IGNORED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;;mission/devices/HeaterHandler.h
11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;;mission/devices/HeaterHandler.h
11402;0x2c8a;SWITCH_ALREADY_ON;LOW;;mission/devices/HeaterHandler.h

1 2200 0x0898 STORE_SEND_WRITE_FAILED LOW fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
80 11300 0x2c24 SWITCH_CMD_SENT INFO Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index mission/devices/devicedefinitions/powerDefinitions.h
81 11301 0x2c25 SWITCH_HAS_CHANGED INFO Indicated that a swithc state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index mission/devices/devicedefinitions/powerDefinitions.h
82 11302 0x2c26 SWITCHING_Q7S_DENIED MEDIUM mission/devices/devicedefinitions/powerDefinitions.h
83 11303 0x2c27 FDIR_REACTION_IGNORED MEDIUM mission/devices/devicedefinitions/powerDefinitions.h
84 11400 0x2c88 GPIO_PULL_HIGH_FAILED LOW mission/devices/HeaterHandler.h
85 11401 0x2c89 GPIO_PULL_LOW_FAILED LOW mission/devices/HeaterHandler.h
86 11402 0x2c8a SWITCH_ALREADY_ON LOW mission/devices/HeaterHandler.h

1100
generators/bsp_q7s_returnvalues.csv
View File

File diff suppressed because it is too large Load Diff

7
generators/events/translateEvents.cpp
View File

@ -1,7 +1,7 @@
/**
* @brief Auto-generated event translation file. Contains 186 translations.
* @brief Auto-generated event translation file. Contains 187 translations.
* @details
* Generated on: 2022-05-02 12:40:32
* Generated on: 2022-05-04 16:46:54
*/
#include "translateEvents.h"
@ -87,6 +87,7 @@ const char *CHANGE_OF_SETUP_PARAMETER_STRING = "CHANGE_OF_SETUP_PARAMETER";
const char *SWITCH_CMD_SENT_STRING = "SWITCH_CMD_SENT";
const char *SWITCH_HAS_CHANGED_STRING = "SWITCH_HAS_CHANGED";
const char *SWITCHING_Q7S_DENIED_STRING = "SWITCHING_Q7S_DENIED";
const char *FDIR_REACTION_IGNORED_STRING = "FDIR_REACTION_IGNORED";
const char *GPIO_PULL_HIGH_FAILED_STRING = "GPIO_PULL_HIGH_FAILED";
const char *GPIO_PULL_LOW_FAILED_STRING = "GPIO_PULL_LOW_FAILED";
const char *SWITCH_ALREADY_ON_STRING = "SWITCH_ALREADY_ON";
@ -354,6 +355,8 @@ const char *translateEvents(Event event) {
return SWITCH_HAS_CHANGED_STRING;
case (11302):
return SWITCHING_Q7S_DENIED_STRING;
case (11303):
return FDIR_REACTION_IGNORED_STRING;
case (11400):
return GPIO_PULL_HIGH_FAILED_STRING;
case (11401):

2
generators/fsfwgen

Submodule generators/fsfwgen updated: 5ad9fb94af...169ad98cde

2
generators/objects/translateObjects.cpp
View File

@ -2,7 +2,7 @@
* @brief Auto-generated object translation file.
* @details
* Contains 117 translations.
* Generated on: 2022-04-08 14:13:35
* Generated on: 2022-05-04 16:46:54
*/
#include "translateObjects.h"

0
generators/system/__init__.py Normal file
View File

464
generators/system/eive-system.yml Normal file
View File

@ -0,0 +1,464 @@
# nml -> normal
# brd -> board
# ss -> subsystem
# ass -> assembly
# ctrl -> controller
# dh -> device handler
# dft -> default
# All uppermost system components are automatically subsystems
system:
eps:
pcdu:
id: 0x442000a1
acu:
id: 0x44250003
pdu1:
id: 0x44250001
pdu2:
id: 0x44250002
tcs:
tcs-ctrl:
tcs-brd-ass:
id: 0x73000003
acs:
acs-brd-ass:
id: 0x73000001
sus-brd-ass:
id: 0x73000002
acs-ctrl:
rw:
mgt:
str:
payload:
scex-dh:
ploc-ss:
cam-switcher:
pl-pcdu-dh:
com:
syrlinks-dh:
modes:
# If nothing is specified for a particular mode, use default configuration
default:
system:
# The power system is/should always be on. We can't even turn it off
eps: nml
pcdu: nml
acu: nml
pdu1: nml
pdu2: nml
tcs: nml
tcs-brd-ass: nml
tcs-ctrl: nml
payload: off
scex: off
ploc-ss: off
cam-ss: off
pl-pcdu-dh: off
com: nml
syrlinks-dh: nml
acs:
mgt: nml
acs-brd-ass: nml
sus-brd-ass: nml
detumble:
system:
acs: detumble
acs-ctrl: detumble
# Requires MGM and Gyros
rw: off
str: off
safe:
system:
acs: safe
acs-ctrl: safe
rw: off
str: off
submodes:
cold: 1
system:
# Inherit rest of mode table from default submode
tcs:
tcs-ctrl: heat
idle:
system:
acs: idle
acs-ctrl: idle
rw: nml
str: off
submodes:
charge: 1
system:
# Inherit rest of mode table from default submode
acs:
rw: off
target-gs:
system:
acs: target-pt
acs-ctrl: target-pt
rw: nml
str: nml
target-gs-pl-dac:
system:
acs: target-pt
acs-ctrl: target-pt
rw: nml
str: nml
payload: dac
cam-switcher: off
scex: off
ploc-ss: nml
pl-pcdu-dh: on
target-gs-pl-cam:
system:
acs: target-pt
acs-ctrl: target-pt
rw: nml
str: nml
payload: cam
cam-switcher: on
scex: off
ploc-ss: nml
submode: dac-off
pl-pcdu-dh: on
target-gs-pl-data:
system:
acs: target-pt
acs-ctrl: target-pt
rw: nml
str: nml
payload: pl-data
cam-switcher: off
scex: off
ploc-ss: nml
submode: dac-off
pl-pcdu-ss: on
earth-obsv:
acs: target-pt
acs-ctrl: target-pt
rw: nml
str: nml
payload: earth-obsv
cam-switcher: on
scex: off
ploc-ss: off
pl-pcdu-ss: off
scex:
acs: target-pt
acs-ctrl: target-pt
rw: nml
str: nml
payload: scex
cam-switcher: off
scex: on
ploc-ss: off
pl-pcdu-ss: off
sequences:
default:
acs:
off:
fallback: none
seq-id: off
target:
name: off-target
tab-id: 0x61000000
modes: ignore
trans:
0:
name: off-trans
tab-id: 0x61000001
modes:
acs-ctrl: off
acs-brd-ass: off
sus-brd-ass: off
rw: off
mgt: off
str: off
detumble:
seq-id: 1
target:
name: detumble-target
tab-id: 0x61000100
modes:
acs-ctrl: detumble
mgt: nml
sus-brd-ass: nml
acs-brd-ass: nml
rw: ignore
str: ignore
trans:
0:
name: detumble-trans-0
tab-id: 0x61000101
modes:
acs-ctrl: ignore
mgt: nml
rw: off
str: off
sus-brd-ass: nml
acs-brd-ass: nml
1:
name: detumble-trans-1
tab-id: 0x61000102
modes:
acs-ctrl: detumble
mgt: ignore
acs-brd-ass: ignore
sus-brd-ass: ignore
rw: ignore
str: ignore
safe:
seq-id: 2
target:
name: safe-target
tab-id: 0x61000200
modes:
acs-ctrl: safe
mgt: nml
acs-brd-ass: nml
sus-brd-ass: nml
rw: ignore
str: ignore
trans:
0:
name: safe-trans-1
tab-id: 0x61000201
modes:
acs-ctrl: ignore
mgt: nml
acs-brd-ass: nml
sus-brd-ass: nml
rw: off
str: off
1:
name: safe-trans-2
tab-id: 0x61000202
modes:
acs-ctrl: safe
mgt: ignore
acs-brd-ass: ignore
sus-brd-ass: ignore
rw: ignore
str: ignore
idle:
seq-id: 3
target:
name: idle-target
tab-id: 0x61000300
modes:
acs-ctrl: idle
mgt: nml
acs-brd-ass: nml
sus-brd-ass: nml
rw: nml
str: ignore
trans:
0:
name: idle-trans-0
tab-id: 0x61000301
modes:
acs-ctrl: ignore
mgt: nml
acs-brd-ass: nml
sus-brd-ass: nml
rw: nml
str: off
1:
name: idle-trans-1
tab-id: 0x61000302
modes:
acs-ctrl: idle
mgt: ignore
acs-brd-ass: ignore
sus-brd-ass: ignore
rw: ignore
str: ignore
idle-charge:
derive: idle
seq-id: 4
target:
name: idle-charge-target
tab-id: 0x61000400
modes:
acs-ctrl: idle
submode: charge
trans:
0:
name: idle-charge-trans-0
tab-id: 0x61000401
modes:
rw: off
1:
name: idle-charge-trans-1
tab-id: 0x61000402
modes:
acs-ctrl: idle
submode: charge
target-pt:
seq-id: 5
target:
name: target-pt-target
tab-id: 0x61000500
modes:
acs-ctrl: target-pt
mgt: nml
acs-brd-ass: nml
sus-brd-ass: nml
rw: nml
str: nml
trans:
0:
name: target-pt-trans-0
tab-id: 0x61000501
modes:
acs-ctrl: ignore
mgt: nml
acs-brd-ass: nml
sus-brd-ass: nml
rw: nml
str: nml
1:
name: target-pt-trans-1
tab-id: 0x61000502
modes:
acs-ctrl: target-pt
mgt: ignore
acs-brd-ass: ignore
sus-brd-ass: ignore
rw: ignore
str: ignore
payload:
off:
seq-id: 0
target:
name: off-target
tab-id: 0x70000000
modes: ignore
trans:
0:
name: off-trans-0
tab-id: 0x70000001
modes:
ploc-switcher: off
cam-switcher: off
scex-dh: off
ploc-ss: off
pl-pcdu-dh: off
dac:
seq-id: 1
target:
name: target-dac
tab-id: 0x70000100
modes:
ploc-switcher: on
cam-switcher: off
scex-dh: off
ploc-ss: dac
pl-pcdu-dh: nml
submode: all-on
trans:
0:
name: dac-trans-0
tab-id: 0x70000101
modes:
ploc-switcher: on
cam-switcher: off
scex-dh: off
ploc-ss: on
submode: dac-on
pl-pcdu-dh: ignore
cam:
seq-id: 2
target:
name: target-cam
tab-id: 0x70000200
modes:
ploc-switcher: on
cam-switcher: on
scex-dh: off
ploc-ss: on
submode: dac-off
pl-pcdu-dh: nml
submode: all-on
trans:
0:
name: cam-trans-0
tab-id: 0x70000201
modes:
ploc-switcher: on
cam-switcher: off
scex-dh: off
ploc-ss: on
submode: dac-off
pl-pcdu-dh: ignore
pl-data:
seq-id: 3
target:
name: target-pl-data
tab-id: 0x70000300
modes:
ploc-switcher: on
cam-switcher: off
scex-dh: off
ploc-ss: on
submode: dac-off
pl-pcdu-dh: nml
submode: all-on
earth-obsv:
seq-id: 4
target:
name: target-earth-obsv
tab-id: 0x70000400
modes:
ploc-switcher: on
cam-switcher: on
scex-dh: off
ploc-ss: on
submode: dac-off
pl-pcdu-dh: off
trans:
0:
name: trans-earth-obsv-0
tab-id: 0x70000401
modes:
ploc-switcher: on
cam-switcher: on
scex-dh: off
ploc-ss: on
submode: dac-off
pl-pcdu-dh: off
scex:
seq-id: 4
target: scex
name: target-scex
tab-id: 0x70000500
modes:
ploc-switcher: off
cam-switcher: off
scex-dh: on
ploc-ss: off
pl-pcdu-dh: off
trans:
0:
name: trans-scex-0
tab-id: 0x70000501
modes:
ploc-switcher: off
cam-switcher: off
scex-dh: on
ploc-ss: off
pl-pcdu-dh: off
system:
detumble:
seq-id: 0
target:
name: target-detumble
tab-id: 0x73000000
modes:
acs: detumble
tcs: nml
com: nml
payload: ignore
eps: nml