b52aca643f
Merge remote-tracking branch 'origin/develop' into mueller/master
2021-08-04 13:16:59 +02:00
fcf2e363d8
Merge pull request 'meier/plocSupervisorHandler' ( #73 ) from meier/plocSupervisorHandler into develop
...
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #73
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2021-08-04 13:00:27 +02:00
Jakob.Meier
acca10cc34
Merge branch 'develop' into meier/plocSupervisorHandler
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-04 10:21:31 +02:00
Jakob.Meier
c431deede0
ploc udpdater wip
2021-08-04 10:20:36 +02:00
15c7493584
Merge pull request 'Reboot Feature' ( #72 ) from mueller/reboot-feature into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #72
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-08-04 10:03:13 +02:00
addddb4342
Merge branch 'develop' into mueller/reboot-feature
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2021-08-03 18:35:34 +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
59c4ed74e0
minor bugfix
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-03 11:21:28 +02:00
f8f0032d1e
reboot feature finished
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-03 11:18:24 +02:00
Jakob.Meier
ba51ca58f3
tmtc update
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-08-02 15:58:17 +02:00
Jakob.Meier
9de28fdfc9
tmtc update
2021-08-02 15:57:14 +02:00
Jakob.Meier
aeecf33763
supervisor added debug TCs
2021-08-02 15:28:57 +02:00
d6d60249c1
Merge pull request 'FSFW Gen and Build Scripts Update' ( #71 ) from mueller/fsfwgen-update into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #71
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-08-02 13:11:36 +02:00
9edd6fc3be
supplying project string now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2021-08-02 13:02:50 +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
528b3c8610
updated object file generator
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-02 11:49:00 +02:00
fe0a4844aa
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-02 11:44:00 +02:00
4b4cfc09c5
update fsfwgen
2021-08-02 11:43:49 +02:00
Jakob.Meier
340ca0618c
supervisor mram dump
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-01 17:11:32 +02:00
0b1b74e879
renamed cmake var, updated all shell scripts
EIVE/eive-obsw/pipeline/head This commit looks good
2021-07-31 19:31:04 +02:00
Jakob.Meier
72533f1d14
updated tmtc
2021-07-31 08:54:49 +02:00
298a87d349
Merge pull request 'Added OBSW Watchdog' ( #67 ) from mueller/added-watchdog into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #67
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-31 08:51:55 +02:00
Jakob.Meier
926e1e336a
mram dump reply
2021-07-31 08:32:57 +02:00
503d5923c4
making some stuff optional
EIVE/eive-obsw/pipeline/head This commit looks good
2021-07-30 16:40:24 +02:00
8c3d25f62d
updated README
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2021-07-29 19:43:00 +02:00
d8acf94a02
more corrections
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-07-29 18:33:15 +02:00
940d4965bc
small corrections
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-07-29 18:32:02 +02:00
df971d4ec5
dont need csp lib in watchdog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-07-29 18:21:05 +02:00
b4447b6d8c
Merge branch 'mueller/added-watchdog' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/added-watchdog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-07-29 18:17:25 +02:00
208aeb6640
added build scripts, updated proj files
2021-07-29 18:17:14 +02:00
bc1d236a85
Merge branch 'develop' into mueller/added-watchdog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-07-29 18:10:26 +02:00
34d3479e81
various bugfixes and improvements
2021-07-29 18:09:54 +02:00
dba620baf2
various bugfixes, watchdog working now
2021-07-29 17:21:27 +02:00
c9da184b7f
Merge pull request 'first steps in CI integration' ( #66 ) from mohr_ci into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #66
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2021-07-29 16:45:12 +02:00
ff86c8af73
watchdog handling finished
2021-07-29 16:31:04 +02:00
983ce045a9
continued
2021-07-29 13:07:07 +02:00
4fbfbe8bb8
cleanCI
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2021-07-29 12:38:24 +02:00
12be969ca2
jenkins seems to overwrite out PATH
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-07-29 12:34:01 +02:00
93fa82c413
copy pasted wrong cmake line
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-07-29 12:23:17 +02:00
6c8336bcfe
something's broken with the automatic docker build, reverting change, will look into it later
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-07-29 12:20:02 +02:00
af6f24d668
forcing docker build #2
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-07-29 12:18:32 +02:00
acaf87095a
forcing docker build
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-07-29 12:17:30 +02:00
afb7a2008f
typo in Jenkinsfile
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-07-29 12:14:37 +02:00
6361fcb6bb
added Jenkinsfile, moved together with Dockerfile into automation folder
...
EIVE/eive-obsw/pipeline/head There was a failure building this commit
having the automation files in an empty folder accelerates docker build.
Also, I think these files are not related to the source code and as such should live in their own space
2021-07-29 12:06:14 +02:00
55727accf5
minor tweaks
2021-07-29 11:59:32 +02:00
59bcf6cec2
added eive-watchdog
2021-07-29 11:35:20 +02:00
Jakob.Meier
6cd4f6cfe3
ploc supervisor mram dump
2021-07-29 09:21:33 +02:00
664f8e84b9
Merge pull request 'RTD update and TCP server in hosted build' ( #65 ) from mueller/staging-rtd-update-hosted-tcp into develop
...
Reviewed-on: #65
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-29 09:07:50 +02:00
190590e1b5
new conf option
2021-07-28 20:11:22 +02:00
