Commit Graph

7965 Commits

Author SHA1 Message Date
Robin Müller c12706ef05 Merge branch 'main' into auto-switch-image-feature
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
EIVE/eive-obsw/pipeline/head This commit looks good Details
2023-10-30 15:02:23 +01:00
Robin Müller 872215ce61 Merge pull request 'PLOC SUPV debug mode' (#815) from ploc-supv-debug-mode into main
EIVE/eive-obsw/pipeline/head This commit looks good Details
Reviewed-on: #815
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-10-30 14:57:33 +01:00
Robin Müller 8e1f95ebf2
Merge remote-tracking branch 'origin/main' into auto-switch-image-feature
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-30 14:45:13 +01:00
Robin Müller 2b1ed2be53 Merge remote-tracking branch 'origin/main' into ploc-supv-debug-mode
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-30 14:43:44 +01:00
Robin Müller 3e5b9d6650 Merge pull request 'Prep v7.2.0' (#816) from prep_v7.2.0 into main
EIVE/eive-obsw/pipeline/head This commit looks good Details
Reviewed-on: #816
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-10-30 13:13:31 +01:00
Robin Müller 37853f8fe2 Merge branch 'main' into prep_v7.2.0
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-30 10:32:12 +01:00
Robin Müller bd60246f9a Merge pull request 'Update Internal Resistance' (#817) from update-internal-resistance into main
EIVE/eive-obsw/pipeline/head This commit looks good Details
Reviewed-on: #817
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-10-30 10:32:04 +01:00
Marius Eggert a2090448ff changelog
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-30 08:52:18 +01:00
Marius Eggert ad6fa66daf update internal resistance
EIVE/eive-obsw/pipeline/head Build started... Details
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 15:37:45 +02:00
Robin Müller 647a394150
eive-tmtc version
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 15:04:11 +02:00
Robin Müller dca6cade11
bump tmtc
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 15:03:02 +02:00
Robin Müller 43e981dfed
prep v7.2.0
EIVE/eive-obsw/pipeline/head Build started... Details
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 14:24:59 +02:00
Robin Müller 49b2bef8f4 Merge pull request 'PL PCDU JSON update' (#812) from plpcdu-json-file-update into main
EIVE/eive-obsw/pipeline/head This commit looks good Details
Reviewed-on: #812
2023-10-27 14:17:06 +02:00
Robin Müller 0c778b66f9 Merge pull request 'Reduce SUS FDIR Events' (#806) from sus-fdir-reduce-events into main
EIVE/eive-obsw/pipeline/head This commit looks good Details
Reviewed-on: #806
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-10-27 14:16:46 +02:00
Robin Müller 68763e327b
Merge remote-tracking branch 'origin/main' into plpcdu-json-file-update
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 14:05:45 +02:00
Robin Müller 3c55a07404 Merge branch 'main' into sus-fdir-reduce-events
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 14:05:05 +02:00
Robin Müller 2e7a1c1cb5 Merge pull request 'Swap RTD9 and RTD11 chip selects' (#814) from swap-rtd-9-and-11 into main
EIVE/eive-obsw/pipeline/head This commit looks good Details
Reviewed-on: #814
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-10-27 14:00:14 +02:00
Robin Müller febb36f0eb Merge branch 'main' into swap-rtd-9-and-11
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 13:50:28 +02:00
Robin Müller 1ba1946728 Merge pull request 'STR extensions' (#798) from str-extensions into main
EIVE/eive-obsw/pipeline/head This commit looks good Details
Reviewed-on: #798
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-10-27 13:50:12 +02:00
Robin Müller d2b5384f05
make marius happy
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 12:54:32 +02:00
Robin Müller 5a67ce56aa
changelog
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 12:43:32 +02:00
Robin Müller 65bb860fb2 Merge branch 'main' into sus-fdir-reduce-events
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 12:39:39 +02:00
Robin Müller 6459a945ea
Merge remote-tracking branch 'origin/main' into plpcdu-json-file-update
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 12:35:55 +02:00
Robin Müller b30c85866f Merge remote-tracking branch 'origin/main' into swap-rtd-9-and-11
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 12:34:52 +02:00
Robin Müller a877edf40b
bump tmtc
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 12:34:33 +02:00
Robin Müller 656c69f858
bump tmtc
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 12:32:59 +02:00
Robin Müller db582febb7 Merge remote-tracking branch 'origin/main' into str-extensions 2023-10-27 12:32:49 +02:00
Robin Müller c48f0678f1 Merge pull request 'Added CFDP fault handler events' (#809) from cfdp-fault-handler-event into main
EIVE/eive-obsw/pipeline/head This commit looks good Details
Reviewed-on: #809
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-10-27 12:32:17 +02:00
Robin Müller dcdceba07e
wrapping up
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 12:17:54 +02:00
Robin Müller f8eb4fdd6f
add contrast set
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 11:24:51 +02:00
Robin Müller 964d47b909
bugfix for reset function
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 09:59:15 +02:00
Marius Eggert 35e7fba576 smoll fix
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-27 09:50:40 +02:00
Marius Eggert 44d9541e52 Merge branch 'main' into sus-fdir-reduce-events 2023-10-27 09:41:50 +02:00
Robin Müller 0beac793a1
some more important bugfixes
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-26 20:45:36 +02:00
Robin Müller 1c7545bffa
fix 2023-10-26 19:59:16 +02:00
Robin Müller 599ff256ff Merge remote-tracking branch 'origin/main' into str-extensions 2023-10-26 19:18:28 +02:00
Robin Müller be9d00be04
Merge remote-tracking branch 'origin/main' into cfdp-fault-handler-event
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-26 13:46:11 +02:00
Robin Müller c06cd710cf
Merge remote-tracking branch 'origin/main' into swap-rtd-9-and-11
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-26 13:45:10 +02:00
Robin Müller 02fcd0c423
disable printout mode
EIVE/eive-obsw/pipeline/head Build started... Details
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-26 13:42:27 +02:00
Robin Müller 27d6760322
add optional printout mode for PLOC SUPV 2023-10-26 13:41:52 +02:00
Robin Müller 534ddde9e8
ploc supv debug mode
EIVE/eive-obsw/pipeline/head This commit looks good Details
2023-10-26 11:19:21 +02:00
Marius Eggert 54c2fc9646 validity handling
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-26 09:52:25 +02:00
Marius Eggert 1e284463ac Merge pull request 'State of Charge FDIR improvements' (#810) from eive-system-fdir into main
EIVE/eive-obsw/pipeline/head This commit looks good Details
Reviewed-on: #810
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-10-26 09:36:47 +02:00
Robin Müller 7c765d037b
compile fix
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-25 18:17:51 +02:00
Robin Müller ef2e62e418
changelog clarification
EIVE/eive-obsw/pipeline/head Build queued... Details
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
2023-10-25 17:51:41 +02:00
Robin Müller b7e33ebcb6
changelog
EIVE/eive-obsw/pipeline/head Build started... Details
2023-10-25 17:49:31 +02:00
Robin Müller 93e3f3578d
swap RTDs 2023-10-25 17:48:28 +02:00
Robin Müller 70747e1864
bump PL PCDU handler
EIVE/eive-obsw/pipeline/head This commit looks good Details
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-23 17:28:20 +02:00
Robin Müller c67a9fa2c2
this might be a bugfix
EIVE/eive-obsw/pipeline/head This commit looks good Details
2023-10-23 17:10:37 +02:00
Robin Müller 3e5fae4458
Merge remote-tracking branch 'origin/main' into str-extensions
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
2023-10-23 13:53:01 +02:00