WIP: develop_update #706

Draft

muellerr wants to merge 710 commits from eive/fsfw:develop_update into development

pull from: eive/fsfw:develop_update

merge into: :development

:master

:spahr/fixCompileError

:development

:mohr/romeo

:development-doc-deployment

:development-doc-test0

:switch-doc-theme-to-rtd

:action-update

:obj-manager-tweak

:mohr_introspection

:mohr/windows

:mohr/GCC13

:mohr/timetag_fix

:mohr/relsease_helper

:mohr/warnings

:mohr/rtems

:mohr/freeRTOS

:mueller/new-cfdp-update-with-handlers

:mohr/dhb2normal

:mueller/obj-man-remove-weird-proc-func

:mohr/documentation_ci

:mueller/fsfw-from-zero

:mueller/data-wrapper

:mueller/dhb-handle-device-tm

:mueller/refactor-tmtc-stack-with-retval-refactoring

:mueller/refactor-logging-with-fmt

:meier/upstream-pus-distributor-bugfix

:mueller/clang-improvements

Conversation 0 Commits 710 Files Changed 187

+3304 -1475

muellerr commented 2022-11-14 15:09:10 +01:00

Owner

Copy Link

Copy Source

No description provided.

muellerr added 463 commits 2022-11-14 15:09:15 +01:00

All EIVE changes d8c5bd125e

apply clang script 07cb980e06

include fixes 783176848a

renamed variable 41614303d7

use C++ casts 3a65c0db91

add uio subdir 33386550cf

device wants hard reboot event added 6698d283b6

added cpp printout preprocessor guards 992c05df56

this fixes the warning 8030d9ac1b

Merge branch 'mueller/comp-branch' into mueller/master 1a518109d0

this should work for c++11 22cd38fffd

Merge branch 'mueller/comp-branch' into mueller/master 527dba9a9d

fixes warning for good 8f95b03e6a

zero initialize array fca48257b7

added i2c wiretapping b3151a0ba0

fixes for event definitoons for parser b3aee76d91

more fixes 973996e102

parser is not perfect.. a910a05541

delete switch helper, some other fixes b7f6a6961b

removed HK switch helper from cmake file 0d4bd856bd

removed HK switch helper from cmake file 940c53eba6

another include removed 32a9e0c704

another include removed 581ae4c990

Merge pull request 'Fix for event definitions' (#31) from mueller/fix-events into eive/develop ... 83635d3667

Reviewed-on: eive/fsfw#31

added missing baudrates 235fd79dfb

option to exclude libgpiod from build 9579e94a71

merged develop c0648a789b

adapt to develop 018d814f29

run clang format script 3c06d2dbbb

Merge pull request 'meier/halAdjustments' (#32) from meier/halAdjustments into eive/develop ... c20bf31d5d

Reviewed-on: eive/fsfw#32

started DHB docs 062e93fd88

Merge branch 'mueller/dhb-docs' into mueller/master 81f5b0c3bf

Merge remote-tracking branch 'upstream/development' into mueller/master 0d6d44f72f

bugfix in test task 9e92afbf07

error check in event manager b3482eba24

printout improvements bd05afbddd

update event mngr printout a12e98d948

added void* args to queue factory and mq ctor a5871ed0b1

this is a bit cleaner 0d66569687

cache mq args 508979d32d

passing mqArgs to all mq ctor calls cf69af4e7e

make periodic printout run time configurable d74a373f1d

Merge remote-tracking branch 'origin/eive/develop' into mueller/master c4a055986c

Merge pull request 'Update FSFW' (#33) from mueller/master into eive/develop ... 19f8e41c7f

Reviewed-on: eive/fsfw#33

applied clang format 701135e2a6

updated for windows compatibility 1e982ec00b

more time 3a5881a0cb

apply .clang format 3966b656e9

update changelog b440c30223

display run commands 389641f8fd

update spi clock polarity ... d88d7c938f

- Perform an empty SPI transfer after setting speed and mode

Merge branch 'mueller/spi-update-clock-polarity' into mueller/master e909c6b6f7

additional comment 2e230daa14

no default values for srv5 params 4747e54c5d

Merge branch 'development' into mueller/gpio-hal-updates 7ce2c1b624

removed unnecessary warning 123f2ff360

Merge pull request 'Update FSFW' (#34) from mueller/master into eive/develop ... 09c1918c1f

Reviewed-on: eive/fsfw#34

initial submode eacb4ac407

Merge pull request 'initial submode' (#35) from meier/dhbInitialSubmode into eive/develop ... 6e0b90696d

Reviewed-on: eive/fsfw#35

Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates 729bcc4aaf

use enum class afd3a942e2

Merge branch 'mueller/gpio-hal-updates' into mueller/master 28b28b5684

some updates 331aa9442d

Merge branch 'mueller/gpio-hal-updates' into mueller/master fa73ad6731

some fixes 6d825a1aa6

some fixes 68225586d2

Merge remote-tracking branch 'origin/eive/develop' into mueller/master 505e00c067

Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates 27267b7cb0

Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates 4cf2a384f3

Merge branch 'eive/develop' into mueller/gpio-hal-updates 2fed161eff

Merge branch 'mueller/gpio-hal-updates' into mueller/master 2d9216ba19

Merge remote-tracking branch 'origin/eive/develop' into mueller/gpio-hal-updates ac036b2a70

fix merge conflict e05e203c83

better printout for parameter code 0ccaf27fcb

Merge pull request 'GPIO HAL Updates' (#36) from mueller/gpio-hal-updates into eive/develop ... 75c56280ad

Reviewed-on: eive/fsfw#36

Merge branch 'eive/develop' into mueller/master e2eb6a46b6

docs 4e6c1cb72a

Merge remote-tracking branch 'upstream/development' into eive/develop c3c2e1c0dd

Merge remote-tracking branch 'upstream/development' into mueller/master aebab4c73c

docs 45f0d7fd45

renamed some ModeIF definitions 3c53e2c259

Merge remote-tracking branch 'upstream/development' into eive/develop d6c1041133

Merge branch 'eive/develop' into mueller/master 7571987a1d

small test device handler fixes a7cb2d4354

Merge pull request 'Update for Assembly Base' (#38) from mueller/master into eive/develop ... 5f23f709cc

Reviewed-on: eive/fsfw#38

better name of invalid mode retval 8b1c277c58

Merge branch 'eive/develop' into mueller/master 82a645deba

Merge pull request 'better name of invalid mode retval' (#40) from mueller/master into eive/develop ... 6de4798805

Reviewed-on: eive/fsfw#40

this is better 84f95e8d76

Merge branch 'eive/develop' into mueller/master 202cfc6dbb

define FSFW_DISABLE_PRINTOUT in any case dba3c27b99

Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/master d4c76a7e46

define FSFW_DISABLE_PRINTOUT in any case 155d66e534

Merge branch 'eive/develop' into mueller/define-fsfw-disabled-printout cc3210f366

function to get fsfw version 7ca6d1a695

Merge pull request 'Another HasModesIF improvement' (#41) from mueller/master into eive/develop ... b5e55f64b0

Reviewed-on: eive/fsfw#41

Merge pull request 'define FSFW_DISABLE_PRINTOUT in any case' (#42) from mueller/define-fsfw-disabled-printout into eive/develop ... 73f0b9c0dc

Reviewed-on: eive/fsfw#42

Merge remote-tracking branch 'origin/eive/develop' into mueller/master bf733162eb

Merge branch 'mueller/version-getter' into mueller/master 3b497dbb8d

set timeout in countdown ctor d63c01b96f

call setTimeout 47d158156b

Merge pull request 'call setTimeout' (#44) from mueller/countdown-improvement into eive/develop ... e498136273

Reviewed-on: eive/fsfw#44

Merge pull request 'function to get fsfw version' (#43) from mueller/version-getter into eive/develop ... d5ff6da40b

Reviewed-on: eive/fsfw#43

improved version.h 45b51f9ac8

Merge branch 'mueller/version-getter' into mueller/master 9509847b84

getter not required anymore b27f3b84aa

Merge branch 'mueller/version-getter' into mueller/master 06577ed78a

added tests 97bc71a3ff

Merge branch 'mueller/version-getter-upstream' into mueller/version-getter 3aa0bbde68

Merge branch 'mueller/version-getter' into mueller/master 60639f56dc

undef major and minor b5d6b9745f

Merge branch 'mueller/version-getter-upstream' into mueller/master 17262a1da9

minor event changes fec5f83f4f

sequence count operator overloading d4ade5e885

fixed merge conflict 1b7e0371c3

Merge remote-tracking branch 'upstream/development' into eive/develop 5ca5fe4040

Merge remote-tracking branch 'upstream/development' into eive/develop 38c87fdeb2

various tweaks and improvements 543daaa95a

additional docs ddc1cdb1f5

small form fix b6ed45a85c

added -- operator caf78835b2

Merge branch 'eive/develop' into meier/seqCount bac8b40880

added override specifiers 927041209b

Merge remote-tracking branch 'upstream/development' into mueller/master 16f2fa9327

some improvements for PowerSwitcher d791fc87b7

added active function 6dd6f28db0

more docs 2823420c46

doc additions bbe21e7e89

add option to directly check switch state 4b5e3e70f7

Merge remote-tracking branch 'origin/eive/develop' into mueller/master 6895dbcc81

Merge pull request 'Update FSFW' (#45) from mueller/master into eive/develop ... e6130263ef

Reviewed-on: eive/fsfw#45

Merge branch 'eive/develop' into meier/seqCount 79615e47e4

class to abstract gpio handling b52f19254b

Merge pull request 'meier/seqCount' (#46) from meier/seqCount into eive/develop ... a01002aa5d

Reviewed-on: eive/fsfw#46

Merge branch 'eive/develop' into meier/gpioClass acf0cdfba3

Merge pull request 'meier/gpioClass' (#47) from meier/gpioClass into eive/develop ... 283a37dccc

Reviewed-on: eive/fsfw#47

small order change in DHB 6ea1eabb2d

reworked power switch interface 60972228ef

tweaks for dummy power switcher 79f3c7324a

apply auto-formatter 3ea9f999b7

command action default arguments a230dc4313

extended command info 532607bf8f

Merge remote-tracking branch 'origin/eive/develop' into mueller/refactor-power-switch-if-etc-eive 7b6f68c509

Merge remote-tracking branch 'origin/eive/develop' into mueller/master c2581ff4f5

Merge branch 'mueller/refactor-power-switch-if-etc' into mueller/refactor-power-switch-if-etc-eive 127fbeb980

Merge pull request 'Refactor Power Module' (#49) from mueller/refactor-power-switch-if-etc-eive into eive/develop ... 61d0815de8

Reviewed-on: eive/fsfw#49

fix in getReplyLength 29cf8c9009

Merge branch 'eive/develop' into meier/dhbAlternativeReply fbf9626fde

Merge remote-tracking branch 'origin/eive/develop' into mueller/master b3d2d440d7

Merge pull request 'DHB and CommandActionHelper changes' (#50) from meier/develop into eive/develop ... ce2f7c4fdf

Reviewed-on: eive/fsfw#50

Merge remote-tracking branch 'origin/eive/develop' into mueller/master 8e26e287c3

apply auto-formatter 1bc7a91869

Merge pull request 'Update FSFW' (#51) from mueller/master into eive/develop ... 318cd8e244

Reviewed-on: eive/fsfw#51

add power switcher component 518666f822

new pool ctor which only takes len 761a0c9bac

this should also zero-init the pool entries e4c6a69f77

Merge branch 'eive/develop' into mueller/pool-entry-update 7530c44849

Merge pull request 'add power switcher component' (#52) from mueller/power-switcher-component into eive/develop ... 7df51f7202

Reviewed-on: eive/fsfw#52

printout improvement aded4fae1e

make reporting setter public 0677de39aa

emit warning in linux clock e3ffcae3e0

Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/master 43917d98c0

Merge branch 'eive/develop' into mueller/pool-entry-update 3325cc18fc

Merge pull request 'Pool Entry Update' (#53) from mueller/pool-entry-update into eive/develop ... 4dc903fe20

Reviewed-on: eive/fsfw#53

Merge branch 'eive/develop' into mueller/master a11d7455df

Merge pull request 'FSFW Update' (#54) from mueller/clock-update into eive/develop ... 51e7f1c2f2

Reviewed-on: eive/fsfw#54

improve clock error handler 5bda877d97

Merge branch 'eive/develop' into mueller/clock-update f94bc02b6c

Merge pull request 'improve clock error handler' (#55) from mueller/clock-update into eive/develop ... 85a6e4b129

Reviewed-on: eive/fsfw#55

pool entry takes const T* now 47ced1efac

Merge branch 'eive/develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into eive/develop 94ed582297

Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 290db6ccad

Merge pull request 'Update from FSFW upstream' (#56) from mueller/update-from-upstream into eive/develop ... 6ce09e968d

Reviewed-on: eive/fsfw#56

Merge remote-tracking branch 'origin/eive/develop' into mueller/ipc-pass-arbitrary-args-to-mq-eive 942d1e5e4b

Merge pull request 'IPC Pass Arbitrary Args to MQ IF' (#58) from mueller/ipc-pass-arbitrary-args-to-mq-eive into eive/develop ... 28e93696df

Reviewed-on: eive/fsfw#58

fix compiler warnings 478b305fbe

Merge branch 'eive/develop' into mueller/compiler-warning-fixes-upstream c45328b34d

Merge pull request 'fix compiler warnings' (#59) from mueller/compiler-warning-fixes-upstream into eive/develop ... 2734d9d758

Reviewed-on: eive/fsfw#59

Merge pull request 'Pool Entry Update V2' (#60) from mueller/pool-entry-update-v2 into eive/develop ... ce17be63f4

Reviewed-on: eive/fsfw#60

added DLE parser 5ff88129b8

uart cookie API change 935a8e13a5

Merge branch 'mueller/dle-parser' into irini e0c9bf5871

Merge pull request 'added DLE parser' (#61) from mueller/dle-parser into eive/develop ... 4d49cb6a3c

Reviewed-on: eive/fsfw#61

Merge pull request 'uart cookie API change' (#62) from mueller/uart-com-if-tweaks into eive/develop ... e949368b06

Reviewed-on: eive/fsfw#62

default argument 613dbe9592

add nullptr check 085213c60f

Merge remote-tracking branch 'upstream/development' into merge-upstream b128ef9da9

Merge branch 'merge-upstream' into mueller/lis3-handler-nullptr-check f0d7eaf35a

Merge pull request 'Merge upstream and apply auto-formatter' (#63) from merge-upstream into eive/develop ... 9798b6b4ab

Reviewed-on: eive/fsfw#63

Merge pull request 'LIS3 handler nullptr check' (#64) from mueller/lis3-handler-nullptr-check into eive/develop ... aa1ea33647

Reviewed-on: eive/fsfw#64

Merge pull request 'Space Packet Default Length' (#65) from meier/develop into eive/develop ... 2c0f3b52e9

Reviewed-on: eive/fsfw#65

space packet default length 0 9f7b9be800

Merge branch 'eive/develop' into meier/develop af4f002a25

Merge pull request 'space packet default length' (#66) from meier/develop into eive/develop ... befaca78c6

Reviewed-on: eive/fsfw#66

Merge branch 'eive/develop' into mueller/extend-version-class-fork 24ef96d1b8

Merge pull request 'mueller/extend-version-class-fork' (#69) from mueller/extend-version-class-fork into eive/develop ... 280b641cbc

Reviewed-on: eive/fsfw#69

option to use coutdwon object to time out replies 900ef5b912

Merge remote-tracking branch 'upstream/development' into mueller/update-fsfw 466a3639a5

warning fix for modern compilers 1739edd9b0

trying to export ETL lib 3d047f9629

exporting etl target 6a8da303fb

name correction c5a7b98a7d

find_package call for Catch2 quiet ec2e274f22

update CMakeLists.txt etl handling c1be1fe232

Merge pull request 'Update FSFW' (#70) from mueller/update-fsfw into eive/develop ... d61fe7db93

Reviewed-on: eive/fsfw#70

Merge branch 'eive/develop' into meier/develop 41682aab3f

Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream e2eb4bfea4

Merge branch 'eive/develop' into mueller/new-ss-adder-functions-eive 1c4ea6dd0d

added option to change initial submode 3225a8e350

space packet bugfix 43aad11859

Merge pull request 'Update from upstream' (#72) from mueller/update-from-upstream into eive/develop ... e867d09111

Reviewed-on: eive/fsfw#72

Merge branch 'eive/develop' into mueller/new-ss-adder-functions-eive d04f88bee0

Merge pull request 'New Subsystem adder functions' (#73) from mueller/new-ss-adder-functions-eive into eive/develop ... 7760b3063e

Reviewed-on: eive/fsfw#73

Merge branch 'eive/develop' into meier/develop 789668ae50

Merge remote-tracking branch 'upstream/development' into eive/develop 7f6c8b8b12

Merge remote-tracking branch 'origin/eive/develop' into meier/develop 15eb22f9ee

improved i2c error printout 2220120d54

Merge pull request 'improved i2c error printout' (#75) from mueller/i2c-error-handling-improvement into eive/develop ... 83d9dbc052

Reviewed-on: eive/fsfw#75

update read gpio API a9041b84a3

error check on line getter 3556eca8e8

dedicated returnvalue for line get failure 8ee26f81f9

Merge pull request 'Update GPIO API' (#76) from mueller/update-gpio-api into eive/develop ... 80cb0e682f

Reviewed-on: eive/fsfw#76

use warning instead of error f59b05c86c

Merge branch 'meier/develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into meier/develop 19bd26d998

Merge branch 'eive/develop' into meier/develop de2d4da161

Merge pull request 'DHB Reply Timeout' (#74) from meier/develop into eive/develop ... a72cc487df

Reviewed-on: eive/fsfw#74

remove the dot 71f704c980

Merge branch 'eive/develop' into mueller/fixed-seq-task-use-warning 9e5fb64d0e

Merge pull request 'Fixed Seq Task use warning' (#78) from mueller/fixed-seq-task-use-warning into eive/develop ... 43f0841d0a

Reviewed-on: eive/fsfw#78

cmakelists.txt hotfix d72b212fa6

getter functions for speed and mode 29c3a43760

update changelog 0e880de0d0

Merge remote-tracking branch 'origin/develop' into mueller/spi-speed-mode-getter 5941c21adf

Cache SPI device name in ComIF ... e06c457743

- Architecturally, this makes a lot more sense because
  each ComIF should be responsible for one SPI bus

Some improvements ... 56e4fca06f

- Rename mutex to csMutex to better represent its purpose
- Move the empty transfer to update the line polarity to separate function

update changelog and docs ab2d7ca98f

sequence count init value bc994595da

hotfix 0a97077a0e

Merge branch 'develop' into meier/sequenceCount 025e7647d3

Merge pull request 'sequence count init value' (#81) from meier/sequenceCount into develop ... 5eb52133ac

Reviewed-on: eive/fsfw#81

Merge remote-tracking branch 'origin/develop' into mueller/spi-cache-spi-dev-in-com-if dafcaa6007

reset read vec values, add getter function d1ff32bf96

Merge pull request 'SPI refactoring' (#80) from mueller/spi-cache-spi-dev-in-com-if into develop ... c0ff84bb9d

Reviewed-on: eive/fsfw#80

HasHealthIF additions ab45aa1296

Merge remote-tracking branch 'origin/develop' into mueller/health-if-extension-eive 02473a0cd7

resolve merge conflict fc2b709148

Merge branch 'develop' into mueller/cmd-executer-improvements c2de911efa

Merge pull request 'HealthIF extensions and upstream updates' (#82) from mueller/health-if-extension-eive into develop ... bf7388c059

Reviewed-on: eive/fsfw#82

Merge pull request 'Command Executor Improvements' (#83) from mueller/cmd-executer-improvements into develop ... ac78a79ca2

Reviewed-on: eive/fsfw#83

doc update 4841d5d92d

refactor task IF 7df1922633

refactor task IF dba08fed7a

refactored SPI mutex handling bcd19045cc

important fix 55ed7ab93e

Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 4b323053ec

Merge pull request 'Update from upstream' (#85) from mueller/update-from-upstream into develop ... 0ea044c203

Reviewed-on: eive/fsfw#85

Merge branch 'mueller/tcp-server-cache-client-addr' into develop e49de9422a

made auto-formatter even more re-usable 14a1b4a7ac

made auto-formatter even more usable e8023886f6

Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactor-spi-refactor d267a3651b

vector as core container is ok f9c42d3583

vector as core container is ok 18b342e94b

Merge pull request 'TaskIF refactoring and SPI refactoring' (#86) from mueller/task-if-refactor-spi-refactor into develop ... e758f0be2e

Reviewed-on: eive/fsfw#86

removed some changes which belong in separate PR 7b3de87364

Merge remote-tracking branch 'upstream/development' into mueller/task-if-refactoring d504589c3c

new base class for periodic tasks e87b5a0207

new base class for periodic tasks 86ca4f246b

minor bugfix b1e30ae9ff

minor bugfix b47eb0a7ff

refactoring host osal 1886da0d3f

continued refactoring 64e7d4bb5e

continued refactoring 08f1ebf9fc

refactored and tested hosted and linux task IF 3a16290707

Merge remote-tracking branch 'upstream/mueller/tc-11-tweaks' into mueller/tc-11-tweaks-eive 942bfafaa3

Merge pull request 'PUS TC11 bugfix and upstream updates' (#88) from mueller/tc-11-tweaks-eive into develop ... 336ad9b7be

Reviewed-on: eive/fsfw#88

warning printout correction c0292f072e

Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into develop 4cc108f3a1

fix host OSAL b8b7756a3e

Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactor-spi-refactor f35b0ffbbd

Merge pull request 'TaskIF refactor SPI refactor' (#89) from mueller/task-if-refactor-spi-refactor into develop ... 4b128d2435

Reviewed-on: eive/fsfw#89

Merge remote-tracking branch 'upstream/mueller/task-if-refactoring' into mueller/task-if-refactoring-eive 40cc557978

removed [[maybe_unused]] 24069dfd78

added cast for PUS11 c835525196

Merge branch 'develop' into mueller/task-if-refactoring-eive af7c6c57a3

service 3 and local HK man improvements 8cfe848dfe

use better type for stored limit ac62443f31

Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream c4fa7281ae

Merge pull request 'Update from upstream' (#94) from mueller/update-from-upstream into develop ... fbec1b3dc9

Reviewed-on: eive/fsfw#94
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'use better type for stored limit' (#93) from mueller/tmtc-bridge-tweaks into develop ... 76a459a02c

Reviewed-on: eive/fsfw#93
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactoring-eive c328891030

Merge branch 'mueller/task-if-refactoring-eive' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/task-if-refactoring-eive 2058817ba5

Merge remote-tracking branch 'origin/develop' into mueller/task-if-refactoring-eive cf35cca923

Merge pull request 'service 3 and local HK man improvements' (#92) from mueller/hk-improvements into develop ... d286fc1855

Reviewed-on: eive/fsfw#92
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'TaskIF refactoring continued' (#91) from mueller/task-if-refactoring-eive into develop ... ebbe08639c

Reviewed-on: eive/fsfw#91
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

disable pending commands and replies in MODE_OFF transition 3749f31ab4

Merge branch 'develop' into meier/dhb-disable-pending-commands 36652e6fce

removed debugging printout ab68817e9a

wrong initialization order 95a64e1da3

Merge pull request 'FixedTimeSlotTaskBase Bugfix' (#96) from meier/FixedTimeSlotTaskBase-BugFix into develop ... 043b8b5b3f

Reviewed-on: eive/fsfw#96
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge branch 'develop' into meier/dhb-disable-pending-commands 1d1d91f591

Merge pull request 'DHB Mode Off disable pending commands' (#95) from meier/dhb-disable-pending-commands into develop ... 5a69c1f8b9

Reviewed-on: eive/fsfw#95
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

enable hk cda81fc841

Merge branch 'develop' into meier/device-hk 7f3e5e42bb

corrected warning text af890c6218

Merge pull request 'HK Generation for L3GD20, LIS3MDL, RM3100' (#97) from meier/device-hk into develop ... c7618294ac

Reviewed-on: eive/fsfw#97
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge branch 'develop' into meier/eive-debug-info 1759700b6a

Merge pull request 'LocalDataPoolManager Warning Text' (#99) from meier/eive-debug-info into develop ... 438efe074e

Reviewed-on: eive/fsfw#99
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into irini ba3a99466a

compile DleParser 1910a7838c

some form updates 5abbf42e9f

Merge pull request 'some form updates' (#100) from mueller/afmt-gen-tweaks into develop ... 39881e7671

Reviewed-on: eive/fsfw#100

Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream a4247cd723

new clion folder in misc for .run configs 682abd1b5b

delete run configs c5eb09314f

Merge pull request 'Update FSFW from upstream' (#102) from mueller/update-from-upstream into develop ... 6a62cf7f1e

Reviewed-on: eive/fsfw#102
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>

Merge branch 'irini' into develop 4a2012ac30

Merge remote-tracking branch 'origin/irini' into develop 904ae2cc0e

Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 8970a7379a

get current uptime correctly 03fa77e2b3

add some Linux HAL options fdcfd89ed2

Merge branch 'mueller/group-mgm-data' into develop 7f89022f5b

printout preproc block f4c4f9946c

Merge remote-tracking branch 'upstream/mueller/expand-serialize-if' into develop b28091e05b

Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring d022ce82c5

fsfw fixes for merge 007f958a0b

update source sequence counter code 4d82d0e4c1

Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring c57e95c698

Merge remote-tracking branch 'upstream/development' into develop d975958120

improve verif reporter API d815f422c3

Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring e3648b6e30

Merge branch 'develop' into mueller/tmtc-stack-refactoring cdd0ca70ed

Merge pull request 'TMTC Stack Refactoring' (#106) from mueller/tmtc-stack-refactoring into develop ... 42c5881c50

Reviewed-on: eive/fsfw#106

added additional API for HK subscription params 7205885357

Merge branch 'mueller/tmtc-stack-refactoring' into develop 34c714eb17

important bugfix for verif reporter 7881f5bab8

Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/refactor-tmtc-stack-retval-merged f91ad84bdc

missing replacements f5866ddace

allow device tm in raw format 2a75440b32

additional safety check 9a590a3fcd

refactored dhb TM handler 3a47062f2a

basic data wrapper unittests bdd79d060d

additional test 192255df1c

Merge branch 'mueller/data-wrapper' into mueller/dhb-handle-device-tm 093052604a

update changelog 6b8c83be29

update changelog d675a789a2

Merge branch 'mueller/data-wrapper' into mueller/dhb-handle-device-tm e10e71cee9

Merge remote-tracking branch 'upstream/mueller/data-wrapper' into mueller/data-wrapper-update d4ed528426

Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into develop 4d17f1c4bb

Merge remote-tracking branch 'upstream/mueller/refactor-local-pool-api' into develop a8c066dccc

Merge branch 'develop' into mueller/data-wrapper-update 3ebebbd493

dump compiler erorrs.. efd2994dc5

this is annoying ae40543e3a

Merge remote-tracking branch 'upstream/mueller/dhb-handle-device-tm' into develop eedf57624f

now its getting interesting 21ac86619e

additional tests 8d1777fa0c

remove newline 20f0707813

Merge remote-tracking branch 'upstream/mueller/data-wrapper' into develop 6ebd6a965b

Merge remote-tracking branch 'upstream/mueller/data-wrapper' into develop 141dcb1f14

Merge remote-tracking branch 'upstream/mueller/dhb-handle-device-tm-2' into develop 726f44cafe

Merge remote-tracking branch 'upstream/mueller/dhb-handle-device-tm-2' into develop 2fa76d3663

small fix which allows sending action reply immediately cfca27542a

important bugfix for TCP TMTC server 496dac89e4

more simplfications cf8fe7ea72

Merge remote-tracking branch 'upstream/development' into mohr/merge-upstream bd594123a2

add CFDP handlers manually 385a0ffd73

Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers dbaeed83af

Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 86aafe4422

better error printout ee1c6a3f04

printout tweak 7e0a5d5a9e

Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 47df9e8b5b

Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 4fb7375492

Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 36ca35da77

adaptions for enum renaming 753d5ff39e

include helpers c549914efb

generic cfdp handler wrapper ed68268c0c

Merge branch 'develop' into mohr/merge-upstream ef9ed95fd1

Merge pull request 'merge upstream development' (#110) from mohr/merge-upstream into develop ... 1d54507517

Reviewed-on: eive/fsfw#110
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 7eb63d6d79

adaptions for enum renaming c38088c64b

Merge remote-tracking branch 'upstream/development' into update-from-upstream 1898b4f2db

Merge remote-tracking branch 'upstream/mueller/new-cfdp-update-with-handlers' into cfdp-integration 3d2fc28468

Merge pull request 'CFDP FSFW Integration' (#111) from cfdp-integration into develop ... 95aac7dc8d

Reviewed-on: eive/fsfw#111

pass message queue externally e2c1158337

pass message queue externally bdbe0cc9da

fixes and tweaks c5b24f2516

Merge branch 'mueller/smaller-tweaks' into develop 79ab0c4aa5

remove unused variable 808e3e0462

tweaks to make windows build again 6d2f44a432

last windows tweak 03e1a93250

another small windows tweak 2ca8d72e83

Merge branch 'windows-tweaks' into develop c932e51818

better comment 14a48fe41d

Merge branch 'windows-tweaks' into develop 9927dbb2e4

small important bugfix for DLE parser c47bed0760

formatting and smaller stuff 227535c461

this makes a bit more sense 78314ad966

typo 77f7fa2ef1

DHB bug b9d0ff8fb7

Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic f78344b8fb

this seems to work 7c5308429c

need to fix all of these TODOs f824004897

expose child itself in interface 10dd855244

added missing health and mode helper init acab5f6bce

move retvals 1eceef4645

try to do this in a simpler way cfc00d0260

some bugfixes 49747fc8a4

something is wrong d1630cdc4c

small additional tweak 1c53b60442

new uart helper module 40e7b2dc31

Merge branch 'mueller/uart-helper-module' into mueller/simplify-dle-parser 8195587604

DHB bugfix and addition 692be9df8d

Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic 7f180ac1fa

allow recursive mode announcements 221df7ece6

Service 200: Add mode announcement support 1d6ccfe5ab

add first CFDP events e893e73f86

events for FSFW specific errors 79c38b45df

some more basic error handling 9f81926aec

size check bugfix 14a8924a83

const specifier for AcceptsTelemetryIF 1aa062df7f

missing validity check 1e43296f2b

remove info printout 009700ce80

important bugfix for i2c device com IF 0c5c2f6c4f

oh god 73454c629c

Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic ec7566fb8c

Merge remote-tracking branch 'upstream/mueller/new-cfdp-update-with-handlers' into mueller/update-cfdp-components 2de9e25ceb

Merge pull request 'Update CFDP components' (#113) from mueller/update-cfdp-components into develop ... 754b71a35f

Reviewed-on: eive/fsfw#113

Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic 11422a658c

iter not a member anymore, more bugfixes b0c5a49b50

fs retval 1f05e6b297

minimal first version bddc7a7ca6

improvements for HAL com IFs 60ff411721

this api works as well 1b7e94d718

Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic fa01798ebb

UIO mapper can handle symlinks now 226dc4d8b7

Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic 852f27cec2

Merge remote-tracking branch 'upstream/development' into develop 2461209169

Merge remote-tracking branch 'upstream/mohr/dhb2normal' into mohr/dhb2normal af06969905

afmt f805667779

Merge remote-tracking branch 'upstream/mohr/dhb2normal' into mohr/dhb2normal e2eeccce50

smaller fixes for DHB 033676ad3b

Merge branch 'develop' into mueller/improve-ss-dhb-logic 61ab770d9d

Merge pull request 'Improve Subsystem DHB logic' (#112) from mueller/improve-ss-dhb-logic into develop ... 7600ed1ea7

Reviewed-on: eive/fsfw#112

Merge branch 'develop' into eive/dhb2normal a38279f813

health helper dtor bugfix e302c89f74

missing fifo pop command e1d4209fbe

add new ping with data TC 91ebf98c28

Merge remote-tracking branch 'origin/develop' into eive/dhb2normal f0fa1bf477

use uniform uart api 6efa482eb0

Merge remote-tracking branch 'origin/develop' into eive/dhb2normal 8a61af779d

missing replacements 00f1c5bbe9

Merge branch 'develop' into eive/dhb2normal 9a0cc64be3

higher default MQ depth for events, printout tweak e5b5c7d253

Merge pull request 'dhb2normal' (#115) from eive/dhb2normal into develop ... 84b9d1ce21

Reviewed-on: eive/fsfw#115

extend uart helper a bit 672fca5169

added missing const specifier 0e8f5ddd26

dedicated header file for container retvals 530a261e14

helper interface implementations 177c39dd53

fix compiler error for fixed array list copy ctor 194b3e100a

fix unittests 6ca1a5c796

this not crash 2a203ae13d

some renaming and tweaks for linux serial driver 39946bff58

Merge branch 'mueller/refactor_serial_linux' into develop e03e7f5260

Merge remote-tracking branch 'upstream/development' into develop_update 002845108d

muellerr added 1 commit 2022-11-15 09:58:37 +01:00

update changelog 1f58ba1f9b

muellerr added 5 commits 2022-11-15 11:24:29 +01:00

this is better / more correct 686dc97234

make warning switch protected 5e5eb82830

afmt 99927b8e95

remove data wrapper be4a87535d

remove includes c5f91926c9

muellerr added 1 commit 2022-11-28 08:28:50 +01:00

Merge remote-tracking branch 'upstream/development' into develop_update 1de1b045cd

muellerr added 4 commits 2022-11-28 08:36:13 +01:00

small fix to allow teardown handling 160ff799ac

Merge remote-tracking branch 'upstream/development' into develop 2643ff194c

remove data wrapper 46a1c2bace

Merge branch 'develop' into develop_update e86d8c64db

muellerr added 1 commit 2022-12-19 15:01:40 +01:00

Merge remote-tracking branch 'upstream/development' into develop_update 48403c002d

gaisser marked the pull request as work in progress 2022-12-19 15:06:22 +01:00

muellerr added 46 commits 2023-02-07 12:24:07 +01:00

run black 8eb869e073

statically assert MAX_SIZE > 0 5b0ea91222

introduce error counter to avoid spam 05cad893a2

remove duplicate printout 5bb66c9723

add size and crc check for contained TC bf12f284fa

update changelog 97c629ad84

typo a4531e4ced

small include improvement d16c5024dc

Merge remote-tracking branch 'upstream/development' into develop 75fa7caf25

Merge remote-tracking branch 'upstream/service_11_bugfixes' into develop accaf855ee

Merge pull request 'Service 11 TC Scheduler Robustness Improvements' (#720) from service_11_bugfixes into development ... 0e7c6b117f

Reviewed-on: #720

small tweak, gain factory was always them same bd189518b6

small tweak for printout 049e3b431d

connect mode tree parent: make health helper optional da12495335

improve srv20 error messages 226818886f

allow using SO_REUSEADDR and SO_REUSEPORT on TCP server c64b9b3e71

Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into develop 9a4ae550ab

re-order fields in TcpConfig 7766b24a1d

proper announce all impl 5c35b8e3cd

beatufil 1cacceddad

update changelog 64787f85ca

service 9 update ... 7ee83e4e5d

- fix time info event
- add time dump subservice

service 9 update ... 7e94baceef

- fix time info event
- add time dump subservice

Merge branch 'updates_fixes_pus_time_service' into develop 5f481739d8

update changelog 1f88c006d9

Merge branch 'updates_fixes_pus_time_service' into develop bd586f6564

small but important bugfix for health service d9d253d3bb

set sequence flags for PUS TMTC to unsegmented 2339712373

set sequence flags for PUS TMTC to unsegmented e93137939e

changelog update 0f811777a7

Merge branch 'bugfix_pus_packets_seq_flags' into develop 01cc619e67

helper method for commanding mode f2461cd7e9

Merge pull request 'Bugfix PUS packet creators Sequence flags' (#727) from eive/fsfw:bugfix_pus_packets_seq_flags into development ... e300490b93

Reviewed-on: #727

fixed Z value calculation d17ec02cf0

bump changelog acfc1cbf21

Merge pull request 'RM3100 Z-Value fix' (#123) from RM3100-fix into develop ... a78fe0a7f3

Reviewed-on: eive/fsfw#123
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

changelog update 3250bbf269

bugfix in setNormalDataPoolEntriesInvalid ... e11eabdbcf

Do not forget to call read and write to actually update the
validity state

bugfix in setNormalDataPoolEntriesInvalid ... 5343844be5

Do not forget to call read and write to actually update the
validity state

changelog 4374c7c4f4

Merge branch 'bugfix_dhb_set_datapool_entries_invalid' into develop 38789e053b

Merge remote-tracking branch 'upstream/development' into develop 06e30684fe

correction for printout, add prefix 0a23f2c85a

suppress error if ETL is not found 539d7aac9e

Merge branch 'cmakelists_update' into develop 2646707d3f

Merge branch 'develop' into develop_update e9d629b9b3

muellerr added 2 commits 2023-02-07 12:31:20 +01:00

use upstream changelog 37e850c5a7

Merge branch 'develop' into develop_update 4dc49c57d5

muellerr added 154 commits 2023-03-15 11:50:08 +01:00

dont know if I am going to need this 56e8e5a8b3

needs some fixing 096af44e39

add prototype for new ToAscii CCSDSTime function 819a2bfac4

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 4d2802a470

remove file 0303c1a885

Merge branch 'develop' into mueller/pus-15-tm-storage 046dbe1deb

impl function to generate ASCII timestamp sec accuracy 61fd5d1b62

afmt 2b6a33e718

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 296bc56e2a

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage e68f54b9bd

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 1b005d706a

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 75fc7a056d

make function public 2aa4af6974

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 041d1b8795

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 0cc3231ceb

Merge remote-tracking branch 'upstream/development' into updates_fixes_pus_time_service b1e9dd9e4a

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 6af5274b68

time stamper empty ctor 06dca7608a

time stamper empty ctor 7e7b3bbbc9

bump changelog b22d439300

Merge remote-tracking branch 'upstream/development' into updates_fixes_pus_time_service 46230e6c6d

Merge pull request 'Time Service 9 update' (#726) from eive/fsfw:updates_fixes_pus_time_service into development ... 4cf52d5dfe

Reviewed-on: #726

Merge branch 'develop' into mueller/pus-15-tm-storage a1567de9e8

Merge remote-tracking branch 'upstream/development' into empty_cds_short_ctor 3ed49dbae3

add back HAL section 69c94645df

comment tweak to event parser can read everything c8e065a713

important bugfix for RM3100 c2e6a22dec

changelog update 5adf89b911

introduce warning switch f39054edd4

1000 is a bit much 40a9e12416

that stuff is not in upstream yet.. 134d908f26

mode service fixes ec12ab5daa

bump changelog 84dc7ac0ce

mode service fixes 8014e4adf9

bump changelog 6445debfa1

Merge branch 'mode_service_fixes' into develop 88b2b0e005

make it consistent 84bbef0167

Merge remote-tracking branch 'upstream/development' into mode_service_fixes a419806a05

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 7f907fb9d3

possiible leak fixes 6f05d6b7b0

possiible leak fixes 1fffcc2229

bump changelog 000df85556

add PR link f1b0ca7cff

Merge branch 'possible_tcpip_bridge_fixes' into develop 6ce80ea6c5

Making fetch Catch2 quiet as well. 8c712441ab

Merge pull request 'comment tweak to event parser can read everything' (#732) from eive/fsfw:health_if_update into development ... 1809ce359b

Reviewed-on: #732

Merge pull request 'RM3100 important bugfix' (#733) from eive/fsfw:rm3100_fixes into development ... f94987c46d

Reviewed-on: #733

Merge pull request 'time stamper empty ctor' (#730) from eive/fsfw:empty_cds_short_ctor into development ... 0c6465cd95

Reviewed-on: #730

Merge pull request 'TCP/IP TMTC bridge memory leak fixes' (#737) from eive/fsfw:possible_tcpip_bridge_fixes into development ... 5f7172e130

Reviewed-on: #737

Merge branch 'development' into mode_service_fixes dfb1633f00

removed unneeded find_package parameter for etl 010509efb4

Merge pull request 'CMakeLists file updates' (#731) from eive/fsfw:cmakelists_update into development ... b676040c7c

Reviewed-on: #731

Merge pull request 'Generic TMTC Bridge Update' (#734) from eive/fsfw:tmtcbridge_tweaks into development ... c752b6d143

Reviewed-on: #734

more style 3a2393885f

Merge pull request 'Mode Service Bugfixes' (#736) from eive/fsfw:mode_service_fixes into development ... fa7675897d

Reviewed-on: #736

refactor DHB: Bugfix for thermal module b279985859

important bugfix for thermal set 1841f92944

that time margin check is possible broken f4d188c36f

logic error 820a7f059c

that time margin check is possible broken d93486a340

logic error b9b076aa4c

changelog 341a66c265

Merge branch 'possible_tc_sched_fixes' into develop e4fd424d66

typo 14a92b3d89

afmt d302ba7185

added missing CS unlock 7fae6cbd6d

better error msg 8b4f73a97b

updates for thermal module in DHB dac2d210b5

bugfix for SPI ... f0b8457ba2

- Set transfer length to 0 for failed transfers

fix cppcheck lint d256ede8c1

printout corrections 9de6c4b3aa

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 70b785984c

remove obsolete mode fe41d73895

SubsystemBase: Add function to update child modes a6d707a7db

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage dae5e988fd

service 11: cast to fix warning be015b4c66

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage c745c0c8b4

i2c small improvements e3c968096b

how the hell does this break anything fcd84b59ae

lets see if this fixes the issue 3568bdbecf

better naming 5f9eb01d94

wtf is this interface 2d6622b8b8

a lot of bug potential here c8469ca647

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage b45206ccd6

printout tweak c327985222

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage e1711f0345

add pus 15 store ID 2a0c244468

missing include 2efff4d2c5

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 206af00c8b

printout fixes bd208038dd

Merge branch 'develop' into mueller/pus-15-tm-storage d373c45d36

execution complete abcf1b29b2

some fixes and improvements f0415a97b1

use timeval instead of uptime 6eba84566d

allow dest handler to handle folder destinations 893b434728

Merge branch 'develop' into stopwatch-fix c2d9370aa1

Merge pull request 'use timeval instead of uptime for stopwatch' (#125) from stopwatch-fix into develop ... 174a6aa862

Reviewed-on: eive/fsfw#125
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage 216f603d62

Merge branch 'mueller/pus-15-tm-storage' into develop bdfe31dba4

update for SPI/gyro dev handler code cf735143fe

refactored MGM device code 511d07c0c7

allow passing context to mutex guard f84097543e

add lock context for pool manager 245886c555

use sys clock for Countdown 78cf00315d

extneded and fixed countdown unittests 64537d442a

Merge pull request 'timeval: Use system clock' (#126) from feature_timeval_use_sysclock into develop ... 6e17e45506

Reviewed-on: eive/fsfw#126

configurable queue depth 6006c97e48

remove obsolete constant 4d353a1ad2

Merge pull request 'configurable queue depth' (#127) from feature_configurable_queue_depth_tcpip_servers into develop ... 33de15205b

Reviewed-on: eive/fsfw#127

new monotonic clock API 95dab69b35

renaming 04ee3c7362

add basic impl (no windows) for host bbf0d7a0d2

return FAILED for win a39f1271ec

more todo docs 5cd7b98ba7

Merge pull request 'new monotonic clock API' (#128) from feature_monotonic_clock_api into develop ... 2c5af91db1

Reviewed-on: eive/fsfw#128
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

added length check e9d9f44605

allow submode mask now 2745b2080d

add copy and assignment ctor for mode definition 4c48668125

bugfix in submode check logic af58c414fc

afmt c80a3752d9

Merge remote-tracking branch 'origin/develop' into feature_allow_submodes_mode_list_entry d9a139e1ef

review improvements 070b48ada2

Merge pull request 'Feature: Allowed Submodes Mask for Mode List Entry' (#130) from feature_allow_submodes_mode_list_entry into develop ... 7f6ba5f40b

Reviewed-on: eive/fsfw#130
Reviewed-by: Steffen Gaisser <gaisser@irs.uni-stuttgart.de>

OFF -> NORMAL: Set transition source modes 1b7493f945

Merge pull request 'OFF -> NORMAL: Set transition source modes' (#131) from off_to_normal_transition_sources into develop ... 9ee3cdf729

Reviewed-on: eive/fsfw#131

exceptionless host filesystem 26e4445189

Merge pull request 'exceptionless host filesystem' (#132) from avoid_exceptions into develop ... 23d9b44b3e

Reviewed-on: eive/fsfw#132

Modes: reusing submode for mode mask, more unittests f0bddfcb21

Merge pull request 'Modes: reusing submode for mode mask, more unittests' (#133) from mohr/submode_mask into develop ... a8de395ea0

Reviewed-on: eive/fsfw#133
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

better error printout for i2c write error 87462afe6d

Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into develop c162acb7df

Revert "Modes: reusing submode for mode mask, more unittests" ... 55f6825a03

This reverts commit f0bddfcb21.

event manager queue depth configurable 4d6f6e6b23

optimization for cmd executor 9a8d775eb1

basic faulty cb for power switcher component 7208343b6d

possible fix for power switch component 8382d61b92

power switch IF improvements 0b0a0299bc

Merge branch 'develop' into feature_power_switch_faulty_cb 1cfebb5d47

Merge pull request 'basic faulty cb for power switcher component' (#134) from feature_power_switch_faulty_cb into develop ... 0973ba6bf2

Reviewed-on: eive/fsfw#134

make dataset enable idempotent b6b9d1d790

HK helper simplification bf980d74c0

some compile fixes aac32e763c

add spill option 40405fe6c7

changelog 5ba69b169f

Merge pull request 'Pool Manager spill to higher pools option' (#135) from pool_manager_spilling_opt into develop ... 4c88ab80c8

Reviewed-on: eive/fsfw#135

Merge remote-tracking branch 'origin/develop' into periodic_hk_helper_simplification afbe5e1f65

remove more code c61c85280b

changelog 522bd41d6e

Merge pull request 'Periodic HK helper simplification' (#136) from periodic_hk_helper_simplification into develop ... 5250423d1d

Reviewed-on: eive/fsfw#136

just hardcode spill option to true f84e3284ab

changelog cf27954a86

Merge remote-tracking branch 'upstream/development' into develop d0607824ad

resolve some more merge conflicts 43fd0b2f59

Merge branch 'develop' into develop_update 54ef9ec3f6

muellerr added 76 commits 2023-09-01 12:14:04 +02:00

transition source submode is tricky 227524a21d

add flush functions for serial helpers 341437df13

rename namespace f8a7c1d4ed

use RR sched instead of FIFO for Linux RT 33ac395072

allow creating regular threads db4587bb59

Merge remote-tracking branch 'origin/develop' into allow_creating_regular_threads 7ed75ea87b

Merge branch 'develop' into use_rr_sched 2c4e110254

Merge pull request 'use RR sched instead of FIFO for Linux RT' (#139) from use_rr_sched into develop ... bf02061d47

Reviewed-on: eive/fsfw#139

Merge branch 'develop' into allow_creating_regular_threads bfb5c2ff03

add BUSY retval cf6150cc18

Merge pull request 'add BUSY retval' (#141) from busy_retval_dhb_com into develop ... 3b86545725

Reviewed-on: eive/fsfw#141

try to do this cleanly d16b3c7e67

default value e704295cce

fix host OSAL 4415dc24e1

this is so confusing a937b457f9

Merge branch 'develop' into allow_creating_regular_threads 6328b70d7b

Merge pull request 'Allow creating regular threads' (#140) from allow_creating_regular_threads into develop ... b814e7198f

Reviewed-on: eive/fsfw#140

HK service configurable queue depth b31e1037fb

start power switch component in undefined mode 314f0fa2cd

ctrl base bugfix 4f632e2c68

initialize switch state list e2e87b149d

i dont think ths needs to be public 1e3c89b672

new register function 7a392dc33a

add O_SYNC flag for UioMapper 7966ede11b

make health functions virtual 94cdf67a80

changelog 4af90f99f3

Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into develop 9fca7581dd

change collection interval is public now 6650c293da

accepts action commands without ipc data 5a9304765f

add skip directive for retvals e97fa5ac84

clean up spi retval defs 285d327b97

move CFDP handler 894d1e3b87

Merge pull request 'move CFDP handler' (#142) from move_cfdp_handler into develop ... ffa2fa477f

Reviewed-on: eive/fsfw#142

even better event manager printout 7f61d17cee

DHB fdir: event queue depth confgurable 5eb9ee8bc1

use both LPFs 258f0d3313

CFDP and unittest bugfixes cae131edcf

proper floating point comparison 1a77e6bb09

changelog 4391823f01

werks e0adb3325f

Merge pull request 'CFDP Bugfix' (#144) from cfdp-bugfix-unittest-fixes into develop ... aafa53148e

Reviewed-on: eive/fsfw#144
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

Merge remote-tracking branch 'upstream/development' into develop 9372b2a575

configurable queue depth b442ca09b9

Merge pull request 'Rework L3GD20H Config' (#143) from gyr-config-rework into obsw-v3.0.0-dev ... efe217a197

Reviewed-on: eive/fsfw#143

Merge branch 'obsw-v3.0.0-dev' into service-8-configurable-queue-depth b3beedad9f

Merge pull request 'configurable queue depth' (#146) from service-8-configurable-queue-depth into obsw-v3.0.0-dev ... 3a70229510

Reviewed-on: eive/fsfw#146

Merge branch 'develop' into obsw-v3.0.0-dev 9a4bf51006

Merge pull request 'Pull CFPD bugfix in dev branch' (#147) from pull-cfdp-fix-into-dev-branch into obsw-v3.0.0-dev ... 5322de0599

Reviewed-on: eive/fsfw#147

make number of parallel cmds configurable 74b164b1da

Merge pull request 'make number of parallel cmds configurable' (#149) from make-srv3-num-parallel-cmds-configurable into develop ... 0a977ea688

Reviewed-on: eive/fsfw#149

specify truncate flag explicitely f2947bc78e

Merge pull request 'specify truncate flag explicitely' (#151) from specify-truncate-flag-explicitely into develop ... ad01642fee

Reviewed-on: eive/fsfw#151
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

max value calc fix f80c5980ea

nullptr check for optional argument c7037d417a

Merge branch 'develop' into max-value-fix-v2 87f94a252f

Merge pull request 'max value calc fix' (#153) from max-value-fix-v2 into develop ... 268c2e87c9

Reviewed-on: eive/fsfw#153

typo 0f76cdb3ba

some thnings are configurable now a85a38c882

typo 2293e7f2bb

add API to set msg counter c3572e31a8

Merge pull request 'Internal Error Reporter Configurability' (#154) from internal-error-reporter-set into develop ... 6aff3250c2

Reviewed-on: eive/fsfw#154

Merge remote-tracking branch 'origin/develop' into pus-msg-counter-mutable 7e8845f2c2

Merge pull request 'add API to set msg counter' (#155) from pus-msg-counter-mutable into develop ... 8da89eba80

Reviewed-on: eive/fsfw#155
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

countdown based HK generation 110cb903a6

added back missing function 9c8b1c697b

important bugfix for PUS TM creator 88e8665280

countdown 988e07f0be

Merge branch 'develop' into hk-generation-countdown-based 36caa58043

Merge pull request 'countdown based HK generation' (#156) from hk-generation-countdown-based into develop ... 42e74d22cc

Reviewed-on: eive/fsfw#156
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

small tweak to allow immediate HK generation a26b0c38ac

shared cmake file aac74fae38

fix unittest 62ace649a7

Merge pull request 'Small tweak to allow immediate HK generation' (#158) from small-hk-tweak into develop ... d575da8540

Reviewed-on: eive/fsfw#158
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

tle is too old after 30 days now 796c7a9e37

Merge pull request 'Change TLE validity duration' (#159) from spg4-tle-too-old into develop ... d246ce34d0

Reviewed-on: eive/fsfw#159
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge branch 'develop' into develop_update a837a78bd4

Some required checks failed

Hide all checks

fsfw/fsfw/pipeline/pr-development There was a failure building this commit

Details

This pull request has changes conflicting with the target branch.

• CHANGELOG.md
• src/fsfw/events/EventManager.cpp
• src/fsfw/events/EventManager.h
• src/fsfw/subsystem/modes/ModeDefinitions.h
• unittests/CatchFactory.cpp

This pull request is marked as a work in progress.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u https://egit.irs.uni-stuttgart.de/eive/fsfw develop_update:eive-develop_update

git checkout eive-develop_update

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

API Change

Changes the API, so Users need to adapted

Breaking API Change

Changes the API in a non backwards compatible way

bug

Something is not working

build

Issues related to the buildsystem, including CI

cosmetics

Small change most users won't notice

Documentation

Improvement of code documentation

duplicate

This issue or pull request already exists

feature

New feature

help wanted

Need some help

hotfix

Quick or important fix that is merged directly into master, causing a new revision

invalid

#worksforme

question

More information is needed

Refactor

Contains a refactoring of some code

Tests

Issues related to testing code

wontfix

This won't be fixed

No labels

Milestone

No items

No Milestone

Assignees

Clear assignees

ahinkel (Andy Hinkel) gaisser (Steffen Gaisser) jenkins_buildfix meierj (Jakob Meier) mohr (Ulrich Mohr) mspahr muellerr (Robin Müller) tbaumgartl (Tobias Baumgartl)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: fsfw/fsfw#706

Allow edits from maintainers