Jakob Meier
|
8c850614e5
|
fixed merge conflicts
|
2022-06-05 10:54:46 +02:00 |
|
Jakob Meier
|
b8cf825307
|
rerun generators
|
2022-06-05 09:13:08 +02:00 |
|
Jakob Meier
|
f2d5932883
|
fixes in build config
|
2022-06-05 09:12:56 +02:00 |
|
Jakob Meier
|
917090e39d
|
Merge branch 'meier/thermal-controller-fix' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/thermal-controller-fix
|
2022-06-04 09:42:59 +02:00 |
|
Jakob Meier
|
67037e2dae
|
use memset to set invalid temperatures of cau
|
2022-06-04 09:31:34 +02:00 |
|
|
f72dfa255d
|
submodule update
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-06-03 18:05:54 +02:00 |
|
|
b3bb76c75f
|
bugfixes in hk handling
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-06-03 18:03:25 +02:00 |
|
Jakob Meier
|
6c32ddf864
|
changed gomspace temperatures to float
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-06-03 09:33:08 +02:00 |
|
Jakob Meier
|
b1c20b22c8
|
set temeprature to invalid value when invalid flag is set by owner
|
2022-06-03 07:51:04 +02:00 |
|
|
678b22438f
|
tmtc update
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-06-02 18:52:09 +02:00 |
|
|
f47712552e
|
hk set fixes
|
2022-06-02 18:46:08 +02:00 |
|
|
cbb8832fab
|
tmtc update
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-06-01 18:47:52 +02:00 |
|
|
b66dcc0a86
|
local port forward script
|
2022-06-01 18:46:53 +02:00 |
|
|
04b7c82501
|
type fixes in device temperatures sets
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-06-01 18:46:22 +02:00 |
|
Jakob Meier
|
5051af82c2
|
tmtc update
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-06-01 15:52:51 +02:00 |
|
Jakob Meier
|
ba7ac6bab2
|
variable for number of sus entries
|
2022-06-01 13:08:34 +02:00 |
|
Jakob Meier
|
52d94f44d4
|
device temeprature set
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-06-01 10:48:18 +02:00 |
|
|
87783b01f5
|
device temperature set wip
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-05-31 16:46:07 +02:00 |
|
|
593cc68b84
|
rtd dataset
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-05-31 16:44:57 +02:00 |
|
|
0e6d2354fc
|
thermal set fix
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-05-30 14:32:50 +02:00 |
|
|
23cabe4ca6
|
Merge branch 'develop' into mohr/thermal_controller
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-05-30 12:10:19 +02:00 |
|
|
3d1e104fa4
|
Merge pull request 'Adaptions for EM' (#264) from meier/q7s-em into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #264
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2022-05-28 12:21:49 +02:00 |
|
Jakob Meier
|
8106722a08
|
replaced EM preprocessor define
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-27 16:24:41 +02:00 |
|
Jakob Meier
|
9e93f1c814
|
adaptions for EM
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-27 13:44:40 +02:00 |
|
|
1f1e1e8eae
|
Merge pull request 'Bugfix SdCardManager' (#263) from meier/SdCardManager into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #263
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2022-05-26 12:15:32 +02:00 |
|
|
6f9d3c2f63
|
Merge branch 'develop' into meier/SdCardManager
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2022-05-26 12:15:14 +02:00 |
|
|
25070d9543
|
Merge pull request 'MPSoC Status Codes' (#262) from meier/ploc into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #262
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2022-05-26 12:14:19 +02:00 |
|
|
bbdfc0427a
|
Merge branch 'develop' into meier/ploc
EIVE/eive-obsw/pipeline/pr-develop Build started...
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/-/pipeline/head Build queued...
|
2022-05-26 12:14:01 +02:00 |
|
|
97db44e500
|
fix raspberry pi build
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-26 11:46:28 +02:00 |
|
Jakob Meier
|
c588ec4a1a
|
bugfix SdCardManager
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-26 01:56:19 +02:00 |
|
|
09a6707c6c
|
run generator scripts
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-25 18:42:40 +02:00 |
|
|
ee9a13f59b
|
Merge branch 'develop' into meier/ploc
|
2022-05-25 18:40:39 +02:00 |
|
|
e9ccb2fd4f
|
status code parsing, fix in cam command
|
2022-05-25 18:38:54 +02:00 |
|
|
e5459bb1f7
|
re-run generators
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-25 18:15:44 +02:00 |
|
|
335d3ba3b0
|
bump submodules
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-25 15:45:11 +02:00 |
|
|
f50682b56a
|
Merge pull request 'Split ACU HK' (#256) from mueller/split-acu-hk into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #256
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-25 15:23:19 +02:00 |
|
|
ad679a810e
|
Merge pull request 'add and schedule PUS11' (#259) from mueller/add-schedule-pus-11 into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #259
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-25 15:21:25 +02:00 |
|
|
686ec4bffa
|
Merge pull request 'GPS Reset Pin Handling Update' (#261) from mueller/gps-reset-pin-update into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #261
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-25 15:20:12 +02:00 |
|
|
ae434853aa
|
bump number stored packets
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-25 13:14:36 +02:00 |
|
|
bb1e1d80cc
|
resolve merge conflict
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-25 11:00:18 +02:00 |
|
|
01bac87afb
|
update reset pin handling
EIVE/eive-obsw/pipeline/head Build started...
|
2022-05-25 10:59:20 +02:00 |
|
|
ffdd6bbc3c
|
Merge branch 'develop' into mueller/add-schedule-pus-11
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-25 10:27:36 +02:00 |
|
|
d870f5ab10
|
Merge pull request 'Core Controller Remount SD Handling' (#253) from mueller/core-controller-remount-sd-handling into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #253
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-25 10:27:10 +02:00 |
|
|
0b3fd65c9a
|
Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-25 10:16:31 +02:00 |
|
|
0ac38e8490
|
Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-25 10:16:14 +02:00 |
|
|
d79177e544
|
Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-25 10:15:48 +02:00 |
|
|
addcb2b21f
|
Merge pull request 'IMTQ improvements' (#260) from meier/imtq into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #260
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2022-05-25 10:15:13 +02:00 |
|
|
7646b683b2
|
Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-25 09:59:14 +02:00 |
|
|
3eca96fef5
|
Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-25 09:58:06 +02:00 |
|
|
43fc1ab780
|
Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-25 09:57:34 +02:00 |
|