a9a6bbd948
fixed conflicts
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-28 10:10:01 +02:00
Jakob Meier
758c4e6f4f
uart isolator switch handling
2022-03-28 09:08:11 +02:00
Jakob Meier
e2c9bece05
adding uart isolator switches wip
2022-03-27 14:42:20 +02:00
Jakob Meier
6d04c278c3
run clang formatting script
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-27 13:07:18 +02:00
Jakob Meier
44a0d4af61
removed te0720 code form q7s files
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
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
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
ac0326a944
various improvements
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-26 13:54:05 +01:00
Jakob Meier
47a3804145
fixed conflicts
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-26 10:41:30 +01:00
2f6d9ab7f1
fixed merge conflicts
2022-03-25 18:49:34 +01:00
4bf0521a5d
increased pl pcdu debug divider
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-25 17:02:21 +01:00
74fa98d161
add dual lane power switcher for PL PCDU
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-25 15:56:44 +01:00
931c53f1a6
corrections during e-band test
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-25 12:57:42 +01:00
6e91462cba
better rtd printout
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-23 15:02:48 +01:00
1cd98c5604
Merge remote-tracking branch 'origin/mueller/tcs-subsystem' into mueller/master
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-23 13:39:25 +01:00
4afacbe82b
new system ctl task
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-22 19:15:13 +01:00
5b7dd7c432
assign rtd fdir , create TCS BOARD ASS
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-22 19:10:28 +01:00
1d712854bf
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-22 17:59:05 +01:00
ce8253b940
TCS subsystem continued
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-22 15:49:22 +01:00
bcd97076e1
started TCS subsystem
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-22 11:57:48 +01:00
c95374bfbd
refresh events, objects, retvals
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-22 10:15:04 +01:00
a18a752b8e
rerun generators
2022-03-18 11:37:44 +01:00
Jakob Meier
253e2731bd
only include lxiphos when building for q7s
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-18 06:45:40 +01:00
e5a4065055
add and instantiate SUS ASS + SUS FDIR
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
acd0307591
continued ACS board + SUS board assemblies
...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- Handling and Testing of basic FDIR
2022-03-17 19:23:39 +01:00
4fef5781a8
small fix in power state machine
2022-03-17 10:48:35 +01:00
e23687dd66
apply auto-formatter
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-17 10:20:39 +01:00
1c5c15bdc7
Merge remote-tracking branch 'origin/mueller/system-subsystems' into mueller/master
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-17 10:20:13 +01:00
72acab599a
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-17 10:17:04 +01:00
c212f0ad48
Obj Factory fixes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-17 10:04:51 +01:00
bbf3a4df91
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-16 19:56:39 +01:00
1edfc48acf
small form changes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-16 18:45:11 +01:00
Jakob Meier
b0b2854d44
added ploc helper objects
2022-03-16 17:00:07 +01:00
Jakob Meier
f8f7848200
run generator scripts
2022-03-14 18:43:16 +01:00
08a1101000
use develop Object Factory
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-14 17:55:02 +01:00
197d1a4ce0
update obsw.cpp file
EIVE/eive-obsw/pipeline/head Build started...
2022-03-14 17:53:48 +01:00
0063ce0ccd
update FSFW and related version handling
2022-03-14 17:52:31 +01:00
8e3f40a780
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-14 17:48:20 +01:00
1a0f9164ef
Add Latchup print commands
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-14 14:46:26 +01:00
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
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-10 10:04:26 +01:00
406f44ae26
update for version handling
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
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
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
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
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
...
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
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
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
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-04 14:53:58 +01:00
74c1bba814
doge
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
...
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
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-01 14:56:19 +01:00
84367f8424
small tweak
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
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
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
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
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
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
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
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
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-28 15:47:34 +01:00
042acc1a23
reboot logic unittest init
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
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
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
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
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 17:37:46 +01:00
5bf4e50849
clean up includes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 12:02:23 +01:00
3edf7572b6
order
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 11:57:35 +01:00
0b215bf7e0
use radfet enable pin now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 11:47:32 +01:00
9f60c82725
intermediate PR
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
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
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
...
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
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
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
...
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
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
...
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