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
b722b15b26
changed target name for egse bsp
2022-02-16 15:06:02 +01:00
6ddd2e4759
Merge pull request 'minor gps fixes' ( #139 ) from mueller/minor-gps-fixes into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #139
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-15 16:12: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
3a6dcdc78e
Merge pull request 'Reworked cmake' ( #136 ) from mohr/cmake into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #136
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-02-15 15:53:10 +01:00
Jakob Meier
583ab285d8
tmtc update
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-14 16:53:01 +01:00
Jakob Meier
88a9f8f8de
introduced current program check
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-14 16:42:04 +01:00
Jakob Meier
7adff2c9a8
firmware update wip
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-14 11:28:15 +01:00
Jakob Meier
685b9cd1fb
fixed conflicts
2022-02-11 15:09:45 +01:00
Jakob Meier
e3f36ddcfb
tmtc update
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-11 08:47:06 +01:00
Jakob Meier
b1973f77f7
integrated log level, log suscription and debug camera parameter setting in startup routine
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-11 08:24:35 +01:00
Jakob Meier
1e40013210
arcsec lib update
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-11 07:34:55 +01:00
Jakob Meier
3c17ba5cc7
Merge branch 'meier/startrackeregse' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/startrackeregse
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-02-10 18:39:50 +01:00
Jakob Meier
c9e5fbc361
all parameter requests implemented
2022-02-10 18:39:37 +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
e59a98f11c
removed q7s/watchdog and q7s/simple configurations scripts, as there is no special configuration needed any more
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-10 15:28:12 +01:00
00042af77c
updated README to cmake changes
2022-02-10 15:27:03 +01:00
Jakob Meier
ac49f3f72b
Merge branch 'meier/startrackerRoofTest' into meier/startrackeregse
2022-02-10 11:47:50 +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
07e68bd05b
param request wip
2022-02-09 19:46:12 +01:00
Jakob Meier
a65072b743
changed egse default config to ground
2022-02-09 19:27:08 +01:00
Jakob Meier
3035aea885
wip parameter requests
2022-02-09 19:20:19 +01:00
20f091d54e
Merge pull request 'SCEX test code' ( #135 ) from mueller/scex-test-code into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #135
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-09 14:24:49 +01:00
60d43246d4
link to egse sysroots
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-09 13:34:24 +01:00
7005314d4b
apply clang-format
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-09 12:07:29 +01:00
0108a913e6
ping test working
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-08 17:23:02 +01:00
a3092e57e4
readme running obsw on egse
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-08 16:36:33 +01:00
Jakob Meier
cfce44ca3a
change default name of json file
2022-02-08 16:01:06 +01:00
fb6b5b9e46
bugfixes for test code
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-08 15:58:17 +01:00
00eeeade3f
some fixes for updates q7s-cp script
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-08 15:09:46 +01:00
acfd6bfd5e
Merge remote-tracking branch 'origin/mueller/update-q7s-script' into mueller/scex-test
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-08 15:00:28 +01:00
1fa0e3f9c2
Merge remote-tracking branch 'origin/develop' into mueller/scex-test
2022-02-08 15:00:03 +01:00
90da51ed5a
q7s-cp can now copy to flatsat as well
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-08 14:59:33 +01:00
Jakob Meier
328a3b2d02
define fix
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
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-08 13:09:50 +01:00
c3e20d6a11
debugging
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-08 11:59:22 +01:00
Jakob Meier
4823496b58
fixed conflicts
2022-02-08 10:34:23 +01:00
0c086f9f15
Merge branch 'mueller/master' into mueller/scex-test
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-07 13:33:06 +01:00
632b8c7355
submodule updates
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-07 13:29:06 +01:00
470f0c05bf
Merge branch 'mueller/master' into mueller/scex-test
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-07 11:58:18 +01:00
826cb13c3e
update config.h.in
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-07 11:56:53 +01:00
Jakob Meier
191f3c3deb
moved toolchain path print out
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-02-07 09:47:12 +01:00
Jakob Meier
21593a4696
fsfw update
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-05 18:12:01 +01:00
Jakob Meier
e222be0534
added bsp_egse to clang format script
2022-02-05 18:09:55 +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
27e3e446e9
clean up egse build
2022-02-05 17:45:28 +01:00
Jakob Meier
3c4033f83c
update fsfw
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-02-05 17:19:28 +01:00
Jakob Meier
814f6caa43
cmake libgpiod define name changed
2022-02-05 17:19:00 +01:00
Jakob Meier
bb8ccd2842
fixed conflicts
2022-02-05 16:17:01 +01:00