v1.14.0 #304

Merged

muellerr merged 366 commits from develop into main 2022-10-10 17:46:38 +02:00

Conversation 0 Commits 366 Files Changed 420 +8522 -20762

muellerr commented 2022-10-10 17:45:51 +02:00

Owner

Copy Link

No description provided.

muellerr added 366 commits 2022-10-10 17:45:53 +02:00

scex reader task started df712c7100

Merge remote-tracking branch 'origin/develop' into irini 188f8863d0

solve merge comflioct 35f2d2cb9c

huge progress 01d86a0c7b

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

some refactoring 6071e34771

bugfix for SCEX 44c8f5f730

DLE FRAM packets can be read now 808e01dfd3

updates for new dle parser API d00cb6d4a5

Merge remote-tracking branch 'origin' into irini 5b2cfd2c84

continued scex uart reader, some bugs 9f3f264eac

mutex bbdd3c052e

fixed some tiny bugs 57cc77e197

Merge remote-tracking branch 'origin/develop' into irini 5c3e91b5aa

repoint fsfw f52c2a32b7

repoint fsfw again ad12fa6060

reorder fix 01f812b932

fsfw update a99b0007db

Merge branch 'irini' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into irini 1d9fb354f7

scexhelper 578899b5a5

fram rec e2f0c0f1be

fram c5683afe9f

update e11c84a5ed

fileId e16e6c2d17

update be7b141126

update 7c15eb57bb

update 57f3103e52

scexDataHandler f2cb43a52f

Minor adaption ti filesystem include and removed arcsect submodule to make it work on my local machine c413d90b88

deSerialize 7179d9dec3

ScexDeviceHandler DeviceReply b4e1451501

ScexDeviceHandler e8882b11cf

scexDeviceHandler::interpretDeviceReply 2f4d44433d

precised printouts 44d36587aa

scex additions 1276cc2dc6

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

Merge branch 'mueller/scex-additions' into irini 9f42ac9875

removed accidental typed stuff 5c91697cf1

remove duplicate declarations b306116eac

add scex preproc define to OBSWConfig.h.in 1f616a101d

update 24cb555849

formatted f5ee21334c

initmission 521b17a8f8

Worked on config file handler, added all functions 74b38a6d06

Implemented set/get/insert functions for config file handler 0fb620b290

Added events for failure of config file handler functions 7cd048b03f

Added parameter interface to config file handler 8b6992df6d

Minor refactoring config file handler 61257dfdd2

comntinued scex handler 005e548059

tmtc update 2584e51bb4

ping cmd working 20328f89ae

tmtc 5a92b9e616

Merged from development, added unit test for config file handler, removed obsolete stuff from handler c4b8fa5444

Removed insert function in config handler, not needed. Added more tests for config handler d9060734b0

Code refactoring and bug fixes for config file handler. Added new test cases for config file handler 5e4d07bd25

Merge remote-tracking branch 'origin/develop' into irini 563e13765d

smaller fixes, always download ETL a462677ed2

rerun generator scripts 57f97de58e

move countdown reset fc639a3e3f

countdown based reply handling 303f538076

Removed obsolete stuff 84c4f47ed1

Fixed submodules file 3bad503694

Changed filesystem include to new version b4bb46726c

update .cproject file d1bfc512ec

modify oss to append at end 8b39f65472

added printout in scex uart reader 8a23615462

smaller bugfixes 201ef9cb0c

Merge remote-tracking branch 'origin/develop' into petri_dev 2c3c05e2d4

run auto-formatter 3ca11b5894

Merge branch 'develop' into irini bd40af34c8

Merge remote-tracking branch 'origin/develop' into petri_dev 22181ec76d

re-point tmtc 80b1c69244

Merge remote-tracking branch 'origin/develop' into irini 05a10485d9

Merge branch 'develop' into petri_dev 44c12a141c

Merge remote-tracking branch 'origin/develop' into irini 19f75b598a

Merge branch 'develop' into petri_dev 01be3ffc9d

remove etl submodule c0157ca506

something went wrong here e6da1824df

re-add arcsec submodule 2eac346e41

retain old order ed6c90b106

updates for new API 4a28f79e3a

start refactoring of PLOC SUPV packet defs 859ced185d

thats a lot of rewriting.. f071b7eba4

change PLOC/MPSOC code to using new SP code 0c371623c6

it compiles again 7e3517d309

generic TM checker 458929957d

more defensive buffer handling 232372fd96

possible bugfix e1c06ce1f5

missing packet checks 67ab3f981b

bump fsfw eb54a384b4

host compiles 17279a6fd0

Merge remote-tracking branch 'origin/develop' into mueller/tmtc-stack-refactoring a669137d5c

use new API 595d098653

that works as well. 21903c4443

this is even better 6ead94b5f4

remove redundant call 91600bcce9

small bugfix 800cabb8a1

this check is sufficient 5c32114bdb

better size checks e649d45e3e

specify where some info is coming from 0c9018c0c9

some issues 79f5077a25

Merge remote-tracking branch 'origin/develop' into petri_dev 8ecf04f005

Merge branch 'mueller/tmtc-stack-refactoring' into petri_dev b81218e2d4

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

it compiles now 7455514797

add sun sensor set 2d795c6dd0

retval translation still fails d9321a83cf

supv ack failure 732602a4cc

important bugfix for CRC calculation ec47d7eeef

simpler way to check crc16 ba56c72d91

bump tmtc 48ef6e6a5c

try IMTQ change 3d0d10dc32

fixes for IMTQ mgm reading 726e448af9

Merge branch 'mueller/tmtc-stack-refactoring' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/tmtc-stack-refactoring fd17e299fb

bump tmtc d318ff9781

tmtc bugfix 4aad06469d

some bugfixes 0ea993e16b

bump tmtc 70d9f00372

fix 9eb2107958

moved a size check 2e2afcd6c5

Merge branch 'mueller/acs-imtq-update' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/acs-imtq-update 83382de330

mode check for commands executed by supervisor helper ad3bdbcf96

bugfixes in tc packaging classes c85035c62e

bugfixes c8d38cf852

fix f9061d5494

moved a size check 8ea6df273d

bugfixes 5aa0b3530a

resolve merge conflict f2190f8aa1

percent progress event ... c094b45fb4

And some changes to allow restarting from the middle

allow starting update in the middle 47ebf3d8cc

hopefully last bugfix b503836a3d

re-run generators 1f3365960d

speed up crc proc significantly f98411f421

new command to only perform mem check e71e2e7879

something wrong with mem check b3bb029c47

memory check always based on file now 663b65f159

smaller bugfixes 51463700d5

bump tmtc 519c7840cc

set boot status report set valid 64b2ceea0a

set hk set valid as well 42e3d92fb9

bump tmtc 84268c6dd6

bump tmtc again 208856ef52

update events e09eaae42f

crc check fails on mem 0 d7bc35ea45

important bugfix for update conitnuation 1aeebcc0ee

Merge branch 'develop' into mueller/tmtc-stack-refactoring 4cfbd5c88c

update ploc supv helper e561805f3a

Merge branch 'mueller/tmtc-stack-refactoring' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/tmtc-stack-refactoring b4b9774fde

bump tmtc ef92673e4e

bump tmtc 86bfa85e00

Merge branch 'mueller/tmtc-stack-refactoring' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/tmtc-stack-refactoring 3c23ede9dd

small update 6d53a38f9f

comment typo fix 920545b709

bump tmtc 85172616f8

re-run generators 0d0f32b751

Merge remote-tracking branch 'origin/develop' into mueller/tmtc-stack-refactoring 28d00b78a3

Merge branch 'mueller/tmtc-stack-refactoring' into mueller/acs-imtq-update 790a71974e

Merge pull request 'TMTC Refactoring' (#276) from mueller/tmtc-stack-refactoring into develop ... 2be35768cc

Reviewed-on: #276

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

Merge remote-tracking branch 'origin/develop' into petri_dev 5bfe72e430

Merge pull request 'ACS IMTQ Update' (#284) from mueller/acs-imtq-update into develop ... 084ff3c5ca

Reviewed-on: #284

all retval replacements 447c4d5c88

update changelog 691505ffa9

apid mask 86b4747249

bump tmtc 8aa65ebbd6

Merge pull request 'all returnvalue replacements' (#286) from mueller/update-retval-if into develop ... 440fb4d488

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

start extending p60 module code c0a78e6fef

more complicated than expected 7841a5c8c0

damn it 63b8aec894

another try 65ec5c35e3

bump gomspace-sw submodule f264b9781b

add some more compile options ad783018bd

add gom space client code 7a1dbf8456

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

gomspace lib working d098ed6403

finally it works efb0bce718

changed all table parsing to use gom space API a7482b657a

Merge remote-tracking branch 'origin/develop' into mueller/update-p60-module-code 0f553e3431

merge conflict e804d433aa

added test to retrieve pdu config 8c110460a6

config table retrieval works e8208a21a4

need to link gs sw for hosted now 7de26586fb

disable test 3b2794735b

update changelog c8c103e5e6

bump tmtc 108b7620b8

Merge pull request 'Update Power Modules' (#287) from mueller/update-p60-module-code into develop ... 34ede28fda

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

bump dependencies f8ee516d46

safety check f308718256

additional nullptr check 3a80c4cb0c

Merge remote-tracking branch 'origin/main' into develop a70bfd319c

bump tmtc 04fb2b1261

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

retval replacements 86337d8f47

move to new DHB TM handler 74b45f30a0

minor tweaks 4649ae2edb

bump deps 13e89e1342

huh b156d78274

Merge remote-tracking branch 'origin/mueller/use-new-dhb-tm-handler' into irini 4ce48d01c6

writing file works now a6582313f7

works but reply handling is annoying 0f91800cf8

Merge pull request 'Use new DHB TM handler' (#290) from mueller/use-new-dhb-tm-handler into develop ... 2c6127d98b

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

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

this is better 822e8eea4a

bump fsfw 20df16916a

Merge pull request 'DHB TM better handling' (#291) from mueller/dhb-tm-even-better into develop ... fd674b3d61

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

ScexDeviceHandler: fileId includes date and time 8c0e261f44

ScexDeviceHandler: adjusted comments 74d4741380

update SCEX code 839851914a

apply afmt 7c15ecbad2

Merge remote-tracking branch 'origin/develop' into mueller/test-new-cmd-handling c3fb285f35

perform finish in command builder da7cedc910

Merge remote-tracking branch 'origin/develop' into irini 079fa04d69

Merge remote-tracking branch 'origin/irini' into mueller/test-new-cmd-handling d295ca905e

gom space commands 7dde1150e8

bugfix 3d71cce30b

increase number of allowed consecutive commands ... 27129f3b66

for service 8

Merge pull request 'increase number of allowed consecutive commands' (#294) from mueller/allow-more-service-8-consecutive-cmds into develop ... aecbbfdc7d

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

some simplifications 4e92fd4421

some bugfixes for save table feature 87f430fdee

load table command 6ae0249fdc

bump tmtc 923adbdb1a

Merge pull request 'GomSpace commands' (#293) from mueller/new-gomspace-commdsn into develop ... 983f073e54

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

update changelog a76816f055

re-point tmtc e381b00a13

Merge branch 'develop' into scex-additions da739636f3

stuff 31b3de784b

add RPI SD card manager 7bc866a105

start RPiSdCardManager 002f776bef

update to new API 4649a75d40

swap order fb3214fef9

updated to new fsfw f7196a4791

fix for new fsfw ff3bc7da73

fixed for new fsfw 4d93368b4c

run afmt, bump proj files 63e4448178

Merge branch 'develop' into mohr/updated_fsfw 92e06352be

Merge pull request 'updated to new fsfw' (#299) from mohr/updated_fsfw into develop ... 3fc97f9ee9

Reviewed-on: #299

Merge branch 'irini' into scex-additions ea60767825

update .cproject file 94a70aa2fc

small fix for ACS task 57331380c3

create ACS controller in EM sw 2261ccb304

new dummy helper functions 3230efa4aa

update .cproject file again c616720095

move some dummy creation into separate function 3313604cb5

new ACS preproc defines 8ebc62cbe6

update EM code 8a6a69d230

ACS controller running in EM SW withour errors now 9ad649e43e

small update for .cproject file 2e03cfa116

doc correction 3673ae8e62

Merge branch 'develop' into mueller/em-sw-updates dac799bb97

update for new FSFW code 38f435d1ae

new fs helper module 26216eca88

add very basic test in Q7S Test task for FS helpers 547fcf22dd

start integrating cfdp code 6b48fb64d8

add new constants for CFDP, clean up 0b43c3137f

clean up config code 68039d5d4a

fix bsp_hosted 8dce434746

move config define 65f4daf305

fix init error 54f73661fc

Merge branch 'mueller/em-sw-updates' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/em-sw-updates a827351a75

move object ID definition 2f18347430

bump fsfw cee114af7e

CFDP integration almost complete 9411b740ae

add CFDP APID to TCP parse list 8aa412e865

larger TC and TM store b48c5d528e

bump fsfw cb6366b208

bump tmtc d2ca1139a7

added action IDs for new commands 0fc639cc11

separate script to create obsw version file afba412fe2

bump fsfw b308a037b4

helper scripts and README section for OBSW update 2ddd95c7fd

these commands make more sense 15641c61ea

adaptions for update sequence 65a7d38f54

added some more fixed file names 80f0664139

move shell scripts helpers to root ec91d9977a

updated helper scripts 7d824f5448

moved definitions 05adc91f94

start update handler impl b3275d015f

continuing SW update impl eb0ace3bc6

finished update cmd impl 8161d1cd88

accept rsa keys for q7s-cp.py as well ab919131fb

args not needed but keep them there (commented) cbb1fdfd5e

set correct owner for SW update procedure 9d440838e9

successfull SW update d87baa8da9

this should work for the same chip/copy as well 2614239fe4

rerun generators 9b6636fe31

rudimentary SD commanding interface 90962c9f8e

some informative docs 8c0fd8d9e2

small bugfix caca7f5da8

important bugfix 51976730aa

check out explicit json version 2c3c3c76af

some bugfixes ff243fa46c

updates on same image are problematic.. 3c746e954b

bump json dependency to concrete version v3.11.2 24062071c0

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

bugfix for scex testcode 308a855d8c

constructor correction 32c2b2038c

Merge branch 'irini' into scex-additions d3c7bae087

Merge branch 'scex-additions' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into scex-additions 3240c843a1

Merge branch 'develop' into scex-additions aab2dc6367

dog fixed 071e00e0ef

Merge branch 'irini' into scex-additions 3fd8230f03

Merge branch 'scex-additions' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into scex-additions 5f2a0e107d

changelog update c7e06f8878

repoint fsfw f415adccc2

Merge remote-tracking branch 'origin/develop' into petri_dev a04372ff55

fixes for compilation 26dc4ba56e

cant build GW SW of windows 1aa3cc3595

now it compiles for windows again 0c75997ba0

afmt 6888df5c44

update .cproject file e2b83f9222

bump fsfw again 0bae128536

clean up the dependency mess c602d7bb28

Merge remote-tracking branch 'origin/develop' into mueller/obsw-update-cmds 103d53181c

update changelog 5d0c07467f

bugfix for SCEX code 97f02401fe

Merge remote-tracking branch 'origin/develop' into scex-additions b9f48a533a

unittest builds now 1463963532

some unittest fixes fcef7e42a5

Merge pull request 'OBSW Update Commands' (#302) from mueller/obsw-update-cmds into develop ... ffb9e5e03c

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

Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates a152553d00

Merge remote-tracking branch 'origin/develop' into scex-additions 151d27985f

Merge remote-tracking branch 'origin/develop' into petri_dev aa56c26e25

bump tmtc 96497df7ba

some bugfixes 49efbc4725

small bugfix a215657f4e

re-run generators and bump dependencies e161eeb537

Merge remote-tracking branch 'origin/develop' into scex-additions 865ca46974

Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates 2ad93f7735

Merge remote-tracking branch 'origin/develop' into petri_dev b3f4eaa0f2

re-run afmt 541b44cea7

Merge remote-tracking branch 'origin/develop' into scex-additions 660d42f615

bump tmtc 0f081e52bd

Merge branch 'develop' into petri_dev ee6d13abcc

bump fsfw 3e5a717845

scex directory 43cda300e3

commets removed 9c07a26615

Merge branch 'scex-additions' into irini 612426ce3b

Merge branch 'irini' into scex-additions 68fdb68fe6

Merge branch 'develop' into petri_dev 526ddd0208

refactor DLE parsing and move semaphore release up top 0c389177e3

simplified DLE parser b930af52b0

something is still wrong a44141c476

found the bug 1a192cd8fb

add EM code 3fa2c63a03

new Uart16550 for SCEX, try stop bits c5e5df03d9

two stop bits and even parity helps 9e81384c5e

add code to get frame, parity and overrun errors adbece25aa

this seems to work 0341865e98

use new SCEX uart dev name 8b35bbd241

Merge branch 'mueller/scex-em-tests' into scex-additions 6d9999292c

some fixes f20acf417e

parity helps for some reason 36c9feaf3f

missing commandActive reset 9173c4d2cb

Merge remote-tracking branch 'origin/develop' into scex-additions 4d97a82206

Merge pull request 'Global Config Handler' (#271) from petri_dev into develop ... 7cf91a8ac3

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

Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates 50d41215fa

Merge remote-tracking branch 'origin/develop' into scex-additions fd1d53aa23

fix one merge conflict f4cceeb21e

Merge pull request 'EM SW Update' (#300) from mueller/em-sw-updates into develop ... bba3ba7944

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

Merge remote-tracking branch 'origin/develop' into scex-additions c82c4cf9d1

disable parity bit 57dff4258a

bump fsfw 5b4f97358f

small tweaks 12feb989ae

Merge pull request 'scex code' (#303) from scex-additions into develop ... 4f7ad7154b

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

re-run afmt 964e0a3d8e

bump subversion 74f053ae5d

muellerr added this to the v1.14.0 milestone 2022-10-10 17:46:03 +02:00

muellerr merged commit 28881b99d1 into main 2022-10-10 17:46:38 +02:00

muellerr referenced this issue from a commit 2022-10-10 17:46:38 +02:00

Merge pull request 'v1.14.0' (#304) 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.14.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#304

No description provided.