v1.12.0 #269

Merged

muellerr merged 493 commits from develop into main 2022-07-04 11:19:05 +02:00

Conversation 0 Commits 493 Files Changed 264 +11741 -6970

muellerr commented 2022-07-04 11:09:16 +02:00

Owner

Copy Link

No description provided.

muellerr added 492 commits 2022-07-04 11:09:19 +02:00

changes in supervisor commands 9837a1b62c

supervisor udpate wip f058cf5e31

fixes identified during tests 3f6a534db5

tmtc update d51a73f15b

tmtc update df2295b430

update helper wip c0fd9aee6f

Merge branch 'meier/plocSupv' into meier/plocSupvUpdate dbe4f70d8e

ploc update b440fc3df6

implemeted ICD changes 05a85ab8a1

tmtc update 0fba1b6494

use structs instead of classes 7f51ffc8fb

event buffer request wip bd8cd49117

tmtc update f679461164

supervisor event buffer request 10343a0dab

tmtc update 285ec9be6a

supervisor fixes detected during testing 7b54855397

merged develop 1ce45acba3

improvements in supervisor helper ffd64d0463

tmtc update 4895f940f3

fsfw update 52c539bc6b

tmtc update 0bcb332ce9

adc report cf37d74728

tmtc update 836a2327f9

submodule updates 23b2d895bb

rw assembly afc0f37e8a

Merge branch 'develop' into meier/plocSupvUpdate a8f5a4054f

logging command 2ee9b09b27

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 3fbebd6a9f

continued RW Assembly 165a4ef814

update changelog 88249cd5be

update config.h.in file 1069762903

update project file: changed default unix sysroot d29dd48d1e

make RW handler more generic 974ff0a13e

include fix 8b612d9116

increased delay cycles of execution report b63c3bb9c3

fixed conflicts 4a2ba043cb

tmtc update ce41e4c219

fixes identified during tests 9301206485

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 9f3a56e5e6

submodule update 6bdb13b6a0

regenerated events 6876952bbd

mpsoc shutdown after running update procedure 311ec7b194

warning print when memory check command fails 3e8429b34b

commented in read function again 42194abb4a

countdown based timeout 8610e48b19

tmtc update 20a2aa73ae

added test code 7543a92dd9

fixed conflicts 7682a1d214

supervisor reset pl command 898753f6e3

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass ca1365df5b

update fsfwgen 4f72fb355c

fixed conflicts 582d2db05f

update fsfw e18661bb59

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 1527b60fd6

include fix 31fa2f0d8d

remove etl::pair usage 73fbdfeb25

prevent sending boot command when mpsoc booted via jtag 794ed04761

fixed conflicts 7c770b5aec

added generic GPIO checker 0b64999ce2

read gpio tm handling f0884c0096

fsfw update 09fc8babc4

execution status code wip 73c653d21d

fixed conflicts bf281343c6

repoint tmtc submodule fe28588875

continued reboot command 5888d90fbc

xecution status code parsing 9d4cb2ea8d

tmtc update 02f352e51f

commented in time file writing again cf20d8e94d

gpio state sent with execution report cedc6bec23

execution status codes 7afb8e9070

restructuring execution report handling 816dc43214

tmtc update 1635e40c79

tmtc update 8ecbeb058c

fix conflict 6f53c39485

run generator scripts 6524f924c9

improved acknowledgment and execution handling in supervisor handler e1ffa97232

tmtc update cf4305be55

tmtc update 6636f42dc2

time file writing commended in again 729b8f547c

decreased acs handler task stack size 016ca8cb7e

run clang format script 6d322c6e78

decreased stack size of supervisor helper task 20138d52b1

removed ptme test data sending 03b7b802c5

removed changes can rx task 3ff709a814

fixed merge conflicts be752997eb

added doSendReadHook to prevent com if polling when com if is used by helper task 49b0825f63

re-generate event list 9e2eca3e36

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass bab8412f10

bump tmtc 3a52540d0e

bump fsfw eb6b166662

tmtc update 3c858d26f1

bugfix pcdu handler command queue reading 690b41777b

tmtc update d1a9924acc

removed debug print 7a6b45b102

Merge branch 'develop' into mueller/rw-ass a54d89c90f

bump submodules 0abb726b30

add health IF to heater handler 238afbaa8b

added health helper to heater handler b98c691c2b

Heaters are own objects with HealthIF now 9449919b2b

re-use existing enum 1f8a68dabe

additional try catch block 0172351e89

supervisor set time during start up 464821cc6f

tmtc update 70884d3a46

supervisor do startup fix 5380ed216b

Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if 88842d4f07

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 06df558be0

Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if 2470039dfb

bump submodules bc28ae4d1f

ignore new build folder name 8f9e8fe3fb

Merge branch 'mueller/refactoring-conf-handling' into mueller/heater-health-if ae0120f3ef

small fix for generic factory header d79323c6ca

named heaters 1536a0f94b

bump tmtc IF 5f5c996cfd

update for updated gpio API 50ca378318

bump fsfw 86dd67bf06

add mutex protections for switcher states d0e18f8b35

removed unused ploc commands, fix in logging report reply 475f6f1687

comment out debug printout 92f95b2b97

Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if a3e33bb627

Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if d59e71b056

Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if 4311c5b6a7

bump tmtc 73e4b0cc81

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 3458c272ad

Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd d108f7bbda

Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd be7cab6032

Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if 0d15694fc3

bump tmtc again 9c888e75bc

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 79d48d9630

Build unittest by default in host build ... c83a177061

- Also update CI/CD to build host build

Merge branch 'develop' into mueller/ci-cd-build-host-and-unittest-by-default 1a6fb52e1d

update changelog a2e22302fb

Merge branch 'mueller/ci-cd-build-host-and-unittest-by-default' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/ci-cd-build-host-and-unittest-by-default c24d5c05f0

Merge remote-tracking branch 'origin/main' into mueller/ci-cd-build-host-and-unittest-by-default 54a50beacb

cam cmd reply handling 8aacbc2b40

tmtc update 5441520369

update tmtc, gen files and formatting in config file bcb6df87b0

Merge branch 'develop' into mueller/reboot-cmd e4ebd87875

Merge branch 'develop' into mueller/rw-ass 3a0cf0cb38

update .cproject file 95a634ea7f

separate PST for RWs 28c9e33d1c

improvements for mram dump 8832d06d03

tmtc update e5fdf23dd7

no time command sent during startup of supervisor 9bd5595999

Some RW improvements ... 590fe6ca39

- Moved Events to definitions file
- Added new event if reset occurs
- Deliver state if there is an error (going to be 0, still deliver it)

apply afmt, some more renaming 1f6aab8124

better heater obj id names 4c809e354d

bump submodules c1dc5846cd

maybe this fixes the timing issue? cf4edac604

bump submodules 165963ed2d

assign better sus names a232b9bf98

bump tmtc again b9535f46d9

update changelog 4445ac34ca

bump submodules 957c8f5298

better RTD names b426475ca4

update changelog cc662738f2

Merge pull request 'Rename RTDs' (#246) from mueller/rename-rtds into develop ... a3419412cc

Reviewed-on: #246
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

nvm enable command 5911ca79b5

supervisor do startup set time fabd81365b

tmtc update 5c7c5b468a

Merge remote-tracking branch 'origin/develop' into mueller/rename-sus 0c82d06ec4

Merge remote-tracking branch 'origin/develop' into mueller/ci-cd-build-host-and-unittest-by-default 8f9d84c293

Merge pull request 'Build unittest by default in host build' (#244) from mueller/ci-cd-build-host-and-unittest-by-default into develop ... 6893b895e3

Reviewed-on: #244
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/rename-sus a2a7313016

install catch2 for CI/CD b54641a2a1

use newer docker container d5 a920f60c61

update changelog e98563d834

Merge pull request 'Rename sun sensors' (#245) from mueller/rename-sus into develop ... a7b696884c

Reviewed-on: #245
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if a11a8c493d

lets hope this works 81b29cfda6

Merge remote-tracking branch 'origin/develop' into mueller/install-catch2-docker a945b3cae0

remove duplicate object ID 68938c3b42

small dockerfile fix 09f80f63b5

apparently python3 is needed 31425877b4

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 22060b9b16

Merge pull request 'install Catch2 for CI/CD' (#247) from mueller/install-catch2-docker into develop ... 9918aae94a

Reviewed-on: #247
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge branch 'develop' into mueller/rw-ass 1c2f80f48e

Merge branch 'develop' into mueller/reboot-cmd 99a8cd0f2d

Merge branch 'develop' into mueller/heater-health-if e6cbe3068d

bump fsfw (hotfix) bfd7d9d82d

fix .cproject file 385d8df466

updated eclipse launch files 576f71304c

added helper script for yocto installation ... fe4315666b

- Installs compiled binaries into yocto repo for rootfs rebuild

Merge remote-tracking branch 'origin/develop' into mueller/yocto-helper-scripts 338cb9d502

build script bugfixes 9383a6088b

corrections for install script bacce95881

docs 2f182a5e21

copy version file as well e4bbdbc532

important bugfix cc25489e75

create generic OBSW by default and copy to unique 08dc8630d6

this works better 7ab0a3683c

install non-stripped files now a5a79da723

bugfix in missed reply hanling of supervsior MRAM dump 132751893b

tmtc update cbb3c92885

increased mram dump execution timeout 97222cafd9

Merge branch 'meier/ploc' into meier/plocSupv 4ba26f057d

fixed merge conflicts 6dd57a3f5e

removed ploc updater 322db3d617

run clang format script d9c7cccf76

preprocessor define adjustments 43b0ed4b04

changed set ids 631bc61d6c

update other helper scripts as well 3cca73ae9f

update CHANGELOG 9884ea225e

update changelog a4e36ebdb6

fixed reorder warning in imtq handler 2ff8923c81

preprocessor define fixes f8addd9365

adaption in DummyGpioIF due to API change in GpioIF d9024b6c22

removed unused includes 2bc2325b1f

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 1fea619ac0

Merge branch 'develop' into mueller/heater-health-if 37e81d34c9

fixed ploc supervisor build error which was hidden by prerocessor define 421237bfb7

Merge pull request 'PLOC Handler Update' (#234) from meier/plocSupv into develop ... 9f9fa9b41b

Reviewed-on: #234
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/yocto-helper-scripts a66632c040

repoint tmtc 7de968937e

update README e59026d87c

added back deleted part 54a36ac275

Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if d9085e81a1

removed redundant SUS OBJ ID defs 646925c571

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 71d9553f90

renamed heaters 4864394590

new RTD reader module handling all RTD SPI Communication 50c363fb6f

ccsds config for te0720-1cfa 907b8f4a5d

Merge branch 'develop' into meier/ccsds 49d21fef2a

added void cast 9d63eb837a

init acs test files 0bd20ac9fd

update 45c1ac0f61

update .cproject file b021590103

update .cproject file again 1893e87f5f

another .cproject file update 75d19790b8

start creating rw ass in obj factory db7dcc7e32

Merge pull request 'Add yocto helper scripts' (#248) from mueller/yocto-helper-scripts into develop ... de0872072f

Reviewed-on: #248
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/acs-test-init 491736335b

hmm ca640ea18f

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 604dbea372

sth crashes CI.. 924f114fb3

catch exceptions 1904cc168d

Merge pull request 'Init ACS Test files' (#249) from mueller/acs-test-init into develop ... cb8f0e61be

Reviewed-on: #249
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

continued rw ass creation 4e78ee85c8

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 7e87bd713d

update .cproject file 8ccd55dd06

another .cproject update 95fd3238e7

schedule RW ASS df7e0007d0

A lot of stuff ... 91b69eacf6

- refactored and simplified RW assemblies
- create separate SPI Com IF for RWs
- Update .cproject file: Fixed to decrease indexer parsing times

update changelog 4120befef0

update .cproject file again 3924430ea7

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 543ec5dfff

fix images in README f5b1427c38

fix images in README 17802aaa55

added missing eclipse instructions 96710159b8

Merge branch 'develop' into mueller/rw-ass cf98d446f9

re-point tmtc 62c885e1de

RW Refactoring ... c043375ae3

- FSFW update: SPI device is part of ComIF now
- Only set RW mode (speed is set a side effect but not necessary) once
- Release SPI bus in the 70 ms delay duration

sequence count init value 37002b47b3

Merge remote-tracking branch 'origin/develop' into mueller/rw-ass c5bccb661e

fixed merge conflict c7e4704234

fixed conflicts 914acd9925

important bugfixes 625abcfd5b

Merge branch 'develop' into mueller/reboot-cmd 1d1f04f57b

sequence count init 835a10e538

init sequence count c7e2cc22af

update fsfw beba258a77

commented in time file write 8a90f0025b

core ctrl remount sd handling 5a82fe93d9

Merge pull request 'RW Assembly' (#224) from mueller/rw-ass into develop ... 658acb0554

Reviewed-on: #224
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd c1992f59d6

repoint fsfw 5f96d157a7

fixed conflicts a315a8b529

fsfwgen update af52b90abe

bump deps, regenerate translation files 38d03dbe57

bump tmtc again d1d365c76d

Merge remote-tracking branch 'origin/develop' into mueller/rtds-update 93f605bc0a

compile fix 56f491befb

Merge branch 'develop' into meier/ccsds e5710784b9

added eive specific max31865 handler 23f209fb07

change in mpsoc status codes 0dd0af73a1

continued low level MAX31865 handler 6b9e49e632

create low level rtd handler in obj factory a173ef4308

create and pass correct comIF 382d93863f

schedule new rtd reader component c1faf65409

increased execution timeout of prepare update command e6f55ba2c1

Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if 51466e68d7

remove merge conflict markers d7316eff66

commented time file writing in again 3a6beafae5

Merge pull request 'Update EIVE OBSW' (#250) from mueller/update-eive-obsw into develop ... ee99c3312e

Reviewed-on: #250
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge branch 'develop' into meier/ploc 9db58210b8

Merge branch 'meier/ploc' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/ploc 06219744ea

Merge remote-tracking branch 'origin/develop' into mueller/rtds-update 5fe814e972

Merge branch 'develop' into meier/ploc 569754bdad

Merge branch 'develop' into meier/ccsds 3c3884476b

repoint fsfw e48aa64766

ccsds handler sending command to enable transmitter 919141ae10

fix for heater creation call 82f75bde97

create and schedule health PUS service e25c492aa4

additional parameter to identify cmd source 21ba8c95ff

added auto-shutdown for faulty heaters e81ddaa1a5

Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if ac34bcbb3d

update changelog da4d3e4891

rtd testing be1c26ddf7

changelog update b5821ec6dc

bump fsfw 23f37e19af

update .cproject file bf7acf83ff

Merge remote-tracking branch 'origin/develop' into mueller/rtds-update fd0de9426f

cleaning up, better fault status handling 6b54a4dea9

apply afmt d999f57fef

switch to direct handler again 706e3d458b

some more rtd tweaks f3b473ea99

shorter debug string 44e7f06c2e

event with packet number for which mpsoc update failed bb397a58de

Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd e6ec6bcfa4

Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling 80eeebfaf5

some renaming 3ae1812c32

typo b12a634b81

some smaller fixed for new rtd handler 2c684643b3

enable periodic reply for eie RTD 8715683d6b

improved mpsoc update handling 54d7392467

Merge pull request 'Heater Health IF' (#236) from mueller/heater-health-if into develop ... 4cbe732087

Reviewed-on: #236
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop 45f34df6b9

fixed conflicts d60e7a706a

new RTD handler working 1c9f411e75

spi setup more stable now 478975db26

switch to new dev handlers completely 2cfd2cc1fc

a lot of fixes, but some stuff doesnt work.. 017cfb9d56

Merge remote-tracking branch 'origin/develop' into mueller/rtds-update f20fcd9a72

bump tmtc e040f6b218

perm loop not necessary anymore 036024db7e

now supports auto mode as well a92024a858

comment a6abeb697f

Merge pull request 'PLOC Handler Improvements' (#252) from meier/ploc into develop ... 5f165f666b

Reviewed-on: #252
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/rtds-update a26b1bb311

Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling 7080758c67

repoint fsfw 8b875e13c5

GenericFactory bugfix e2cfce634b

apply new auto-formatter on all files 8a5090b8ee

Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling d4dd75acae

Merge remote-tracking branch 'origin/develop' into mueller/rtds-update 140bbcb7b8

Merge pull request 'apply new auto-formatter on all files' (#254) from mueller/update-aformatters into develop ... 8eaae461b4

Reviewed-on: #254
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/rtds-update 28a4f782f9

bump fsfw cf49d98524

bump fsfw e49a1af9b7

some thermal controller code to test TM chain 90a92feee1

update shell script helper to support EM installation 847aadc7bf

fixed for new SPI HAL API 377f762ca5

fix EM cofig d274f5647d

Merge branch 'develop' into mohr/thermal_controller 710bd58ee1

dev string for FM/EM e73bfc2c64

Merge remote-tracking branch 'origin/mueller/fixes-for-spi-update' into mohr/thermal_controller ef14fa3789

small fix for yocto script eb20dda221

subscribe for periodic core ctrl packet a63e87f5f4

Merge pull request 'fixed for new SPI HAL API' (#255) from mueller/fixes-for-spi-update into develop ... 79d3755c16

Reviewed-on: #255
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

gcc 12 complained... e9725e3093

dummy faking the PT1000 Temperature Sensors for host build 4a0aa6443b

thermal controller is reading pt1000 values from datapool 2f8f5ce79b

fixing task initialization (produced warnings) 93cb07238a

Merge remote-tracking branch 'origin/develop' into mohr/thermal_controller 0119f3f8a6

Merge remote-tracking branch 'origin/develop' into mueller/rtds-update 49a06772d2

Merge branch 'develop' into mueller/core-controller-remount-sd-handling dc6fa57c03

WIP extending thermal controller c024756540

bump submodules d960c371b9

split ACU HK set 3bdad61ac0

run afmt 99e27a5a63

bugfixes for cp script 4e62f3b112

continuation of failed mpsoc update fb5c6c4c17

moved HK defs 8ae6fe0be5

set HKs valid e522aadd44

some minor fixes 660f0d2dcd

bump submodules 01ca80fa30

Merge pull request 'RTD Update' (#251) from mueller/rtds-update into develop ... a2eabdce01

Reviewed-on: #251
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

supervisor command to continue interrupted mpsoc update 379c5f06ba

fixed conflicts d808a12c31

commented in core controller file write 990759fbc6

tmtc update e365b36ecd

boot image select memory default argument f18507d278

rtd bugfixes 8aa664b49f

update changelog 10e075efaf

Merge pull request 'PLOC handler improvements' (#257) from meier/ploc into develop ... cc008623b6

Reviewed-on: #257
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/rtd-bugfixes a4de3e9eb1

Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk 1f62d8284c

set datapool entries of rad sensor valid 62ef9c7e70

repoint tmtc a2fad6061a

run afmt 7d9ef6f887

Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk 40b02aa46b

Merge branch 'develop' into mueller/rtd-bugfixes 43269d4add

Merge branch 'develop' into mueller/core-controller-remount-sd-handling e9908139e7

bump changelog 2f155d8350

these brackets are less confusing 5df905182c

bump tmtc f111001572

Merge pull request 'rtd bugfixes' (#258) from mueller/rtd-bugfixes into develop ... 72305cc4c2

Reviewed-on: #258
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge branch 'develop' into mueller/core-controller-remount-sd-handling b66a91da2e

Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk a1d2ec3db4

improve and optimize SD card handling b2c286cd7e

appears to work now 1519b13b78

tweak sd card check countdown 2ebdb5c797

Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd f7075a1397

Merge branch 'develop' into mueller/reboot-cmd 237dd00216

Merge branch 'mueller/reboot-cmd' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/reboot-cmd d088d728b1

repoint tmtc 23d7b8f2fb

run afmt, minor improvements 633fe00cd6

changelog 3e9b337e31

add and schedule PUS11 3fff3ba21e

update changelog 3eb8525419

bump fsfw 59d0d880bb

delete obsolete folder c0da8aef2e

bump fsfw 88faf8f87d

Thermal COntroller collecting Sus Temperatures b878508fec

enable hk in imtq 1ccd12e2e1

Merge pull request 'Reboot Command' (#242) from mueller/reboot-cmd into develop ... 7f180ebc45

Reviewed-on: #242
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into meier/imtq 2bf044422f

Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11 43fc1ab780

Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling 3eca96fef5

Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk 7646b683b2

Merge pull request 'IMTQ improvements' (#260) from meier/imtq into develop ... addcb2b21f

Reviewed-on: #260
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling d79177e544

Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk 0ac38e8490

Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11 0b3fd65c9a

Merge pull request 'Core Controller Remount SD Handling' (#253) from mueller/core-controller-remount-sd-handling into develop ... d870f5ab10

Reviewed-on: #253
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge branch 'develop' into mueller/add-schedule-pus-11 ffdd6bbc3c

update reset pin handling 01bac87afb

resolve merge conflict bb1e1d80cc

bump number stored packets ae434853aa

Merge pull request 'GPS Reset Pin Handling Update' (#261) from mueller/gps-reset-pin-update into develop ... 686ec4bffa

Reviewed-on: #261
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'add and schedule PUS11' (#259) from mueller/add-schedule-pus-11 into develop ... ad679a810e

Reviewed-on: #259
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

Merge pull request 'Split ACU HK' (#256) from mueller/split-acu-hk into develop ... f50682b56a

Reviewed-on: #256
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

bump submodules 335d3ba3b0

re-run generators e5459bb1f7

status code parsing, fix in cam command e9ccb2fd4f

Merge branch 'develop' into meier/ploc ee9a13f59b

run generator scripts 09a6707c6c

bugfix SdCardManager c588ec4a1a

fix raspberry pi build 97db44e500

Merge branch 'develop' into meier/ploc bbdfc0427a

Merge pull request 'MPSoC Status Codes' (#262) from meier/ploc into develop ... 25070d9543

Reviewed-on: #262
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge branch 'develop' into meier/SdCardManager 6f9d3c2f63

Merge pull request 'Bugfix SdCardManager' (#263) from meier/SdCardManager into develop ... 1f1e1e8eae

Reviewed-on: #263
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

adaptions for EM 9e93f1c814

replaced EM preprocessor define 8106722a08

Merge pull request 'Adaptions for EM' (#264) from meier/q7s-em into develop ... 3d1e104fa4

Reviewed-on: #264
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

Merge branch 'develop' into mohr/thermal_controller 23cabe4ca6

thermal set fix 0e6d2354fc

rtd dataset 593cc68b84

device temperature set wip 87783b01f5

device temeprature set 52d94f44d4

variable for number of sus entries ba7ac6bab2

tmtc update 5051af82c2

type fixes in device temperatures sets 04b7c82501

local port forward script b66dcc0a86

tmtc update cbb8832fab

hk set fixes f47712552e

tmtc update 678b22438f

set temeprature to invalid value when invalid flag is set by owner b1c20b22c8

changed gomspace temperatures to float 6c32ddf864

bugfixes in hk handling b3bb76c75f

submodule update f72dfa255d

use memset to set invalid temperatures of cau 67037e2dae

Merge branch 'meier/thermal-controller-fix' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/thermal-controller-fix 917090e39d

fixes in build config f2d5932883

rerun generators b8cf825307

fixed merge conflicts 8c850614e5

fixes for te0720 build 1ebae7f938

bugfix for some negative temperature conversions 17d17dce06

fixed type of imtq self test temperatures 63c669bc27

update tmtc submodule 35ea8a50f4

only include core definitions in thermal controller 772ab430e0

changed namespace a787de531b

changed max13865 namespace 66d6b6d707

rtd set id 3825304088

init poll variable 5f796ec1e3

improvements for hosted build eff80a58ee

syrlinks carrier wave command d96d3b155b

fsfw update b0a175610a

tmtc update 9918c7c255

Merge pull request 'Fixed tmtc and fsfw submodule' (#265) from meier/submodules into develop ... 1133736d48

Reviewed-on: #265
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

dummy devices for hosted build, adaptions to run thermal controller unit test bd11d13b99

dummy devices b53bfb9a6f

removed mock files from mission directory 0ee912665e

Merge branch 'develop' into meier/thermal-bugfixes 61aa57f021

run auto-formatter 89757c447c

Merge pull request 'Thermal controller and temperature bugfixes' (#266) from meier/thermal-bugfixes into develop ... 83c93a9637

Reviewed-on: #266
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

fsfwgen update d4a1cb9f62

update deps and gen files c6b00e2448

use lib logger 72ab141b41

improve csv format 53e556d0b3

Merge pull request 'fsfwgen update' (#267) from mueller/gen-update into develop ... d2a12ea71e

Reviewed-on: #267

moved TmFunnel af039c540a

adaptions for setup with ccsds testbed ed0eb4fe9c

removed command action helper form ccsds handler 70450041e6

run generators 95da2372c9

fixed merge conflict b5ff0edbc9

moved ccsds object creation back to core object factory and run auto formatter a2e7c6cca6

add thermal controller for hosted build 3a93cdc105

remove ccsds components from em object factory d78155fd79

removed unused event bf8ffac624

Merge pull request 'CCSDS Handler Improvements' (#268) from meier/ccsds into develop ... e092d9bf3d

Reviewed-on: #268
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

bump tmtc 812c814a30

muellerr added 1 commit 2022-07-04 11:13:26 +02:00

bump changelog and version 62f725beea

muellerr added this to the v1.12.0 milestone 2022-07-04 11:14:01 +02:00

muellerr merged commit 75e71f7dca into main 2022-07-04 11:19:05 +02:00

muellerr referenced this issue from a commit 2022-07-04 11:19:06 +02:00

Merge pull request 'v1.12.0' (#269) from develop into main

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

OPS TODO

Issues identified by OPS

api change

API change

breaking api change

API change which can break existing code

bug

Something is not working

documentation

Documentation

duplicate

This issue or pull request already exists

feature

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No Label

Milestone

No items

No Milestone v1.12.0

Assignees

Clear assignees

ahinkel dgoerner jenkins_buildfix lkoester lteichroeb meggert meierj mkoller mkranz mohr msenger muellerr rmarquardt rschweigert steinertm zinkj

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: eive/eive-obsw#269

No description provided.