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

df712c7100 scex reader task started

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

35f2d2cb9c solve merge comflioct

01d86a0c7b huge progress

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

6071e34771

some refactoring

44c8f5f730

bugfix for SCEX

808e01dfd3

DLE FRAM packets can be read now

d00cb6d4a5

updates for new dle parser API

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

9f3f264eac continued scex uart reader, some bugs

bbdd3c052e mutex

57cc77e197

fixed some tiny bugs

5c3e91b5aa

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

f52c2a32b7

repoint fsfw

ad12fa6060

repoint fsfw again

01f812b932

reorder fix

a99b0007db fsfw update

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

578899b5a5 scexhelper

e2f0c0f1be fram rec

c5683afe9f fram

e11c84a5ed update

e16e6c2d17 fileId

be7b141126 update

7c15eb57bb update

57f3103e52 update

f2cb43a52f scexDataHandler

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

7179d9dec3 deSerialize

b4e1451501 ScexDeviceHandler DeviceReply

e8882b11cf ScexDeviceHandler

2f4d44433d scexDeviceHandler::interpretDeviceReply

44d36587aa precised printouts

1276cc2dc6

scex additions

a1faa3a73c

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

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

5c91697cf1

removed accidental typed stuff

b306116eac

remove duplicate declarations

1f616a101d

add scex preproc define to OBSWConfig.h.in

24cb555849 update

f5ee21334c formatted

521b17a8f8 initmission

74b38a6d06 Worked on config file handler, added all functions

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

7cd048b03f Added events for failure of config file handler functions

8b6992df6d Added parameter interface to config file handler

61257dfdd2 Minor refactoring config file handler

005e548059 comntinued scex handler

2584e51bb4 tmtc update

20328f89ae ping cmd working

5a92b9e616 tmtc

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

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

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

563e13765d

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

a462677ed2

smaller fixes, always download ETL

57f97de58e

rerun generator scripts

fc639a3e3f

move countdown reset

303f538076

countdown based reply handling

84c4f47ed1 Removed obsolete stuff

3bad503694 Fixed submodules file

b4bb46726c Changed filesystem include to new version

d1bfc512ec

update .cproject file

8b39f65472

modify oss to append at end

8a23615462

added printout in scex uart reader

201ef9cb0c

smaller bugfixes

2c3c05e2d4

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

3ca11b5894

run auto-formatter

bd40af34c8

Merge branch 'develop' into irini

22181ec76d

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

80b1c69244

re-point tmtc

05a10485d9

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

44c12a141c Merge branch 'develop' into petri_dev

19f75b598a

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

01be3ffc9d Merge branch 'develop' into petri_dev

c0157ca506

remove etl submodule

e6da1824df

something went wrong here

2eac346e41

re-add arcsec submodule

ed6c90b106

retain old order

4a28f79e3a

updates for new API

859ced185d

start refactoring of PLOC SUPV packet defs

f071b7eba4

thats a lot of rewriting..

0c371623c6

change PLOC/MPSOC code to using new SP code

7e3517d309

it compiles again

458929957d

generic TM checker

232372fd96

more defensive buffer handling

e1c06ce1f5

possible bugfix

67ab3f981b

missing packet checks

eb54a384b4

bump fsfw

17279a6fd0

host compiles

a669137d5c

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

595d098653

use new API

21903c4443

that works as well.

6ead94b5f4

this is even better

91600bcce9

remove redundant call

800cabb8a1

small bugfix

5c32114bdb

this check is sufficient

e649d45e3e

better size checks

0c9018c0c9

specify where some info is coming from

79f5077a25

some issues

8ecf04f005

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

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

a134f3f100

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

7455514797

it compiles now

2d795c6dd0

add sun sensor set

d9321a83cf

retval translation still fails

732602a4cc

supv ack failure

ec47d7eeef

important bugfix for CRC calculation

ba56c72d91

simpler way to check crc16

48ef6e6a5c

bump tmtc

3d0d10dc32

try IMTQ change

726e448af9

fixes for IMTQ mgm reading

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

d318ff9781

bump tmtc

4aad06469d

tmtc bugfix

0ea993e16b

some bugfixes

70d9f00372

bump tmtc

9eb2107958

fix

2e2afcd6c5

moved a size check

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

ad3bdbcf96 mode check for commands executed by supervisor helper

c85035c62e bugfixes in tc packaging classes

c8d38cf852

bugfixes

f9061d5494

fix

8ea6df273d

moved a size check

5aa0b3530a

bugfixes

f2190f8aa1

resolve merge conflict

c094b45fb4

percent progress event ...

And some changes to allow restarting from the middle

47ebf3d8cc

allow starting update in the middle

b503836a3d

hopefully last bugfix

1f3365960d

re-run generators

f98411f421

speed up crc proc significantly

e71e2e7879

new command to only perform mem check

b3bb029c47

something wrong with mem check

663b65f159

memory check always based on file now

51463700d5

smaller bugfixes

519c7840cc

bump tmtc

64b2ceea0a

set boot status report set valid

42e3d92fb9

set hk set valid as well

84268c6dd6

bump tmtc

208856ef52

bump tmtc again

e09eaae42f

update events

d7bc35ea45

crc check fails on mem 0

1aeebcc0ee

important bugfix for update conitnuation

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

e561805f3a

update ploc supv helper

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

ef92673e4e

bump tmtc

86bfa85e00

bump tmtc

3c23ede9dd

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

6d53a38f9f

small update

920545b709

comment typo fix

85172616f8

bump tmtc

0d0f32b751

re-run generators

28d00b78a3

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

790a71974e

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

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

Reviewed-on: #276

bddaf120f4

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

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

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

Reviewed-on: #284

447c4d5c88

all retval replacements

691505ffa9

update changelog

86b4747249

apid mask

8aa65ebbd6

bump tmtc

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

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

c0a78e6fef

start extending p60 module code

7841a5c8c0

more complicated than expected

63b8aec894

damn it

65ec5c35e3

another try

f264b9781b

bump gomspace-sw submodule

ad783018bd

add some more compile options

7a1dbf8456

add gom space client code

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

d098ed6403

gomspace lib working

efb0bce718

finally it works

a7482b657a

changed all table parsing to use gom space API

0f553e3431

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

e804d433aa

merge conflict

8c110460a6

added test to retrieve pdu config

e8208a21a4

config table retrieval works

7de26586fb

need to link gs sw for hosted now

3b2794735b

disable test

c8c103e5e6

update changelog

108b7620b8

bump tmtc

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

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

f8ee516d46

bump dependencies

f308718256

safety check

3a80c4cb0c

additional nullptr check

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

04fb2b1261

bump tmtc

aa0da618ca

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

86337d8f47

retval replacements

74b45f30a0

move to new DHB TM handler

4649ae2edb

minor tweaks

13e89e1342 bump deps

b156d78274 huh

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

a6582313f7 writing file works now

0f91800cf8 works but reply handling is annoying

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

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

9319d58137

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

822e8eea4a

this is better

20df16916a

bump fsfw

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

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

8c0e261f44 ScexDeviceHandler: fileId includes date and time

74d4741380 ScexDeviceHandler: adjusted comments

839851914a

update SCEX code

7c15ecbad2

apply afmt

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

da7cedc910

perform finish in command builder

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

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

7dde1150e8

gom space commands

3d71cce30b

bugfix

27129f3b66

increase number of allowed consecutive commands ...

for service 8

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

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

4e92fd4421

some simplifications

87f430fdee

some bugfixes for save table feature

6ae0249fdc

load table command

923adbdb1a

bump tmtc

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

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

a76816f055

update changelog

e381b00a13

re-point tmtc

da739636f3 Merge branch 'develop' into scex-additions

31b3de784b

stuff

7bc866a105

add RPI SD card manager

002f776bef start RPiSdCardManager

4649a75d40

update to new API

fb3214fef9

swap order

f7196a4791 updated to new fsfw

ff3bc7da73 fix for new fsfw

4d93368b4c fixed for new fsfw

63e4448178

run afmt, bump proj files

92e06352be Merge branch 'develop' into mohr/updated_fsfw

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

Reviewed-on: #299

ea60767825

Merge branch 'irini' into scex-additions

94a70aa2fc

update .cproject file

57331380c3

small fix for ACS task

2261ccb304

create ACS controller in EM sw

3230efa4aa

new dummy helper functions

c616720095

update .cproject file again

3313604cb5

move some dummy creation into separate function

8ebc62cbe6

new ACS preproc defines

8a6a69d230

update EM code

9ad649e43e

ACS controller running in EM SW withour errors now

2e03cfa116

small update for .cproject file

3673ae8e62

doc correction

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

38f435d1ae

update for new FSFW code

26216eca88

new fs helper module

547fcf22dd

add very basic test in Q7S Test task for FS helpers

6b48fb64d8

start integrating cfdp code

0b43c3137f

add new constants for CFDP, clean up

68039d5d4a

clean up config code

8dce434746

fix bsp_hosted

65f4daf305

move config define

54f73661fc

fix init error

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

2f18347430

move object ID definition

cee114af7e

bump fsfw

9411b740ae

CFDP integration almost complete

8aa412e865

add CFDP APID to TCP parse list

b48c5d528e

larger TC and TM store

cb6366b208

bump fsfw

d2ca1139a7

bump tmtc

0fc639cc11

added action IDs for new commands

afba412fe2

separate script to create obsw version file

b308a037b4

bump fsfw

2ddd95c7fd

helper scripts and README section for OBSW update

15641c61ea

these commands make more sense

65a7d38f54

adaptions for update sequence

80f0664139

added some more fixed file names

ec91d9977a

move shell scripts helpers to root

7d824f5448

updated helper scripts

05adc91f94

moved definitions

b3275d015f

start update handler impl

eb0ace3bc6

continuing SW update impl

8161d1cd88

finished update cmd impl

ab919131fb

accept rsa keys for q7s-cp.py as well

cbb1fdfd5e

args not needed but keep them there (commented)

9d440838e9

set correct owner for SW update procedure

d87baa8da9

successfull SW update

2614239fe4

this should work for the same chip/copy as well

9b6636fe31

rerun generators

90962c9f8e

rudimentary SD commanding interface

8c0fd8d9e2

some informative docs

caca7f5da8

small bugfix

51976730aa

important bugfix

2c3c3c76af

check out explicit json version

ff243fa46c

some bugfixes

3c746e954b

updates on same image are problematic..

24062071c0

bump json dependency to concrete version v3.11.2

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

308a855d8c bugfix for scex testcode

32c2b2038c constructor correction

d3c7bae087 Merge branch 'irini' into scex-additions

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

aab2dc6367 Merge branch 'develop' into scex-additions

071e00e0ef dog fixed

3fd8230f03 Merge branch 'irini' into scex-additions

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

c7e06f8878 changelog update

f415adccc2 repoint fsfw

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

26dc4ba56e fixes for compilation

1aa3cc3595

cant build GW SW of windows

0c75997ba0

now it compiles for windows again

6888df5c44

afmt

e2b83f9222

update .cproject file

0bae128536

bump fsfw again

c602d7bb28

clean up the dependency mess

103d53181c

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

5d0c07467f

update changelog

97f02401fe bugfix for SCEX code

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

1463963532

unittest builds now

fcef7e42a5

some unittest fixes

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

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

a152553d00

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

151d27985f

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

aa56c26e25

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

96497df7ba

bump tmtc

49efbc4725

some bugfixes

a215657f4e

small bugfix

e161eeb537

re-run generators and bump dependencies

865ca46974

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

2ad93f7735

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

b3f4eaa0f2

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

541b44cea7

re-run afmt

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

0f081e52bd

bump tmtc

ee6d13abcc Merge branch 'develop' into petri_dev

3e5a717845

bump fsfw

43cda300e3 scex directory

9c07a26615 commets removed

612426ce3b Merge branch 'scex-additions' into irini

68fdb68fe6 Merge branch 'irini' into scex-additions

526ddd0208 Merge branch 'develop' into petri_dev

0c389177e3

refactor DLE parsing and move semaphore release up top

b930af52b0

simplified DLE parser

a44141c476

something is still wrong

1a192cd8fb

found the bug

3fa2c63a03

add EM code

c5e5df03d9

new Uart16550 for SCEX, try stop bits

9e81384c5e two stop bits and even parity helps

adbece25aa add code to get frame, parity and overrun errors

0341865e98

this seems to work

8b35bbd241

use new SCEX uart dev name

6d9999292c

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

f20acf417e some fixes

36c9feaf3f parity helps for some reason

9173c4d2cb

missing commandActive reset

4d97a82206

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

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

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

50d41215fa

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

fd1d53aa23

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

f4cceeb21e

fix one merge conflict

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

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

c82c4cf9d1

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

57dff4258a disable parity bit

5b4f97358f bump fsfw

12feb989ae

small tweaks

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

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

964e0a3d8e

re-run afmt

74f053ae5d

bump subversion

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

OPS TODO

api change

breaking api change

bug

documentation

duplicate

feature

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No Milestone

v1.14.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#304

No description provided.