Commit Graph

357 Commits

Author SHA1 Message Date
Jakob Meier
9fc1e57943 fixed conflicts 2022-03-14 14:35:07 +01:00
819f5f3680 Merge remote-tracking branch 'origin/develop' into mueller/master 2022-03-14 09:39:13 +01:00
4415cb4eda
make SW more robust 2022-03-14 09:38:58 +01:00
Jakob Meier
27063f102b initialization of core pool variables
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-13 18:29:14 +01:00
Jakob Meier
d99825e20e core housekeeping 2022-03-13 16:32:40 +01:00
47beaad58c
Merge branch 'mueller/system-subsystems' into mueller/master 2022-03-11 14:34:10 +01:00
1742371c14
created new dual lane assembly base
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-10 10:54:27 +01:00
03aba8b080
fixes where FSFW version is used
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-10 10:04:26 +01:00
406f44ae26
update for version handling
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-09 19:26:49 +01:00
62348bb37d
reworked fsfw version handling
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-09 19:05:54 +01:00
b66b1e0fff
use new version getter function 2022-03-08 10:17:24 +01:00
a1ea5db4f0
improved preproc handling in obj factory
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 15:27:21 +01:00
f83153934c
command init switch state
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 14:46:46 +01:00
970b8c33e5
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 11:35:28 +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
e7c0066d5d
added last small fixes for successfull compilation
Some checks are pending
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
fe7394bded Merge branch 'develop' into mueller/system-subsystems
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-04 14:53:58 +01:00
74c1bba814
doge
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-03 19:21:56 +01:00
ff0da65662
started SUS assembly
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
fixes for PCDU code and switcher list handling
2022-03-03 15:37:36 +01:00
66ece6544e Merge remote-tracking branch 'origin/develop' into mueller/reboot-file-handling 2022-03-01 15:22:43 +01:00
be122038ed
small but important bugfix
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-01 14:56:19 +01:00
84367f8424
small tweak
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-01 14:51:12 +01:00
e1112f1903
extension for additional safety
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-01 14:44:50 +01:00
4a5ad4fb4d
updated OBSW code 2022-03-01 13:34:12 +01:00
165e6e829e
bugfix by inspection
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-28 20:24:40 +01:00
0d1ff8585c
various bugfixes from unittest
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-28 19:52:43 +01:00
d4dcd8c03f
added missing command
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-28 16:55:49 +01:00
8e8fe3d0c9
some more fixes
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-28 16:48:13 +01:00
8c2c402821
continued tests, first fixes
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-28 16:47:36 +01:00
a2bc72a798
improved mount logic, create conf folder is missing
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-28 16:35:16 +01:00
54640147c1
GPIO hal update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-28 15:47:34 +01:00
042acc1a23
reboot logic unittest init
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-28 14:13:31 +01:00
ba68c80d6b
Merge remote-tracking branch 'origin/develop' into mueller/reboot-file-handling
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-28 13:29:22 +01:00
Jakob Meier
f88674ed59 applied clang formatting 2022-02-27 15:48:42 +01:00
Jakob Meier
e61dfc0401 fixed conflicts 2022-02-25 14:39:18 +01:00
3a6c7e3183
separate branch for reboot file handling
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-25 11:34:42 +01:00
39f4ef6ccb
remove faulty include
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-25 11:21:34 +01:00
cca0d5735e
Merge remote-tracking branch 'origin/develop' into mueller/move-deply-handler
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-25 11:18:35 +01:00
33ff05c558
Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-prep
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-24 23:46:06 +01:00
e01f2a8947 Merge branch 'develop' into mueller/move-deply-handler
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 17:37:46 +01:00
5bf4e50849
clean up includes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 12:02:23 +01:00
3edf7572b6
order
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-24 11:58:11 +01:00
768bb14842
minor tweaks
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 11:57:35 +01:00
0b215bf7e0
use radfet enable pin now
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 11:47:32 +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
7ae2d7117e
deleted former file ,inc fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-23 19:12:41 +01:00
10e2600415
moved gps handler and deployment handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-23 19:08:12 +01:00
2551e673d8 Merge pull request 'adaptions to updated fsfw' (#150) from mueller/pass-mq-args into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #150
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-23 18:48:16 +01:00
d5b22ca636 small fix in obj factory
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-22 20:50:56 +01:00
f5c1263dd3 now it compiles
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-22 20:47:09 +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
50cf01376f Merge branch 'develop' into mohr/cmake
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2022-02-10 16:22:28 +01:00
4d154b7cee reworked cmake, unfortunately a big one due to interdependence
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
- /mission is a library now, in preparation of unittests (which bring their own main)
- eive-simple is now only available in bsp=arm/q7s (but is still not compiling)
- watchdog and simple are their own executables, not configurations any more
- moved some q7s specific code into /bsp-q7s to flatten if-hierarchy in main CMakeLists.txt
- compiler and linker options are not globally applied to all targets
- linux is the default fsfw osal now, as current code does not compile on hosted
2022-02-09 21:38:56 +01:00
Jakob Meier
83d99a6662 run clang format script 2022-02-05 18:08:54 +01:00
Jakob Meier
68d56c4cd3 star tracker files moved to linux directory 2022-02-05 18:06:18 +01:00
Jakob Meier
bb8ccd2842 fixed conflicts 2022-02-05 16:17:01 +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
9456dc1a00
applied auto-formatter
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 16:04:24 +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
344390da14
bugfixes 2022-02-03 12:02:25 +01:00
988a5e6b31
battery handler not created
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-02 17:36:40 +01:00
dd822f9c44
apply clang script
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-02 13:09:46 +01:00
d6e256a5d2
Merge branch 'mueller/master' into mueller/bpx-handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-02 13:09:23 +01:00
9cdc67ad6c Merge remote-tracking branch 'origin/develop' into mueller/master 2022-02-02 09:43:58 +01:00
4050521e5a
added GNSS select pin
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-01 11:17:00 +01:00
Jakob Meier
bae1ea7c97 str helper progress print 2022-02-01 10:45:07 +01:00
Jakob Meier
1651926efa applied clanf formatting
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-31 08:09:58 +01:00
Jakob Meier
c1726f897b dynamic switching of cadu data sample time and clock manipulation
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-30 17:16:17 +01:00
Jakob.Meier
6be7cb4d0c some adaptions to new firmware
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-28 12:43:26 +01:00
b1e716788a
renamed GPS controller
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 18:29:31 +01:00
8ee3e18327
updatre q7s-cp utility
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 17:30:28 +01:00
3207d25bd3 weird errors when going to normal mode
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 16:04:45 +01:00
521b47d9fc decoupled IMTQ handler from OBSWConfig.h
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 15:29:58 +01:00
26d66d2a36 issues with IMTQ
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 15:26:07 +01:00
5c535784e9
added back old GPS handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-26 17:59:31 +01:00
bf73a2e442
increased the stack size for the GPS controller
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-26 17:52:28 +01:00
9998b54f89
hyperion handler working now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-26 16:35:42 +01:00
604424c7ed
Merge remote-tracking branch 'origin/develop' into mueller/master
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-26 16:00:22 +01:00
Jakob Meier
102385a707 introduced axi configuration interface for ptme ip core
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-25 18:55:52 +01:00
Jakob Meier
38a1b496e7 papb interface no longer a system object 2022-01-25 14:33:06 +01:00
Jakob Meier
a07468f7b7 introduced uio mapper class 2022-01-24 16:33:22 +01:00
Jakob Meier
a56224c339 ptme axi interface
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-24 07:43:14 +01:00
b3ca5ac6f2
Merge remote-tracking branch 'origin/mueller/pcdu-switch-callback' into mueller/master
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:42:54 +01:00
c35c94f22b Merge branch 'mueller/master' into mueller/bpx-handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:28:38 +01:00
c9787f8e47 Merge remote-tracking branch 'origin/develop' into mueller/master
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:27:37 +01:00
68eb7c9271 removed clang script in root
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:11:35 +01:00
1eb6017a9d callback working
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:05:17 +01:00
f948905aa2 implemented first switch callback
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 17:10:51 +01:00
dc6a2ffe56
minor ADIS updates
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 14:08:30 +01:00
a50f852b9d
Merge remote-tracking branch 'origin/develop' into mueller/clang-formatting-applied
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 11:52:06 +01:00
50e17bc160 disabled acs task, crashes..
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-18 14:20:18 +01:00
77c45c0de9
applied formatting
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-01-17 15:58:27 +01:00
Jakob Meier
870dd717e4 tmtc update
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-01-17 15:48:13 +01:00
ce6c9d4613
Merge remote-tracking branch 'origin/develop' into mueller/gps-tests
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-01-17 15:38:44 +01:00
3a274e7a9b
apply clang format
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-17 15:35:46 +01:00