c4ed263e6c
Merge branch 'develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-04 14:52:12 +01:00
6c51553f71
Merge pull request 'ADIS Gyro Handler: Use OSAL define instead of dedicated define' ( #162 ) from mueller/adis-optimization into develop
...
Reviewed-on: #162
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 09:55:43 +01:00
b6de685ea2
Merge pull request 'Update for memory management' ( #159 ) from mueller/sdcman-mg into develop
...
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #159
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 09:55:06 +01:00
120153e9c7
added some missing acs board ass code
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-04 00:55:51 +01:00
0595e29100
finished most of sus handler
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-03 20:11:12 +01:00
a7c1dafce5
added mutex protection for power switches
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-03 19:39:36 +01:00
ebdd3914f4
added try catch for more safety
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-03 19:13:43 +01:00
63c4095d4d
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-03 15:50:31 +01:00
261b4a808d
completed switcher switch case
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-03-03 15:43:21 +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
714167f112
Merge remote-tracking branch 'origin/develop' into mueller/sdcman-mg
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2022-03-03 13:38:39 +01:00
5ce46beebf
Merge remote-tracking branch 'origin/develop' into mueller/adis-optimization
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-03 13:38:21 +01:00
c7183b730e
check children state on implementation
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-03 10:28:55 +01:00
5255e7d2ed
finished ACS board ASS
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-03 10:12:59 +01:00
5873371d36
continued acs board assembly
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-02 17:56:54 +01:00
f413ed6f7d
Merge branch 'mohr/buildfix' into mohr/catch2
2022-03-02 17:52:41 +01:00
2f51f58c7e
Merge branch 'develop' into mohr/catch2
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-02 17:12:24 +01:00
182b90ee6d
small fixes
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-03-02 17:04:58 +01:00
0b200cd296
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-02 15:09:14 +01:00
193e2bb0f9
Merge branch 'develop' into mueller/adis-optimization
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-01 17:58:53 +01:00
3b1f088596
use OSAL define instead of dedicated define
EIVE/eive-obsw/pipeline/head Build queued...
2022-03-01 17:57:48 +01:00
b8bd211d8e
updated API to take reference instead of pointer
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-01 17:52:39 +01:00
c23c36535c
Merge remote-tracking branch 'origin/develop' into mueller/sdcman-mg
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-01 17:51:05 +01:00
711732ccd6
Udated for memory management
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-03-01 17:41:58 +01:00
Jakob Meier
57b815c8ee
progress printer
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-01 17:17:15 +01:00
9597e3868c
separate branch for new system components
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-25 11:58:02 +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
e56532367f
check returnvalue
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-24 11:55:06 +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
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
a067014116
Merge branch 'develop' into mueller/rad-sensor-update
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-23 19:03:08 +01:00
fd85ab3122
Merge pull request 'ctor fix for srv5' ( #148 ) from mueller/srv5-ctor-fix into develop
...
Reviewed-on: #148
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-23 18:49:01 +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
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
e58c375cb9
moved and refactored sus handler
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-22 20:34:25 +01:00
d27a57ab28
adaptions to updated fsfw
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-22 20:27:13 +01:00
bf9f40aad3
update rad sensor
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-22 20:20:14 +01:00
9387fdce1c
ctor fix for srv5
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-22 20:17:15 +01:00
63ec6d3eae
add max1227 module
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-22 13:39:04 +01:00
8498a84354
important bugfix for ADIS handler
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-19 16:51:46 +01:00
Uli
62531a710f
Merge branch 'mohr/automation' into mohr/catch2
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-17 18:32:53 +01:00
4ea8ff9876
cleanup
2022-02-17 16:29:22 +01:00
208f417d17
minor gps fixes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-15 17:03:34 +01:00
e95647c572
working on thermal controller unit test.
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-14 16:17:42 +01:00
587e9451ea
some more fsfw objects and stubs for unittesting
2022-02-11 16:20:26 +01:00
f1249392cf
skeleton controller now unittested including fsfw. Still dirty WIP
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-10 18:54:09 +01:00
f9721eb1ae
unittesting a skeleton controller, still withouth fsfw
2022-02-10 18:29:28 +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
c42b3f56c3
applied clang-format
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-04 17:48:05 +01:00
4000c35299
added back more events
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 17:10:11 +01:00
39471d8261
added back some events
2022-02-03 17:06:40 +01:00
2cdd192eeb
fix decode error with imtq defintions
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 16:25:16 +01:00
9456dc1a00
applied auto-formatter
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 16:04:24 +01:00
3250a9f489
minor improvement, bugfix for reboot cmd
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 16:04:06 +01:00
a77d5f3669
tested cfg set request
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 15:31:18 +01:00
9bf3e46e3c
tested some commands
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-03 15:03:35 +01:00
e142408bb8
bpx handler now working
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
fea0b2bfe9
added debug printouts
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-02 17:53:07 +01:00
988a5e6b31
battery handler not created
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-02 17:36:40 +01:00
0067cac94d
created all pool entries for bpx handler
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-02 16:33:36 +01:00
89bbf98b4a
continued BPX handler
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-02 16:07:28 +01:00
d6e256a5d2
Merge branch 'mueller/master' into mueller/bpx-handler
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-02 13:09:23 +01:00
Jakob Meier
1651926efa
applied clanf formatting
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
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-30 17:16:17 +01:00
3207d25bd3
weird errors when going to normal mode
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 16:04:45 +01:00
c6f7281bc4
still need config include
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 15:37:48 +01:00
521b47d9fc
decoupled IMTQ handler from OBSWConfig.h
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 15:29:58 +01:00
5c535784e9
added back old GPS handler
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
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-26 17:52:28 +01:00
9998b54f89
hyperion handler working now
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
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
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-25 18:55:52 +01:00
Jakob Meier
a56224c339
ptme axi interface
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-24 07:43:14 +01:00
34a4904738
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-21 14:07:53 +01:00
745526ce8a
Merge pull request 'PCDU switch callback' ( #128 ) from mueller/pcdu-switch-callback into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #128
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-01-19 19:46:56 +01:00
b1667770fe
Merge branch 'mueller/pcdu-switch-callback' into mueller/master
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:51:58 +01:00
ded92fdf7a
call param callback twice
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:51:44 +01:00
b3ca5ac6f2
Merge remote-tracking branch 'origin/mueller/pcdu-switch-callback' into mueller/master
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
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
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:27:37 +01:00
4913ffa6d4
removed unrelated changes
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 18:21:17 +01:00
262837bf0b
Merge remote-tracking branch 'origin/develop' into mueller/pcdu-switch-callback
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:18:41 +01:00
c88371b37a
Merge remote-tracking branch 'origin/develop' into flipped-tmtctest-preproc-define
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:10:12 +01:00
1eb6017a9d
callback working
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:05:17 +01:00
79fac2adcb
callbacks are now allowed
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 17:17:06 +01:00
f948905aa2
implemented first switch callback
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 17:10:51 +01:00
32236f9864
and another name
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 14:34:20 +01:00
eb23dc1b0f
better names
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 14:29:03 +01:00
5bd4f56bc6
flipped preproc defines
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 14:17:55 +01:00
dc6a2ffe56
minor ADIS updates
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 14:08:30 +01:00
c1e04b286e
added missing pool entries
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-18 11:51:14 +01:00
2fe645375c
assign dataset
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-18 11:47:29 +01:00
d4bb5e3f18
Merge branch 'mueller/master' into mueller/gps-tests
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-18 11:45:34 +01:00
c9fe3294ac
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-18 11:44:19 +01:00
5cc7331e90
applied clang formatting
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-18 11:41:19 +01:00
d5a09dc280
added cfg HK
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-17 17:11:27 +01:00
fab259a2b5
added BPX HK set
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-17 16:44:20 +01:00
1d6f999ab6
added HK deserializer
2022-01-17 16:21:33 +01:00