Commit Graph

1138 Commits

Author SHA1 Message Date
99a24a9a35 Merge pull request 'ACS board added' (#86) from mueller/acs-board-added into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #86
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-08-18 12:44:28 +02:00
2b061a2b1c
fsfw update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-18 11:32:49 +02:00
2f72b4e42a cleaned up
All checks were successful
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
9efcd90cc0 Merge pull request 'meier/pcdu' (#85) from meier/pcdu into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #85
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2021-08-17 17:14:19 +02:00
aa248b7997 new busConf file, cleaning up
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-17 17:11:59 +02:00
921e82f6d1 acs board tweaks
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-17 16:35:41 +02:00
aa43bd7d75 Merge remote-tracking branch 'origin/develop' into mueller/master
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-17 16:17:24 +02:00
a298fff602 tmtc update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-17 16:07:33 +02:00
Jakob.Meier
5204afca9e pcdu debug output disabled now
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2021-08-17 12:00:58 +02:00
Jakob.Meier
1722f14a60 added debug output for pcdu modules
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2021-08-17 11:59:32 +02:00
3a65f1d39f Merge pull request 'Raspberry Pi fixes, GPS Handler update, Stripped Executable' (#84) from mueller/stripped-exec into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #84
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-08-16 13:41:21 +02:00
567199f460 Merge branch 'develop' into mueller/stripped-exec
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-16 10:05:55 +02:00
cfbacd4d80
generating stripped executable now
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2021-08-14 15:25:30 +02:00
95c06d5a09
added make size cfg
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-14 15:19:32 +02:00
dc8879b1af
tmtc update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-11 19:33:26 +02:00
1962b30e5f
testing HK downlink
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-11 19:27:17 +02:00
cb330bcf29
hyperion handler: HK packet subscription
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-11 18:59:40 +02:00
268cd33677
gps handler tweaks
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-11 18:52:33 +02:00
0ae55e0783
no ARCSEC lib for Raspberry Pi
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-11 18:13:43 +02:00
be43dbd293 Merge pull request 'Core Controller Bugfix' (#83) from mueller/core-controller-bugfix into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #83
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-08-11 16:48:24 +02:00
45b78a0100 Merge remote-tracking branch 'origin/develop' into mueller/master
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-11 16:45:17 +02:00
fc22f7d86f Merge branch 'develop' into mueller/core-controller-bugfix
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2021-08-11 16:30:31 +02:00
0622b78dde
Merge branch 'mueller/core-controller-bugfix' into mueller/master
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-11 16:30:00 +02:00
cf355a0451
missing :
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-08-11 16:29:11 +02:00
337aa39ecc Merge pull request 'meier/firmwareChanges' (#82) from meier/firmwareChanges into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #82
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2021-08-11 16:26:53 +02:00
24b58e50d1
Merge core controller bugfix
Some checks failed
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-11 16:24:41 +02:00
11c2efa733
bugfix core controller
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
1. Increaed robustness of CoreController against invalid state struct
2. Bugfix: If PREFSD not set, set SD card 0 properly now
2021-08-11 16:07:00 +02:00
0efaa13a9f
tmtc update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-11 15:53:27 +02:00
Jakob.Meier
ae08d14626 Merge branch 'develop' into meier/firmwareChanges
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2021-08-11 13:32:30 +02:00
53f6a0d3a6 Merge branch 'main' into develop
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-11 10:47:16 +02:00
Jakob.Meier
4fdcb5d7cd minor changes to match software to updated fpga design
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-11 09:41:29 +02:00
f3bc2958f9 Merge pull request 'Moved Q7S specific files' (#80) from mueller/moved-q7s-specific-files into develop
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-main Build queued...
Reviewed-on: #80
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-08-09 19:46:12 +02:00
d714f84df8
bumped revision
All checks were successful
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
bda8550ef9
fixes for hosted
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-08-09 18:26:34 +02:00
d604f8d3d1
one port is okay
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-09 18:23:18 +02:00
e92af98f34
moved q7s specific code to q7s folder
Some checks are pending
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
03510e5de9
updated TCP port
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-08-09 16:34:06 +02:00
1d714ff85e
Moved PLOC components to q7s folder
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-08-09 16:30:59 +02:00
b3f2a05385 Merge pull request 'v1.6.0' (#78) from develop into main
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #78
2021-08-09 16:08:25 +02:00
ec27521c35 Merge branch 'main' into develop
Some checks failed
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
Some checks failed
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
Jakob.Meier
12dbc5569e mode power down sus
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2021-08-09 14:44:06 +02:00
Jakob.Meier
8f124de79c set all devices to mode power down in doShutDown
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-08-09 14:41:46 +02:00
9fd0009c7b Merge pull request 'bumped subversion for release' (#77) from mueller/version-bump into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #77
2021-08-09 14:34:39 +02:00
74dbfae225
tmtc update
Some checks are pending
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
Jakob.Meier
ce1124472a Merge branch 'develop' into meier/develop 2021-08-09 14:23:27 +02:00
6e22c3e017 Merge pull request 'Non Blocking SD Card Initialization' (#75) from mueller/non-blocking-sd-card-init into develop
All checks were successful
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