|
|
0fa1bab94d
|
comments
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-22 19:14:35 +01:00 |
|
|
|
29179bde0c
|
merge conflicts
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-22 18:01:54 +01:00 |
|
|
|
b9a6425078
|
dummy change
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-22 17:50:03 +01:00 |
|
|
|
e13636167f
|
limit for error events thermalcontroller + dummy beta
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-22 17:30:30 +01:00 |
|
|
|
19d04c0023
|
v1.30.0
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-22 15:03:07 +01:00 |
|
|
|
e915f6cc90
|
Merge pull request 'PDEC possible fixes' (#393) from pdec_possible_fixes_and_fdir into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #393
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
|
2023-02-22 14:45:48 +01:00 |
|
|
|
c9f16b223a
|
Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build started...
|
2023-02-22 14:30:31 +01:00 |
|
|
|
9b849d10e9
|
small changes
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-21 17:49:55 +01:00 |
|
|
|
243088252c
|
bump revision
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-21 11:41:38 +01:00 |
|
|
|
9be00603f4
|
Merge pull request 'Fix some issues' (#392) from bugfixes_code_review_msg_handling into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #392
Reviewed-by: Steffen Gaisser <gaisser@irs.uni-stuttgart.de>
|
2023-02-21 11:40:51 +01:00 |
|
|
|
f3fe65080b
|
Merge remote-tracking branch 'origin/develop' into bugfixes_code_review_msg_handling
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-02-21 11:40:48 +01:00 |
|
|
|
d9ef0f9a9d
|
small tweak
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-21 11:39:56 +01:00 |
|
|
|
7aa977efdf
|
move changelog entry
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-02-21 11:32:51 +01:00 |
|
|
|
adda32854d
|
Merge remote-tracking branch 'origin/develop' into bugfixes_code_review_msg_handling
|
2023-02-21 11:32:17 +01:00 |
|
|
|
01ac2f4aff
|
Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-21 11:32:05 +01:00 |
|
|
|
1bdfd5f8ea
|
prep v1.29.0
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-21 11:29:18 +01:00 |
|
|
|
0f5e65e5ce
|
Merge branch 'develop' into bugfixes_code_review_msg_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-21 11:29:03 +01:00 |
|
|
|
62e7e23512
|
prep v1.29.0
|
2023-02-21 11:23:27 +01:00 |
|
|
|
b6558acdbc
|
Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-21 11:20:01 +01:00 |
|
|
|
257efd4974
|
Merge pull request 'Heater Info Set' (#351) from add_heater_info_set into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #351
|
2023-02-21 11:18:48 +01:00 |
|
|
|
b3dd2ec57a
|
merge conflict
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-21 11:11:10 +01:00 |
|
|
|
262e6d0b39
|
Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-21 11:08:06 +01:00 |
|
|
|
7bda0dfb97
|
Merge remote-tracking branch 'origin/develop' into add_heater_info_set
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-21 11:06:14 +01:00 |
|
|
|
eefdc8ff5b
|
Merge pull request 'Refactor IMTQ handling' (#384) from refactor_imtq_handling into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #384
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-02-21 11:04:28 +01:00 |
|
|
|
6ea22b63df
|
Merge remote-tracking branch 'origin/develop' into add_heater_info_set
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-21 10:46:10 +01:00 |
|
|
|
a91e6b7dfe
|
Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-21 10:45:51 +01:00 |
|
|
|
b5b80cef97
|
fixed regression in max31865 code
|
2023-02-21 02:59:28 +01:00 |
|
|
|
582c8e8eff
|
some more fixes so heater info works
|
2023-02-21 02:28:57 +01:00 |
|
|
|
3ffdcf3885
|
announce mode worsk for heaters
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-21 01:53:23 +01:00 |
|
|
|
80f8df3ee4
|
forgot version bump
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-21 00:53:39 +01:00 |
|
|
|
ef24aba750
|
changelog
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-21 00:52:52 +01:00 |
|
|
|
586966bebe
|
prep v1.28.1 for em
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-21 00:51:18 +01:00 |
|
|
|
a864d51ddf
|
Merge remote-tracking branch 'origin/develop' into add_heater_info_set
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-20 23:33:59 +01:00 |
|
|
|
682b528004
|
changelog tweask
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-20 20:05:53 +01:00 |
|
|
|
124e08e80b
|
Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-20 20:03:09 +01:00 |
|
|
|
030d3272d3
|
afmt
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-20 20:01:36 +01:00 |
|
|
|
03fbc6b23d
|
Merge branch 'develop' into pdec_possible_fixes_and_fdir
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-20 19:59:58 +01:00 |
|
|
|
c149f3871a
|
changelog entry
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-20 19:59:22 +01:00 |
|
|
|
328fd149e5
|
quickfix for CMakeLists.txt to make CI/CD work
|
2023-02-20 19:57:44 +01:00 |
|
|
|
d0613727ba
|
clear read flags again
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-20 19:55:03 +01:00 |
|
|
|
7af4a777ae
|
ignoe replies when not in nml mode
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
disable traces
|
2023-02-20 19:54:04 +01:00 |
|
|
|
c98b3f6aa4
|
stupid merge conflict
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-20 19:47:19 +01:00 |
|
|
|
532add94d0
|
bump tmtc
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-20 19:46:26 +01:00 |
|
|
|
e3d9614fae
|
Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-20 19:45:45 +01:00 |
|
|
|
9ce065adb2
|
another small fix, verfiy timing now
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-20 19:44:54 +01:00 |
|
|
|
d38b5346a2
|
another fix
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-20 19:40:16 +01:00 |
|
|
|
fb0ff922a8
|
resolve merge conflict
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-20 19:38:41 +01:00 |
|
|
|
cac634503d
|
small compile fix
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-20 19:37:26 +01:00 |
|
|
|
56cdd1173e
|
some more bugfixes
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-20 19:35:36 +01:00 |
|
|
|
ea6b13d189
|
priority adaptions for ACS
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-20 19:08:04 +01:00 |
|
