Commit Graph

82 Commits

Author SHA1 Message Date
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
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
Jakob Meier
d91ceb6fa7 idented preprocessor define
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-01 11:47:04 +01:00
Jakob Meier
4edbbf223c firmware update wip 2022-02-01 11:45:22 +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
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
745526ce8a Merge pull request 'PCDU switch callback' (#128) from mueller/pcdu-switch-callback into develop
All checks were successful
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
1eb6017a9d callback working
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-19 18:05:17 +01:00
947134bfd1
reordered
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 14:39:39 +01:00
32236f9864
and another name
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 14:34:20 +01:00
eb23dc1b0f
better names
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-01-19 14:29:03 +01:00
5bd4f56bc6
flipped preproc defines
Some checks are pending
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
70ab486081
removed GPS flags 2022-01-15 13:50:21 +01:00
d8ec051e13
stuff
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-11 10:55:26 +01:00
Jakob Meier
e3841d180e merged develop 2021-12-19 12:15:18 +01:00
Jakob Meier
077913400f star tracker image helper 2021-11-29 11:04:56 +01:00
be75332be7 update event list
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-11-25 14:03:21 +01:00
Jakob Meier
542aa994b7 link state now detected by bit and carrier lock flags 2021-11-24 15:55:25 +01:00
Jakob Meier
345ccf5392 transmit enable and timeout 2021-11-22 18:01:16 +01:00
Jakob Meier
556a3986c1 pdec handler 2021-11-01 12:41:20 +01:00
221012f790
hosted build compiling again
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-10-11 19:34:34 +02:00
Jakob Meier
18f7d3e3c9 tm now sent over PTME 2021-10-07 17:23:41 +02:00
Jakob Meier
3ca18a42ad live tm variable
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-30 09:34:01 +02:00
Jakob Meier
55d31d0dc2 ccsds handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-29 14:47:20 +02:00
Jakob Meier
5b26564058 ptme ip core packet insertion 2021-09-26 08:29:30 +02:00
Jakob Meier
773627dc3d fixed merge conflicts 2021-09-25 11:57:33 +02:00
Jakob Meier
c035a26051 gpio open by line name test on te0720 2021-09-23 10:51:47 +02:00
e1ae1c021a made more spi devices optional
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-22 11:45:25 +02:00
Jakob Meier
e2c26efe4a Merge branch 'meier/gpioNaming' into meier/ptme 2021-09-20 19:11:22 +02:00
Jakob Meier
804afa5d96 add test code now default 0 2021-09-20 18:15:35 +02:00
Jakob Meier
38903f647b Merge branch 'develop' into meier/gpioNaming 2021-09-20 16:31:15 +02:00
Jakob Meier
cd92f4a611 open gpio by label test on te0720 2021-09-20 16:30:50 +02:00
Jakob Meier
ddd8ff2180 ptme handling wip 2021-09-19 12:27:48 +02:00
8dcd2f0c95 some cfg improvements
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-16 17:33:47 +02:00
00bafd98fe obsw config, gps update 2021-09-16 17:24:34 +02:00
df5b0a19de improved preprocessor defines
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-15 17:38:26 +02:00
146035de5a
Merge remote-tracking branch 'origin/develop' into mueller/master
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-02 09:14:28 +02:00