39c47a1abf
Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-08 09:44:38 +01:00
6ccf16f56d
enabled more GCC warnings
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-08 09:37:23 +01:00
a2fee43c8c
Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-07 15:44:18 +01:00
2ef1befb9c
common gpioIds.h file
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-07 15:29:27 +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
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
7f42de1c82
added PL PCDU code
2022-03-04 15:26:36 +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
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
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
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
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
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
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
ee53485d4e
update dev conf
2022-02-22 20:44:23 +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
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
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
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
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
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-24 07:43:14 +01:00
969251d9fa
new ACS ctrl task
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
45c7f9555d
flash write wip
2022-01-07 09:50:04 +01:00
Jakob Meier
996a8a226e
flash write wip
2022-01-06 18:05:21 +01:00
Jakob Meier
305e63cf4e
mpsoc flash fopen command
2022-01-05 11:26:01 +01:00
Jakob Meier
e26ffb6afd
fpga download image command
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
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
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
EIVE/eive-obsw/pipeline/head This commit looks good
2021-11-25 13:55:40 +01:00
Jakob Meier
b4479d6a7d
ccsds handler class id
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
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
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
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-18 18:23:26 +02:00
9ddea586ea
updated build scripts
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
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-13 15:42:55 +02:00
7c673d6e7f
bugfixes in max31685, indexing adapted
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-12 17:55:36 +02:00
221012f790
hosted build compiling again
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
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
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-28 17:43:18 +02:00
6a00fd3099
fsfw update and call fix
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-28 17:41:02 +02:00
e5d0dac65e
tcpip components refactoring
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
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
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-23 17:22:30 +02:00
0ccf062d51
transition delays
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
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
00bafd98fe
obsw config, gps update
2021-09-16 17:24:34 +02:00
bdd5a7dd21
more storage for events
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-15 18:50:23 +02:00
ed6ee02861
Merge remote-tracking branch 'origin/develop' into mueller/gnss-acs-update
2021-09-06 11:12:14 +02:00
74e4415d58
updated busConf file
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-09-02 20:04:41 +02:00
Jakob.Meier
0f79864446
ploc memory dumper complete
2021-08-31 11:20:21 +02:00
Jakob.Meier
89b68940be
ploc memory dumper wip
2021-08-29 07:31:34 +02:00
23782dc2fa
Device update
...
EIVE/eive-obsw/pipeline/head This commit looks good
1. Sun sensors added but can be disabled with preprocessor defines
2. GPS Handler
2021-08-20 14:08:11 +02:00
2f72b4e42a
cleaned up
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-17 19:50:48 +02:00
e98b985d66
cleaning up preproc defines
2021-08-17 17:48:51 +02:00
aa248b7997
new busConf file, cleaning up
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-17 17:11:59 +02:00
d714f84df8
bumped revision
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-09 18:30:20 +02:00
e92af98f34
moved q7s specific code to q7s folder
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-08-09 17:19:10 +02:00
3b915f4c97
Merge remote-tracking branch 'origin/develop' into mueller/master
2021-08-09 16:45:32 +02:00
1d714ff85e
Moved PLOC components to q7s folder
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-08-09 16:30:59 +02:00
6871cc597a
Merge remote-tracking branch 'origin/develop' into mueller/version-bump
2021-08-09 14:29:47 +02:00
f5f8df61ae
bumped subversion
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-08-09 11:27:08 +02:00
Jakob.Meier
dc3dfa1292
ploc updater
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-08-08 15:02:59 +02:00
Jakob.Meier
f64356d75e
ploc udpater wip
2021-08-05 16:37:39 +02:00
Jakob.Meier
0315a2a3d5
merged develop
2021-08-04 13:22:44 +02:00
Jakob.Meier
c431deede0
ploc udpdater wip
2021-08-04 10:20:36 +02:00
9790b395e6
include replacements
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-03 15:58:01 +02:00
3cc3786505
TCP default now, bugfixes in CoreController
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-08-03 15:29:45 +02:00
009234612a
updated retval list
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-08-02 12:50:36 +02:00
292bfaad16
readme extended
2021-07-26 14:23:22 +02:00
261fc8b58f
moved config flag to cmmon config
2021-07-26 13:51:00 +02:00
be6ae6b7ae
added TCP support
2021-07-26 11:33:38 +02:00
2554afd503
Merge remote-tracking branch 'origin/develop' into mueller/master
2021-07-24 15:13:56 +02:00
6d48f70269
all versions written to version.txt file now
2021-07-24 15:00:07 +02:00
8f070cdb44
subversion change
2021-07-23 18:31:53 +02:00
Jakob.Meier
a2e62b28c3
fixed merge conflicts
2021-07-23 17:48:11 +02:00
Jakob.Meier
80665a3cc5
fixed merge conflicts
2021-07-23 14:36:15 +02:00
20e8fc3400
cleaned up code a bit
2021-07-19 12:44:43 +02:00
b3dfbcf7fe
removed fsfw_hal
2021-07-15 19:06:57 +02:00
Jakob.Meier
ea2260a61d
few commands implemented for the ploc supervisor
2021-07-13 08:32:14 +02:00
55ada72a8f
bumped subversion
2021-07-09 17:55:09 +02:00
Jakob.Meier
4148a8c0bd
StarTrackerHandler wip
2021-07-07 12:12:01 +02:00
4a6cb9fa2f
fixed object id merge conflicts
2021-06-25 12:15:59 +02:00
b7ca1606f7
fixed merge conflicts
2021-06-24 18:01:09 +02:00
675cd29df3
added assembly index
2021-06-24 17:52:09 +02:00
a167b53096
moved some object ids
2021-06-24 16:49:36 +02:00
cd395aa9c4
updated object IDs again
2021-06-24 16:43:15 +02:00
32c23ae2de
update dev handler IDs
2021-06-24 16:39:46 +02:00
fe65099b58
added bus descriptors
2021-06-24 16:36:42 +02:00
ed0aafa543
updated object IDs
2021-06-24 16:17:38 +02:00
Martin Zietz
8284ebec9f
rw wip
2021-06-24 12:04:36 +02:00
56cabbc117
split up psts
2021-06-23 15:18:31 +02:00
33a55d7114
RwHandler first commands
2021-06-21 09:50:26 +02:00
61f3a3e1c6
fixed merge conflicts
2021-06-11 14:55:28 +02:00
ab8aaba0f4
using configuration files now
2021-06-08 17:04:28 +02:00
5144968ba5
added self test, untested
2021-06-04 16:45:54 +02:00
9f10f0a923
smaller corrections
2021-05-28 18:39:14 +02:00
6fa9b65345
compile failure
2021-05-27 14:04:33 +02:00
d075495628
added core controller stub
2021-05-26 14:16:16 +02:00
fbac40e9cd
test pst
2021-05-24 01:20:44 +02:00
d9abf60db1
fix for hosted bsp
2021-05-18 16:17:51 +02:00
bd5badb90d
updated all auto-generated files
2021-05-18 16:14:11 +02:00
3dca311baa
generated event translation files
2021-05-17 19:39:35 +02:00
2a0fcc49e0
bumped OBSW version
2021-05-17 17:07:34 +02:00
6f9a1853ff
host compiling again
2021-05-17 16:37:29 +02:00
41de3d1f00
common config files
2021-05-17 16:22:51 +02:00
3de0c72073
common versioning file
2021-04-11 12:25:23 +02:00
4291df77b1
moved some files
2021-03-04 18:29:28 +01:00
