48f972f7a2
Merge pull request 'v1.9.0' ( #175 ) from develop into main
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #175
2022-03-08 10:32:40 +01:00
b9c1523e81
bump version
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-08 10:28:07 +01:00
b6c34d11d2
Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop
EIVE/eive-obsw/pipeline/pr-main This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-08 10:26:00 +01:00
a73710088d
bump minor version
2022-03-08 10:25:47 +01:00
3dad3f311b
Merge branch 'main' into develop
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2022-03-08 10:25:01 +01:00
6b2d6609a3
fsfw update
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2022-03-08 10:24:36 +01:00
45dff6b920
Merge branch 'mueller/system-subsystems' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-08 10:17:35 +01:00
b66b1e0fff
use new version getter function
2022-03-08 10:17:24 +01:00
db1a4267bb
Merge branch 'develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-08 10:14:47 +01:00
7b4f45b082
Merge pull request 'enabled more GCC warnings' ( #174 ) from mueller/additional-gcc-warnings into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Reviewed-on: #174
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-08 10:12:47 +01:00
84dead546c
name fix
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-08 09:54:02 +01:00
124703aa99
Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems
2022-03-08 09:53:18 +01:00
d799e3768d
repoint tmtc
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build started...
2022-03-08 09:50:47 +01:00
e2ad666d07
Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-08 09:49:16 +01:00
10a2973dc7
minor update in fsfw
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-08 09:48:18 +01:00
39c47a1abf
Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-08 09:44:38 +01:00
6ccf16f56d
enabled more GCC warnings
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-08 09:37:23 +01:00
9ab8188034
Merge branch 'develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-08 08:53:10 +01:00
a145a868dc
Merge pull request 'move archive folder' ( #170 ) from mueller/move-archive-folder into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #170
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-08 07:51:26 +01:00
62229cb999
bugfixes for NORMAL to OFF transition
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 18:39:33 +01:00
597ab9c74c
update event list again
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 17:10:30 +01:00
b9139d5c40
update event list
2022-03-07 17:03:08 +01:00
d262b8ab8b
reattempt power switching at least once
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 16:47:15 +01:00
e678b53452
switch initialization is now optional (default on)
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 15:55:26 +01:00
ba5829a070
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 15:47:01 +01:00
a2fee43c8c
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 15:44:18 +01:00
7134401570
Merge branch 'develop' into mueller/move-archive-folder
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-07 15:39:12 +01:00
21d7d5b6f9
Merge pull request 'keeping unittests running' ( #173 ) from mohr/unittests into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #173
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-03-07 15:38:58 +01:00
afb1c875da
fsfw update
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 15:34:19 +01:00
2ef1befb9c
common gpioIds.h file
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 15:29:27 +01:00
a1ea5db4f0
improved preproc handling in obj factory
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 15:27:21 +01:00
b5660d582e
update switch initializer
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 14:56:21 +01:00
f83153934c
command init switch state
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 14:46:46 +01:00
b53900071c
subsystem ID bugfix
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 13:20:17 +01:00
4e8ce4eb0a
keeping unittests running
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 11:47:44 +01:00
d5c755a331
update events and objects
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 11:36:40 +01:00
970b8c33e5
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 11:35:28 +01:00
59b89b730d
bump fsfwgen dependency
2022-03-07 11:34:32 +01:00
debc72014a
regenerate object and events
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 11:08:50 +01:00
32def71502
first version of ACS board ASS working
...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
- Testes transition OFF to NORMAL for A side
- Refactored power switching so it can be used by SUS ass as well
- Generate events for sending switch command
- Generate event if switch state changes
- Deny Q7S switch commanding
2022-03-05 03:02:09 +01:00
cbb8103278
some more bugfixes
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-04 18:33:23 +01:00
0904cadde5
continued ACS board assembly
2022-03-04 18:12:16 +01:00
e1e6657b48
Merge pull request 'update for generator scripts' ( #171 ) from mueller/gen-update-formatter into develop
...
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #171
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 16:19:33 +01:00
909a0e1c16
Merge pull request 'Payload PCDU' ( #172 ) from mueller/plpcdu into develop
...
Reviewed-on: #172
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 16:18:54 +01:00
4eb948c5ef
start acs task
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-04 16:03:57 +01:00
bb99c195e9
fsfw update
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-04 15:33:18 +01:00
ffe1fd9af4
Merge branch 'mueller/plpcdu' into mueller/master
2022-03-04 15:33:08 +01:00
926888308d
Merge branch 'develop' into mueller/plpcdu
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-04 15:31:21 +01:00
e7c0066d5d
added last small fixes for successfull compilation
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2022-03-04 15:28:47 +01:00
7f42de1c82
added PL PCDU code
2022-03-04 15:26:36 +01:00