Commit Graph

112 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
ee53485d4e update dev conf 2022-02-22 20:44:23 +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
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
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
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
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
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
969251d9fa
new ACS ctrl task
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-01-17 11:38:21 +01:00
Jakob Meier
e26ffb6afd fpga download image command
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2021-12-29 20:33:20 +01:00
Jakob Meier
421866b739 str write command fix
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-12-21 17:28:24 +01:00
Jakob Meier
36d33711a7 flash write command 2021-12-21 15:46:09 +01:00
Jakob Meier
e3841d180e merged develop 2021-12-19 12:15:18 +01:00
Jakob Meier
5067519b8a fixed merge conflicts 2021-12-14 19:57:35 +01:00
5fadb8f86d
moved heater handler
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-12-14 17:35:21 +01:00
Jakob Meier
fac6996a15 star tracker limits setting 2021-12-06 19:36:21 +01:00
Jakob Meier
a7ab2bb93a str img loader wip 2021-12-02 08:05:33 +01:00
Jakob Meier
8c649b3e70 str image loader wip 2021-11-30 16:01:02 +01:00
Jakob Meier
077913400f star tracker image helper 2021-11-29 11:04:56 +01:00
1886c69e0b Merge remote-tracking branch 'origin/develop' into mueller/master
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-11-25 13:55:40 +01:00
Jakob Meier
b4479d6a7d ccsds handler class id
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-11-24 18:29:34 +01:00
0f3e9de2b0 Merge branch 'develop' into meier/pdec
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-11-09 23:01:20 +01:00
Jakob Meier
556a3986c1 pdec handler 2021-11-01 12:41:20 +01:00
Jakob Meier
b71ac25a77 changed spi of of RTDs
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-10-29 19:15:14 +02:00
46dcc18ddb
updated constants
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-18 18:23:26 +02:00
9ddea586ea
updated build scripts
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-10-18 18:15:39 +02:00
0237a22ae9
using old names again
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-13 15:42:55 +02:00
7c673d6e7f bugfixes in max31685, indexing adapted
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-12 17:55:36 +02: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
c5c7a895a4 fixed merge conflicts 2021-10-08 11:40:46 +02:00
Jakob Meier
18f7d3e3c9 tm now sent over PTME 2021-10-07 17:23:41 +02:00
Jakob Meier
7f70673625 Merge branch 'develop' into meier/ptme
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-04 15:07:58 +02:00
f61d0e83f0
refactoring for added unittests 2021-09-29 10:52:36 +02:00
5b6f091859
function in namespace now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-28 17:43:18 +02:00
6a00fd3099
fsfw update and call fix
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-28 17:41:02 +02:00
e5d0dac65e
tcpip components refactoring
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-28 14:58:12 +02:00
04d791824d
class IDs and subsystem IDs moved to framework
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-26 22:46:10 +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
ebb575d490 updated subversion
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-23 17:22:30 +02:00
0ccf062d51 transition delays
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-09-23 15:20:55 +02:00
Jakob Meier
d54e2276d6 ccsds handler wip 2021-09-22 16:54:55 +02:00
da45326150
bumped SW subversion
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-22 09:22:06 +02:00
Jakob Meier
e2c26efe4a Merge branch 'meier/gpioNaming' into meier/ptme 2021-09-20 19:11:22 +02:00
Jakob Meier
ddd8ff2180 ptme handling wip 2021-09-19 12:27:48 +02:00