ec27521c35
Merge branch 'main' into develop
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-08-09 16:01:51 +02:00
cd7bc466ae
tmtc update
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
2021-08-09 15:53:48 +02:00
9fd0009c7b
Merge pull request 'bumped subversion for release' ( #77 ) from mueller/version-bump into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #77
2021-08-09 14:34:39 +02:00
74dbfae225
tmtc update
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2021-08-09 14:30:14 +02:00
6871cc597a
Merge remote-tracking branch 'origin/develop' into mueller/version-bump
2021-08-09 14:29:47 +02:00
6e22c3e017
Merge pull request 'Non Blocking SD Card Initialization' ( #75 ) from mueller/non-blocking-sd-card-init into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #75
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-08-09 14:18:49 +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
4a74a3ac37
API change fix
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-09 11:24:59 +02:00
444389a41c
Merge remote-tracking branch 'origin/develop' into mueller/non-blocking-sd-card-init
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2021-08-09 11:20:28 +02:00
f4ef0cb7ab
Merge pull request 'meier/plocUpdater' ( #76 ) from meier/plocUpdater into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #76
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2021-08-09 11:10:30 +02:00
f56c8ba1c0
minor fixes and additional printout
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-08-09 11:00:58 +02:00
Jakob.Meier
66f38daf56
typo in include of ploc updater
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-09 10:44:14 +02:00
Jakob.Meier
74dc04daeb
updated fsfw and tmtc
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
2021-08-08 16:18:49 +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
891ba6881b
reordered control operation
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-08-08 13:00:11 +02:00
02a837c964
tweaks for no-init variant
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-08 12:59:21 +02:00
8cdb877df6
removed endif block
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-08-08 12:50:45 +02:00
22d7af4b78
always perform state machine
...
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
in initAfterTaskCreation
2021-08-08 12:49:04 +02:00
0fecfab2f0
minor formatting changes
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
2021-08-08 12:46:24 +02:00
e05c52be85
always performing state machine now
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
2021-08-08 12:45:26 +02:00
ea56a5d536
includes reordered
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
2021-08-08 12:43:54 +02:00
106228c2ee
Merge branch 'mueller/non-blocking-sd-card-init' into mueller/master
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-08-08 12:43:17 +02:00
365fa0adc4
tweaks and fixes for state machine
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2021-08-08 12:43:02 +02:00
51dbc95750
fixes for NO_INIT code
2021-08-08 12:39:53 +02:00
a3eb6b2093
Merge remote-tracking branch 'origin/develop' into mueller/non-blocking-sd-card-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-08-08 12:37:45 +02:00
5045eeb867
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-08 12:37:26 +02:00
f50b9de4a5
extneded state machine for commanding support
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-08-08 01:24:18 +02:00
1c0ea5cbb1
tested hot redundant config as well
2021-08-08 00:37:07 +02:00
5a4d287f67
more testing and bugfixes
2021-08-08 00:11:21 +02:00
e186bff4e4
important bugfixes for core controller
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-07 18:52:36 +02:00
2fb54f7de9
first successfull tests
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-06 01:25:36 +02:00
f0e282c6e1
continued a bit
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-05 18:37:14 +02:00
05088ce02c
SDC manager and core controller refactoring
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-05 18:13:32 +02:00
Jakob.Meier
f64356d75e
ploc udpater wip
2021-08-05 16:37:39 +02:00
7f327c3900
bugfixes for sdc manager
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-05 16:02:35 +02:00
8104ac0df8
using new command executor
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-05 15:43:19 +02:00
1cfb9250fa
SDC manager non-blocking mode
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-05 10:14:17 +02:00
Jakob.Meier
0315a2a3d5
merged develop
2021-08-04 13:22:44 +02:00
0c13c32e82
Merge pull request 'Include corrections, correct tmtc branch' ( #74 ) from mueller/master into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #74
2021-08-04 13:21:11 +02:00
Jakob.Meier
2700d4d28c
ploc updater wip
2021-08-04 13:20:28 +02:00
3a88a43505
tmtc update
EIVE/eive-obsw/pipeline/pr-develop Build queued...
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-04 13:18:09 +02:00
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
125593be21
reading chip and copy works
2021-07-28 19:46:19 +02:00
Jakob.Meier
4f3a680a07
updated tmtc
2021-07-28 19:38:54 +02:00
Jakob.Meier
f4b67945cc
wipe mram command
2021-07-28 19:34:10 +02:00
fc769be789
updated cp script
2021-07-28 18:56:36 +02:00
b846a936b4
README update
2021-07-28 18:50:50 +02:00
1e6ea91438
README update
2021-07-28 18:43:11 +02:00
1a4f907925
moved sd card init, more functions static now
2021-07-28 17:48:08 +02:00
c0b91a4879
added functions to get current boot copy
2021-07-28 16:37:08 +02:00
dd61af5bb3
tmtc update
2021-07-28 15:28:51 +02:00
d511903872
tmtc update
2021-07-28 15:24:48 +02:00
Jakob.Meier
50ca738d5c
select nvm command
2021-07-28 11:55:16 +02:00
Jakob.Meier
3d39ddf85c
copy adc data to mram command
2021-07-28 11:08:40 +02:00
Jakob.Meier
14cd3e9eea
supervisor handler get latchup status report
2021-07-28 08:38:36 +02:00
Jakob.Meier
03a601d450
auto calibrate alert and enable/disable latchup alert
2021-07-27 12:02:30 +02:00
Jakob.Meier
bd9dbc5fc8
ploc supervisor watchdog configure timeout command
2021-07-26 19:56:00 +02:00
3824daa865
tmtc update
2021-07-26 18:00:14 +02:00
6625d562e9
tmtc update
2021-07-26 17:55:45 +02:00
0abc854567
tmtc update
2021-07-26 17:29:59 +02:00
2a5cc62af7
tmtc update
2021-07-26 17:25:11 +02:00
Jakob.Meier
6506baa7b6
ploc supervisor watchdogs enable command
2021-07-26 16:30:20 +02:00
292bfaad16
readme extended
2021-07-26 14:23:22 +02:00
f7ac382498
fixes for host build
2021-07-26 14:00:15 +02:00
96c9069a69
new pool entry for rtd value
2021-07-26 13:56:53 +02:00
5018b24cfc
storing RTD value now as well
2021-07-26 13:55:58 +02:00
261fc8b58f
moved config flag to cmmon config
2021-07-26 13:51:00 +02:00
590d5e11e1
tmtc update
2021-07-26 13:41:45 +02:00
a2079ffb8c
Merge pull request 'meier/plocSupervisorHandler' ( #64 ) from meier/plocSupervisorHandler into develop
...
Reviewed-on: #64
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2021-07-26 13:40:43 +02:00
Jakob.Meier
dc73036c7a
udp server port in UpdTmTcBridge
2021-07-26 12:24:21 +02:00
Jakob.Meier
f0dc1279c4
merged develop
2021-07-26 12:13:00 +02:00
Jakob.Meier
01a02f896f
ploc supervisor update available cmd, wip
2021-07-26 12:08:38 +02:00
7eb57d4027
Merge pull request 'Added TCP support' ( #63 ) from mueller/added-tcp-support into develop
...
Reviewed-on: #63
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-26 12:07:47 +02:00
9878b8defc
updated shell scripts
2021-07-26 12:03:17 +02:00
5b99199b6c
changed back some configuration
2021-07-26 12:02:40 +02:00
eee7ab98cb
Merge branch 'mueller/readme-update-cp-script' into mueller/master
2021-07-26 11:58:39 +02:00
4093b2cff2
updating README
2021-07-26 11:58:28 +02:00
3f509ce472
updated port forwarding scripts
2021-07-26 11:56:39 +02:00
cffd6af1e1
Merge pull request 'README update and utility host scripts' ( #62 ) from mueller/readme-update-cp-script into develop
...
Reviewed-on: #62
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-26 11:55:20 +02:00
2a5f824161
UDP remains default for now
2021-07-26 11:47:45 +02:00
be6ae6b7ae
added TCP support
2021-07-26 11:33:38 +02:00
10507904e8
small update
2021-07-26 11:07:41 +02:00
e82ca9e749
update README
2021-07-26 11:05:43 +02:00
84ce7d22bf
added logo
2021-07-26 11:04:56 +02:00
7ff133687e
README update
2021-07-26 10:46:50 +02:00
0ff837baa1
updated port script
2021-07-26 10:15:44 +02:00
474054f4d8
updated cp script
2021-07-26 01:21:37 +02:00
4645b8d35b
added script folder
2021-07-26 00:47:55 +02:00
4b4b75085c
added helper script
2021-07-26 00:45:52 +02:00
9b2ab66c0a
readme update
2021-07-26 00:42:33 +02:00
Jakob.Meier
0cd814db76
ploc supervisor update available command, wip
2021-07-25 20:42:24 +02:00
Jakob.Meier
8c1a5bd9ad
Merge branch 'develop' into meier/plocSupervisorHandler
2021-07-25 16:24:34 +02:00
Jakob.Meier
f6d43cdf46
typo in PlocSupervisorDefinitions.h
2021-07-25 16:24:10 +02:00
bbc8a3eeef
README update
2021-07-24 17:20:39 +02:00
07f531a044
update core controller
2021-07-24 17:08:26 +02:00
733a89a97a
arcsec star tracker update
2021-07-24 15:30:34 +02:00
0e3b67383d
arcsec_star_tracker
2021-07-24 15:29:15 +02:00
Jakob.Meier
c4616e3633
get boot status report wip
2021-07-24 13:57:05 +02:00
