8214 Commits

Author SHA1 Message Date
a5c9e1481b
changelog 2023-07-02 14:04:29 +02:00
e19ddcfbd8
EM ACS board 2023-07-02 14:02:37 +02:00
add079a7c6 Merge pull request 'Updates for new firmware' () from complete-fw-tests into main-v6
Reviewed-on: 
2023-07-01 13:30:26 +02:00
9cdcd47b1a
Merge remote-tracking branch 'origin/main-v6' into complete-fw-tests 2023-06-30 10:45:16 +02:00
d14e256901
STR tests 2023-06-29 16:40:21 +02:00
dd5270e974 Merge pull request 'Important bugfix for live channel' () from live-channel-bugfix into main-v6
Reviewed-on: 
2023-06-29 16:39:09 +02:00
56ea9af615
add documentation of initial delay 2023-06-29 15:06:25 +02:00
4fc999e102
changelog 2023-06-29 15:03:45 +02:00
04d24e74b1
q7s-package version specification 2023-06-29 15:01:54 +02:00
8137c9ea25 Merge remote-tracking branch 'origin/main-v6' into complete-fw-tests 2023-06-29 15:00:49 +02:00
723b4bba3f Merge remote-tracking branch 'origin/main-v6' into live-channel-bugfix 2023-06-29 15:00:20 +02:00
8cff2fd6f7
Merge remote-tracking branch 'origin/main' into live-channel-bugfix 2023-06-29 15:00:11 +02:00
a1f7f77e01 Merge remote-tracking branch 'origin/main' into main-v6 2023-06-29 14:59:18 +02:00
f3aab775f3 Merge pull request 'Core controller bugfix' () from core-ctrl-init-bugfix into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-06-29 14:58:28 +02:00
59d542ab39
Merge remote-tracking branch 'origin/main' into core-ctrl-init-bugfix 2023-06-29 14:58:13 +02:00
7b0285c4ce Merge pull request 'Only reset PTME on rate change' () from only-reset-ptme-on-rate-change into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-06-29 14:56:35 +02:00
0a77ee0508
Merge remote-tracking branch 'origin/main' into only-reset-ptme-on-rate-change 2023-06-29 14:51:15 +02:00
51cbe46cf5
why indeed 2023-06-29 14:49:57 +02:00
26fc4b8add Merge pull request 'small fix for persistent TM store' () from persistent-tm-stores-fixes into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-06-29 14:46:50 +02:00
825de04f3b
changelog 2023-06-29 10:15:36 +02:00
33985937b7
typo 2023-06-29 09:44:09 +02:00
ba36b5f091 Merge branch 'main-v6' into live-channel-bugfix 2023-06-29 08:55:09 +02:00
4f5903227e
changelog 2023-06-29 08:54:58 +02:00
2173d89047
changelog 2023-06-29 08:54:34 +02:00
0a12dbf2be
changelog 2023-06-29 08:53:08 +02:00
ad3c0e2a0e
small fix for persistent TM store 2023-06-29 01:28:40 +02:00
03e772246f
less cycles.. 2023-06-29 00:35:06 +02:00
25da131653
seems to work well 2023-06-29 00:33:58 +02:00
4c6b098f42
Merge branch 'live-channel-bugfix' into only-reset-ptme-on-rate-change-v6 2023-06-28 17:49:06 +02:00
b57283101b
important bugfix for live channel 2023-06-28 17:46:21 +02:00
9dfdf38822
important bugfix for live channel 2023-06-28 17:20:10 +02:00
c6240285e2 Merge branch 'core-ctrl-init-bugfix' into only-reset-ptme-on-rate-change-v6 2023-06-28 15:51:48 +02:00
87c05705ec
core ctrl bugfix 2023-06-28 15:43:44 +02:00
c881b36630
prevent warning 2023-06-28 15:28:27 +02:00
a380ff5ac9 Merge branch 'main-v6' into only-reset-ptme-on-rate-change-v6 2023-06-28 15:24:20 +02:00
4d17184fba Merge remote-tracking branch 'origin/main' into only-reset-ptme-on-rate-change 2023-06-28 15:18:05 +02:00
d8efd05a88
Merge branch 'main' into main-v6 2023-06-28 15:08:38 +02:00
109856eef8 Merge pull request 'prep v5.1.0' () from prep_v5.1.0 into main
Reviewed-on: 
v5.1.0
2023-06-28 13:57:04 +02:00
90bafa717b
prep v5.1.0 2023-06-28 13:41:51 +02:00
0cdb850f69 Merge pull request 'Seq Count Persistent + MSG type counter' () from sequence-counter-persistent-msg-type-count-support into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-06-28 13:37:14 +02:00
4c63fed69d
that is annoying 2023-06-28 13:35:38 +02:00
eb27ab4bb0
fix and optimization 2023-06-28 13:32:35 +02:00
b0a38136c1 Merge remote-tracking branch 'origin/main' into only-reset-ptme-on-rate-change 2023-06-28 13:28:00 +02:00
6c2548fb56 Merge branch 'main' into sequence-counter-persistent-msg-type-count-support 2023-06-28 13:26:55 +02:00
7d3f9ada18 Merge pull request 'higher rx set rate during pass' () from rx-dataset-higher-rate-during-pass into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-06-28 13:26:42 +02:00
b5cc430b5b Merge remote-tracking branch 'origin/main' into only-reset-ptme-on-rate-change 2023-06-28 13:21:33 +02:00
52fedb94e8
bump fsfw and tmtc 2023-06-28 13:20:50 +02:00
cdabf113ca
Merge remote-tracking branch 'origin/main' into rx-dataset-higher-rate-during-pass 2023-06-28 13:18:45 +02:00
c3e66f5320
changelogge 2023-06-28 13:18:00 +02:00
2d2c1d8721 Merge branch 'main' into sequence-counter-persistent-msg-type-count-support 2023-06-28 10:07:51 +02:00