|
|
43d86c9aad
|
resolve merge conflicts properly
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 12:24:48 +02:00 |
|
|
|
c0ae25a973
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
|
2023-07-07 12:23:00 +02:00 |
|
|
|
fa85cc4d78
|
pls compile
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 12:22:37 +02:00 |
|
|
|
7337595d47
|
add event
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 12:05:29 +02:00 |
|
|
|
f2f73b088d
|
add event
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 12:03:34 +02:00 |
|
|
|
fce16cc695
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 11:58:24 +02:00 |
|
|
|
ff7d0b3989
|
compile fixes
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 11:57:00 +02:00 |
|
|
|
a7ab26d804
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 11:50:32 +02:00 |
|
|
|
7388c4f661
|
Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 11:47:05 +02:00 |
|
|
|
a6461fcaf8
|
Merge remote-tracking branch 'origin/main' into another-tcs-fix
EIVE/eive-obsw/pipeline/pr-main Build queued...
|
2023-07-07 11:45:22 +02:00 |
|
|
|
3087049726
|
Merge branch 'main' into tcs-ctrl-bugfix
|
2023-07-07 11:44:27 +02:00 |
|
|
|
603ddcef9c
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 11:14:42 +02:00 |
|
|
|
0b673fcdec
|
Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 11:07:35 +02:00 |
|
|
|
908cf8dcc3
|
Merge remote-tracking branch 'origin/main' into another-tcs-fix
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 11:03:20 +02:00 |
|
|
|
ec39dc05ae
|
Merge remote-tracking branch 'origin/main' into tcs-ctrl-bugfix
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 11:02:43 +02:00 |
|
|
|
bd33a51bf1
|
Merge remote-tracking branch 'origin/main' into some-more-tcs-tweaks
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 11:00:45 +02:00 |
|
|
|
b0b43b3ecc
|
Merge branch 'main' into some-more-tcs-tweaks
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 10:56:50 +02:00 |
|
|
|
c1a23e0d73
|
Merge remote-tracking branch 'origin/main' into add-tcs-ctrl-heater-events
EIVE/eive-obsw/pipeline/pr-main Build queued...
|
2023-07-07 10:56:38 +02:00 |
|
|
|
f1ca4b174f
|
comment
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 23:07:54 +02:00 |
|
|
|
027955597f
|
done
|
2023-07-06 23:06:50 +02:00 |
|
|
|
c558a117b0
|
some docs
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 22:21:00 +02:00 |
|
|
|
fc697732b4
|
Merge branch 'another-tcs-fix' into tcs-heater-upper-limit
|
2023-07-06 22:07:06 +02:00 |
|
|
|
ce19f30325
|
continue max heater duration
|
2023-07-06 22:06:54 +02:00 |
|
|
|
faffca0c2c
|
compile fix
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 20:19:05 +02:00 |
|
|
|
7b611810df
|
there are actually 8 heaters
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 20:13:33 +02:00 |
|
|
|
3e92d175d5
|
form fix
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-06 20:01:57 +02:00 |
|
|
|
12ff365433
|
TCS ctrl bugfix
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2023-07-06 19:57:23 +02:00 |
|
|
|
5ea3bfeb7b
|
Merge branch 'main' into some-more-tcs-tweaks
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 19:12:01 +02:00 |
|
|
|
3c9eec7b3f
|
heater events for TCS ctrl
EIVE/eive-obsw/pipeline/head Build started...
|
2023-07-06 18:58:57 +02:00 |
|
|
|
61ea80f92c
|
remove some cruft
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 17:26:09 +02:00 |
|
|
|
6182218813
|
this works but is kind of ugly
EIVE/eive-obsw/pipeline/head Build started...
|
2023-07-06 17:23:55 +02:00 |
|
|
|
b7e4953126
|
the TCS subsystem does not work on the EM..
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-07-06 16:00:39 +02:00 |
|
|
|
bda2ba79bf
|
Merge remote-tracking branch 'origin/main' into swap-pl-ps-i2c
EIVE/eive-obsw/pipeline/pr-main This commit looks good
make marius extremely happy
|
2023-07-06 14:34:12 +02:00 |
|
|
|
f4f365b110
|
pool read guard
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 13:56:43 +02:00 |
|
|
|
1d4b815452
|
this is better to read..
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main Build queued...
|
2023-07-06 12:04:36 +02:00 |
|
|
|
1e98fcbbd5
|
that really should not cause issues though..
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-07-06 12:01:48 +02:00 |
|
|
|
52eba5cae6
|
small fix/tweaks
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-05 17:20:42 +02:00 |
|
|
|
cd9cb48b04
|
set dataset invalid on OFF mode
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-05 16:31:41 +02:00 |
|
|
|
9ece676313
|
lets see if this works
|
2023-07-03 16:55:45 +02:00 |
|
|
|
697a3e8577
|
Merge remote-tracking branch 'origin/main' into swap-pl-ps-i2c
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2023-07-03 16:34:04 +02:00 |
|
|
|
8cff2fd6f7
|
Merge remote-tracking branch 'origin/main' into live-channel-bugfix
|
2023-06-29 15:00:11 +02:00 |
|
|
|
0a77ee0508
|
Merge remote-tracking branch 'origin/main' into only-reset-ptme-on-rate-change
EIVE/eive-obsw/pipeline/pr-main Build queued...
|
2023-06-29 14:51:15 +02:00 |
|
|
|
33985937b7
|
typo
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-29 09:44:09 +02:00 |
|
|
|
ba36b5f091
|
Merge branch 'main-v6' into live-channel-bugfix
EIVE/eive-obsw/pipeline/pr-main-v6 This commit looks good
|
2023-06-29 08:55:09 +02:00 |
|
|
|
ad3c0e2a0e
|
small fix for persistent TM store
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-29 01:28:40 +02:00 |
|
|
|
b57283101b
|
important bugfix for live channel
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-28 17:46:21 +02:00 |
|
|
|
4d17184fba
|
Merge remote-tracking branch 'origin/main' into only-reset-ptme-on-rate-change
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-28 15:18:05 +02:00 |
|
|
|
d8efd05a88
|
Merge branch 'main' into main-v6
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-06-28 15:08:38 +02:00 |
|
|
|
4c63fed69d
|
that is annoying
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-28 13:35:38 +02:00 |
|
|
|
eb27ab4bb0
|
fix and optimization
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
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
EIVE/eive-obsw/pipeline/pr-main Build started...
|
2023-06-28 13:26:55 +02:00 |
|
|
|
b5cc430b5b
|
Merge remote-tracking branch 'origin/main' into only-reset-ptme-on-rate-change
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-06-28 13:21:33 +02:00 |
|
|
|
cdabf113ca
|
Merge remote-tracking branch 'origin/main' into rx-dataset-higher-rate-during-pass
EIVE/eive-obsw/pipeline/pr-main Build started...
|
2023-06-28 13:18:45 +02:00 |
|
|
|
2d2c1d8721
|
Merge branch 'main' into sequence-counter-persistent-msg-type-count-support
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-28 10:07:51 +02:00 |
|
|
|
1e767afa11
|
only handle one message per cycle
|
2023-06-27 17:55:49 +02:00 |
|
|
|
15a67b81f9
|
various improvements
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-27 17:36:52 +02:00 |
|
|
|
bf25266055
|
Merge branch 'main' into rx-dataset-higher-rate-during-pass
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-27 11:05:56 +02:00 |
|
|
|
ef08f348dc
|
Merge remote-tracking branch 'origin/main' into sequence-counter-persistent-msg-type-count-support
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-26 18:26:08 +02:00 |
|
|
|
f0fbed1593
|
Merge remote-tracking branch 'origin/main' into internal-error-reporter-set
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-26 18:13:44 +02:00 |
|
|
|
8b2bf21025
|
Merge remote-tracking branch 'origin/main' into sequence-counter-persistent-msg-type-count-support
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-06-26 18:12:45 +02:00 |
|
|
|
91c53df2c9
|
Merge remote-tracking branch 'origin/main' into internal-error-reporter-set
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-26 18:03:06 +02:00 |
|
|
|
c6231d2337
|
Merge remote-tracking branch 'origin/main' into sequence-counter-persistent-msg-type-count-support
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-26 17:59:26 +02:00 |
|
|
|
0dfe68eb8d
|
Merge remote-tracking branch 'origin/main' into ordered-dumps
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-26 17:57:26 +02:00 |
|
|
|
6c39e7dd0c
|
and go back to newest version here
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-06-26 17:08:39 +02:00 |
|
|
|
73498ac9af
|
prepare v5.0.0, revert firmware interfacing changes
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-26 16:53:54 +02:00 |
|
|
|
1703f7a714
|
Merge remote-tracking branch 'origin/main' into internal-error-reporter-set
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-26 15:36:23 +02:00 |
|
|
|
3e21f9c259
|
Merge remote-tracking branch 'origin/main' into ordered-dumps
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-26 15:34:58 +02:00 |
|
|
|
fca6834d17
|
higher rx set rate during pass
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main Build queued...
|
2023-06-26 15:32:52 +02:00 |
|
|
|
1cc62238c2
|
only reset PTME on rate change init
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-06-26 14:39:03 +02:00 |
|
|
|
c806aa81f0
|
what does the new compiler want?
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-26 11:14:11 +02:00 |
|
|
|
93fb207032
|
C++ insanity..
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-06-25 13:12:39 +02:00 |
|
|
|
80160e8291
|
that was hopefully the last set of fixes
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-06-25 13:07:31 +02:00 |
|
|
|
5a15d39a1d
|
important order bugfix
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2023-06-25 12:49:51 +02:00 |
|
|
|
0db7b5251c
|
Merge branch 'total-boot-counter-file' into sequence-counter-persistent-msg-type-count-support
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2023-06-25 12:45:34 +02:00 |
|
|
|
873316d012
|
sequence counter isn ow persistent, msg type count support
|
2023-06-25 12:41:20 +02:00 |
|
|
|
0f818a5596
|
Merge remote-tracking branch 'origin/main' into internal-error-reporter-set
EIVE/eive-obsw/pipeline/pr-v4.1.0-dev This commit looks good
|
2023-06-25 11:12:10 +02:00 |
|
|
|
c50a74d117
|
delete ordering
|
2023-06-24 21:00:57 +02:00 |
|
|
|
25d10e3877
|
that was all the fixes (hopefully)
|
2023-06-24 20:57:54 +02:00 |
|
|
|
4e7b774d32
|
some legacy/backword compatiblity additions
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-24 18:37:58 +02:00 |
|
|
|
88e8268c26
|
start refactoring reboot wd handling
|
2023-06-24 17:14:56 +02:00 |
|
|
|
04f4eedb78
|
that should make it work
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-24 12:01:12 +02:00 |
|
|
|
53b48ad99b
|
this is tricky
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-06-24 11:46:56 +02:00 |
|
|
|
a8ab40674f
|
seems to work well
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-24 11:08:50 +02:00 |
|
|
|
18b67d18a7
|
seems to work now
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-24 02:07:11 +02:00 |
|
|
|
97d41a125b
|
Merge remote-tracking branch 'origin/main' into ordered-dumps
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-06-24 01:24:24 +02:00 |
|
|
|
b261779ebf
|
this iis less confusing
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-06-23 17:53:19 +02:00 |
|
|
|
db5e7a535e
|
remove printouts
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-06-23 17:47:18 +02:00 |
|
|
|
4a8e111a18
|
bugfix packet demux
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-06-23 17:44:18 +02:00 |
|
|
|
2e041c3013
|
some more fixes
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-06-23 17:07:07 +02:00 |
|
|
|
9023405b96
|
some fxes
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-06-23 16:05:38 +02:00 |
|
|
|
1d047f3c92
|
implement ordered sets
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-06-23 14:55:51 +02:00 |
|
|
|
3d07814efb
|
Merge remote-tracking branch 'origin/main' into internal-error-reporter-set
EIVE/eive-obsw/pipeline/pr-v4.1.0-dev There was a failure building this commit
|
2023-06-22 18:39:34 +02:00 |
|
|
|
4c66d8fb5f
|
Merge branch 'v4.0.0-dev' into extend-cp-helper
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev Build queued...
|
2023-06-22 16:44:39 +02:00 |
|
|
|
ced812052d
|
Merge branch 'v4.0.0-dev' into extend-cp-helper
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev Build queued...
|
2023-06-22 16:33:58 +02:00 |
|
|
|
a0d559a5fd
|
Merge branch 'v4.0.0-dev' into extend-cp-helper
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev There was a failure building this commit
|
2023-06-22 16:24:24 +02:00 |
|
|
|
d1086bc9aa
|
Merge branch 'v4.0.0-dev' into more-info-on-reboot
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good
|
2023-06-22 16:17:17 +02:00 |
|
|
|
461782acdb
|
Merge branch 'v4.0.0-dev' into internal-error-reporter-set
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev There was a failure building this commit
|
2023-06-22 16:11:33 +02:00 |
|
|
|
a3b140b680
|
internal error reporter extension
|
2023-06-22 16:09:24 +02:00 |
|
|
|
788fbb72f0
|
that should do the job
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-06-22 14:25:11 +02:00 |
|
