Commit Graph

120 Commits

Author SHA1 Message Date
1527b60fd6
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 18:26:34 +02:00
bbe1e996e6 Merge pull request 'Host Fixes and CMakeLists.txt update' (#229) from mueller/host-fixes-fsfw-update into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #229
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:16:03 +02:00
2b33d8772c
fixes most warnings for host build
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-26 10:37:25 +02:00
1069762903
update config.h.in file
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-22 11:11:04 +02:00
737d18135f
test flag for RW
Some checks failed
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-22 11:09:06 +02:00
0da74f1bf9
bump submodules, add some more devices by default 2022-04-22 11:08:27 +02:00
4956161701
support both gps versions
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-19 17:47:05 +02:00
604870d1fe
split up op divider, assing imtq power switcher
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-12 15:27:48 +02:00
0fba9cbf7e
Merge remote-tracking branch 'origin/develop' into mueller/master
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-01 13:44:47 +02:00
053c65b6cd Merge remote-tracking branch 'origin/develop' into mueller/rpi-sus-port
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-31 16:42:52 +02:00
413f552639 improvements from sus test
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-31 16:16:01 +02:00
637941e089 important bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-31 14:40:42 +02:00
9f937781b7
Merge remote-tracking branch 'origin/develop' into mueller/rpi-sus-port
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-29 15:43:35 +02:00
Jakob Meier
44a0d4af61 removed te0720 code form q7s files
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-27 10:56:40 +02:00
Jakob Meier
ceb7f40d35 fixed merge conflicts
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-27 10:44:32 +02:00
Jakob Meier
471a981ccf mpsoc flash write command 2022-03-26 20:47:25 +01:00
2410c6ccc6
added SUS component creation to RPi
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-26 16:38:42 +01:00
243af65ca6
fix compile warnings for RPI build
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-26 14:08:34 +01:00
ac0326a944
various improvements
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-26 13:54:05 +01:00
Jakob Meier
47a3804145 fixed conflicts
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-26 10:41:30 +01:00
1c7601aa1c
set test flag for rad sensor to 0
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-22 14:31:24 +01:00
e5a4065055
add and instantiate SUS ASS + SUS FDIR
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-17 19:59:47 +01:00
Jakob Meier
8d70560968 fixed conflicts 2022-03-17 19:52:37 +01:00
Jakob Meier
9dc124004d build configuration for trenz te0720-1cfa 2022-03-17 14:28:32 +01:00
4fef5781a8
small fix in power state machine 2022-03-17 10:48:35 +01:00
3c1055f988
.h.in file fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-17 10:22:53 +01:00
72acab599a
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-17 10:17:04 +01:00
40d9829700 Major update for power handling
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
and various smaller updates
2022-03-16 20:13:21 +01:00
8e3f40a780
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-14 17:48:20 +01:00
Jakob Meier
9fc1e57943 fixed conflicts 2022-03-14 14:35:07 +01:00
Jakob Meier
d99825e20e core housekeeping 2022-03-13 16:32:40 +01:00
e678b53452
switch initialization is now optional (default on)
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 15:55:26 +01:00
32def71502
first version of ACS board ASS working
Some checks failed
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
0904cadde5
continued ACS board assembly 2022-03-04 18:12:16 +01:00
4eb948c5ef
start acs task
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-04 16:03:57 +01:00
3b1f088596
use OSAL define instead of dedicated define
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
2022-03-01 17:57:48 +01:00
Jakob Meier
e61dfc0401 fixed conflicts 2022-02-25 14:39:18 +01:00
9f60c82725
intermediate PR
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-23 19:26:02 +01:00
91e0e9f233 Merge branch 'develop' into mohr/startracker
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Conflicts:
	CMakeLists.txt
	cmake/PreProjectConfig.cmake
	linux/fsfwconfig/events/translateEvents.cpp
2022-02-16 15:21:24 +01:00
Jakob Meier
685b9cd1fb fixed conflicts 2022-02-11 15:09:45 +01:00
Jakob Meier
328a3b2d02 define fix
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-08 13:11:54 +01:00
Jakob Meier
92eb403e35 egse define fiX
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-08 13:09:50 +01:00
Jakob Meier
4823496b58 fixed conflicts 2022-02-08 10:34:23 +01:00
Jakob Meier
bb8ccd2842 fixed conflicts 2022-02-05 16:17:01 +01:00
Jakob Meier
b4d1046928 obsw configuration running on egse 2022-02-05 15:39:16 +01:00
Jakob Meier
e67bcd4e26 setup egse project 2022-02-05 13:19:20 +01:00
c42b3f56c3
applied clang-format
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-04 17:48:05 +01:00
a77d5f3669
tested cfg set request
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 15:31:18 +01:00
9bf3e46e3c
tested some commands
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 15:03:35 +01:00
e142408bb8
bpx handler now working
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 13:37:48 +01:00