v1.11.0 #243

Merged

muellerr merged 159 commits from develop into main 2022-05-04 17:19:57 +02:00

Conversation 0 Commits 159 Files Changed 144 +5431 -2306

muellerr commented 2022-05-04 17:10:39 +02:00

Owner

Copy Link

See CHANGELOG

See [CHANGELOG](https://egit.irs.uni-stuttgart.de/eive/eive-obsw/src/branch/develop/CHANGELOG.md)

muellerr added 158 commits 2022-05-04 17:10:52 +02:00

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

Merge remote-tracking branch 'origin/develop' into mueller/master 26ff40ae0c

tmtc update a728a6d04b

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

store time file with lower frequency a5881a238b

start bpx batt immediately ... d5bdc00abf

but defer it until the com mode was set to i2c

submodule updates 456f6ad6af

dev conf update for updated fsfw 5e0e8232df

split up op divider, assing imtq power switcher 604870d1fe

fsfw update 3e4d728b10

update 25138d8931

watchdog fixes and submodule updates b0006c2272

install directive for OBSW f08eb9b5ae

fix for script path f6f51665a2

some more fixes 2e93d7300a

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

update path setter a14af7f728

if gpssmm cant be opened, return prematurely d3403d341f

rename gps dev 07d345183e

linux ctrl only print warning once be2834cb1a

adaptions for gpsd 3.17 a4c5d8de45

update q7s-evn script and generate stripped watchdog bin d12b5958b9

support both gps versions 4956161701

update .cproject file c3238ab154

delete commented code 5d8e8a9841

update win q7s env script ec0a38ad25

update docker file and jenkins file 67fbabbd7c

newline at end 0263d3adb5

this is odd fa4ee7a84b

curl cant use wildcards 69f39b765b

add option for external toolchain file c4220b37e5

always build watchdog for arm q7s now f23ba7ab7b

update README eb0e7c39e4

Merge branch 'mueller/master' into mueller/yocto-rootfs 17c440643f

Important bugfix and improvement for PCDU Handler ... e5d5af68c1

- Fixed out of bounds error
- Handle multiple messages in queue handler
- PCDU Handler now only called once in PST

repoint fsfw again 707c318ab9

disable -Wformat-truncation error 6b08659a69

Merge remote-tracking branch 'origin/develop' into mueller/yocto-rootfs 20bb1d73f5

repoint fsfw 4f4a8930c8

update shell script to use default SDK sysroot 438957c466

Merge pull request 'Update for new yocto rootfs' (#217) from mueller/yocto-rootfs into develop ... d6532f8181

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

update README c4b1703b8e

submodule update d1814f9a49

Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler 604d7ab228

some more README updates 1485b14c7d

update changelog 4a5ea4450f

Merge branch 'develop' into mueller/disable-warning-in-csp-lib 85d8c2c471

bump submodules, add some more devices by default 0da74f1bf9

test flag for RW 737d18135f

pass power switcher for syrlinks handler creation aa84175382

git describe support finished a416ca406b

rename helpers file 0f80501467

made version handling more robust 0638c87f62

Merge remote-tracking branch 'origin/main' into develop 32f2cd60bb

Merge remote-tracking branch 'origin/develop' into mueller/cmake-git-describe-support 6f54129f60

Merge branch 'develop' into mueller/obsw-config-infile-update 48e0718b76

Merge branch 'develop' into mueller/disable-warning-in-csp-lib f22644697e

Merge branch 'develop' into mueller/update-README 3c2092926e

Merge branch 'develop' into mueller/minor-tweaks-pcdu-handler bf1f6887be

small improvement 772a829333

fix for toolchain file handling 17fd273d10

added missing character 417a6d8ea0

Merge branch 'mueller/version-fix' into develop 177b4305bb

Merge pull request 'CMake git describe support' (#226) from mueller/cmake-git-describe-support into develop ... 9fe2de5244

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

Merge remote-tracking branch 'origin/develop' into mueller/obsw-config-infile-update 957b067eac

submodule updates baf2e5fb39

Merge branch 'develop' into mueller/disable-warning-in-csp-lib 25570cc631

Merge remote-tracking branch 'origin/develop' into mueller/update-README c5ae12e10b

submodule updates 9ac5d0da67

Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler f421fd4dde

submodule updates ba2589c8d5

fixes most warnings for host build 2b33d8772c

remove etl submodule , want to use the one provided by the fsfw 49b3120ada

update CMakeLists.txt file 00bbc86d39

CMakeLists.txt order fixes b3f0d19bb9

repoint fsfw 5b2239cee6

move catch2 load directive to bottom bed58a45e5

bump submodules a1c3b1786f

do not add ETL lib 584700a2ba

switch gps ctrl to socket API 234a6b7ac3

Merge pull request 'GPSD test' (#230) from mueller/gps-test into develop ... a45f298505

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

Merge remote-tracking branch 'origin/develop' into mueller/host-fixes-fsfw-update e836ed8a2d

Merge branch 'mueller/host-fixes-fsfw-update' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/host-fixes-fsfw-update 9bb6c41134

Merge remote-tracking branch 'origin/develop' into mueller/obsw-config-infile-update 9ce7a28cff

Merge branch 'develop' into mueller/disable-warning-in-csp-lib 40168bcd5f

Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler 713bfbd7dc

Merge remote-tracking branch 'origin/develop' into mueller/update-README b40302210f

update CHANGELOG ab85ebf83e

create rudimentary syrlinks fdir 7e2a993211

create and add syrlinks fdir 7e230b64ea

override event confirmed as well b97604d7d2

create and assign gomspace power fdir d0b7531e48

Merge pull request 'Improvement for PCDU Handler' (#221) from mueller/minor-tweaks-pcdu-handler into develop ... 199acec3b5

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

Merge pull request 'Update README' (#222) from mueller/update-README into develop ... a9e106bb71

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

Merge pull request 'disable -Wformat-truncation error' (#223) from mueller/disable-warning-in-csp-lib into develop ... b40ceafbe0

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

Merge pull request 'OBSW Config in file update' (#225) from mueller/obsw-config-infile-update into develop ... 6d326137fb

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

Merge pull request 'Host Fixes and CMakeLists.txt update' (#229) from mueller/host-fixes-fsfw-update into develop ... bbe1e996e6

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

Merge remote-tracking branch 'origin/develop' into mueller/syrlinks-fdir 517aaf2146

update changelog e16f5e68d6

Merge remote-tracking branch 'origin/develop' into mueller/gomspace-fdir f01f63d8e8

update CHANGELOG 3a03d6ca55

building new EM config c1248dd4e1

update cp script 074e2d8517

Merge pull request 'GOMSPACE Power components FDIR' (#233) from mueller/gomspace-fdir into develop ... 7e36edc41c

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

fixed conflicts 3d817363e6

tmtc update 52bfcd7039

delete ETL submodule e919d3b7ef

update fsfw submodule c1fb7ce0df

Merge pull request 'Syrlinks FDIR' (#232) from mueller/syrlinks-fdir into develop ... 2f3d60e974

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

bugfix pcdu handler command queue reading 5f6a8fa37d

removed debug print 2f90c3e937

Merge pull request 'Bugfix PCDU Handler' (#235) from meier/pcduhandler-bugfix into develop ... 9dc382706a

Reviewed-on: #235

mini fix 10d0bf1550

gps improvements c1d754d8ff

Merge branch 'develop' into mueller/update-q7s-cp-script 7aa900e6d5

Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling 0f4fe7694b

bump submodules ef4f713883

support both SHM and socket read cce0d5448d

SHM and socket readout working now 456dac6afd

update changelog 08d7b3b859

fix test task c131c685a4

renaming 51bcdafe33

update object factory files ac0b2e0dce

move RW loading opt to CMakeLists.txt f435f7217e

update CHANGELOG 4149b08f3a

reworked helper scripts, renamed q7s build dirs b2ec1773e4

separate EM build folder 0d37272feb

update gitignore 4035cb1fcb

update .cproject file again 9a73637b5e

moved build helpers to script folder fdf7f03242

update README and helper scripts 0543f6b425

update CHANGELOG 4fdeccc3a8

changelog improvements 8b4d56cc0d

updated win helper scripts 5a52155065

Merge pull request 'GPS controller update' (#239) from mueller/gps-tests into develop ... e088bec582

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

Merge pull request 'update cp script' (#237) from mueller/update-q7s-cp-script into develop ... a9cf5f9ae9

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

Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling 08046ef621

added system folder here f0270b91d9

Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling fbd9e65398

update auto-generated file 47f4aebd15

bump fsfw 115d2dea88

updated host and linux scripts, fix host build 42247620c0

update lauch cfg host 4a637e79c6

improve dependency handling (same as fsfw) 6dde823d4c

update build instructions 79aac89f36

remove faulty line 4d13743b7f

avoid compiler warning 0ad13a473e

bump fsfw 79efc9de39

small form fix 243d38f832

changed for updated FSFW GPIO API 86752417f2

update changelog afaeca7cf7

repoint fsfw bb2bd87541

Merge pull request 'Update GPIO API' (#241) from mueller/update-gpio-api-without-em-split into develop ... b10486052e

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

Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling 535da53093

changelog correction e06f459333

Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling 2cf1da5478

Merge pull request 'Building new EM config' (#238) from mueller/refactoring-conf-handling into develop ... 8315a03efc

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

bump tmtc submodule 4db35e8641

muellerr added 1 commit 2022-05-04 17:13:12 +02:00

Merge branch 'main' into develop 0271b4970c

muellerr merged commit 4589b3b696 into main 2022-05-04 17:19:57 +02:00

muellerr referenced this issue from a commit 2022-05-04 17:19:57 +02:00

Merge pull request 'v1.11.0' (#243) from develop into main

muellerr added this to the v1.11.0 milestone 2022-05-04 17:21:10 +02:00

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

OPS TODO

api change

breaking api change

bug

documentation

duplicate

feature

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No Milestone

v1.11.0

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: eive/eive-obsw#243

No description provided.