ASTP 1.1.0 Merge Development in Master #441

gaisser · 2021-06-29T14:07:58+02:00

gaisser commented

2021-06-29 14:07:58 +02:00

For ASTP 1.1.0 Release, see Milestone and Release Notes.

gaisser added this to the ASTP 1.1.0 milestone 2021-06-29 14:07:58 +02:00

gaisser added the

labels 2021-06-29 14:07:58 +02:00

gaisser self-assigned this 2021-06-29 14:07:58 +02:00

gaisser added 265 commits 2021-06-29 14:07:59 +02:00

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

Merge branch 'mueller/linux-no-deadline-missed-printout' into eive/develop 1ccfb74709

mutex helper print support and nullptr check a3d245f5a0

Merge branch 'mueller/mutex-update' into mueller/master 8d7d4c639a

Merge branch 'mueller/mutex-update' into mueller/master e1b57424f8

preprocessor optimization f0178a8f73

Merge branch 'mueller/mutex-update' into mueller/master c5b2c47af4

Merge branch 'mueller/hotfix' into mueller/master c55cf8f279

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

Merge branch 'eive/develop' into mueller/master 91f69aa34f

small printout tweak f3cc664d4f

zero size handling 92f249dc62

Merge branch 'development' of https://egit.irs.uni-stuttgart.de/eive/fsfw into development 41e30dcb6c

Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 18e40d6248

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

printout for trans timeout 17b8d3fed0

cleaned up a bit, no functional change 778ef4ef23

Merge remote-tracking branch 'upstream/mueller/master' into mueller/master f82cc1bca4

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

Merge pull request 'FSFW Update' (#4 ) from mueller/master into eive/develop 32b289cbec

Reviewed-on: eive/fsfw#4

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

Merge remote-tracking branch 'upstream/mueller/udp-hotfix' into mueller/master 533d164cac

fixed udp bridge 83d0db8242

Merge branch 'development' of https://egit.irs.uni-stuttgart.de/eive/fsfw into development 42720e6f7d

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

added missing include d1a256cbf6

improved output dea2205908

minor improvements for PUS distributor 0e76333d33

improvements for ccsds distributor 7322a7d0f5

disabled debugging mode 3ff5484415

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

fixed temperature sensor object 43ddb44573

super evil bug 80aab5f461

Merge branch 'development' into mueller/master cbeb78f089

now fixed properly 9ee1bd15c4

bugfix for RTEMS e799e45198

coverity fixes 38d929c2a8

coverity fixes f988271be4

more coverity fixes 00d9a4f3ed

another coverity fix bddd8720b2

coverity action helper fix efb7c8760a

coverity fix b30a3aaa38

coverity: initialize member 8f4ab6d7ed

coverity: initialize entry dd367bf083

coverity fix for event message e6a1a7cc2d

small fix DHB 905d525aa2

Merge remote-tracking branch 'origin/development' into mueller/master 9e881b6a16

implemented mq properly 2b84ab018c

typo fix c1f4ae08fb

coverity d92a20a669

this should work 40cc3c383b

bumped version number d3c3a9147a

coverity fix b8c7a65709

coverity d9a0a4f2ea

coverity e0d39b1feb

coverity fix 6db0725aa4

coverity 316310e993

coverity 2e417c787d

Coveritx fixes 83e7dbb1f0

Merge remote-tracking branch 'origin/mueller/host-osal-vector-mq' into mueller/master 7e249db15e

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

small bugfix f1ffa88e07

Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 720ce59680

additional inc path now in IF 5144cbd789

Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 8b266aa542

refactored addr print, using AI_PASSIVE now fbe860c6a5

missing include for windows 924ea420a9

Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 7b8928ef47

last coverity fixes 6e6fb62b3c

another coverity fix 438049bb80

another coverity fix 5d93cf12f7

added new option d7d52439d7

refactoring to allow PUS c implementation 9a5f717169

sth broke ae1dab1fce

fixes 4faa5b0685

error found 07f1216316

refactoring continued 9a2fbefc9f

addes pus packet c implementation f906605097

finalized PUS C TM support ed186b04df

pus c working fc7e401ddc

added new test stub cf8a9996a7

doc fix 62e409a9f2

fix for warning print 770356f8b6

Merge remote-tracking branch 'origin/development' into mueller/master 5471030c32

config define moved, better warning a66fc53396

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

Merge remote-tracking branch 'ksat/mueller/master' into mueller/pus-c-support 29a05eb113

Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 8c4381eca6

Merge branch 'mueller/thermal-handler' into mueller/master 1cceda8e63

Merge remote-tracking branch 'origin/development' into mueller/pus-c-support 9352e15405

removed unused interface cc8c3aef3d

Merge branch 'mueller/master' into mueller/pus-c-support dcd72d421e

Merge remote-tracking branch 'origin/development' into mueller/pus-c-support e45b8bc739

Merge remote-tracking branch 'origin/development' into mueller/pus-c-support 5759c2cbe6

fixes from code review 3f91803422

tested new comment export string for retvals 3356ccc9d4

updated default cmakelists 7f1cbaef23

Merge remote-tracking branch 'origin/development' into mueller/master 1ff52e43a0

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

added multiple reply support 18a9729c75

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

Merge branch 'development' into meier/dhbMultipleReplies 10e7e42388

better output 56d43f5b49

Merge remote-tracking branch 'upstream/mueller/master' into mueller/master cac9a0eecd

adapted object factory to fsfw changes 52b549b97c

Merge branch 'mueller/master' into meier/dhbMultipleReplies e7cfd324ae

deleted old bridge ff33a1274d

Merge branch 'meier/dhbMultipleReplies' into mueller/master f2ab07c782

Merge branch 'mueller/master' into meier/dhbMultipleReplies e7c00b5633

Merge remote-tracking branch 'origin/meier/dhbMultipleReplies' into mueller/master 5273ffa721

parameter wrapper bugfix 413ff0d1b9

Merge remote-tracking branch 'origin/development' into mueller/master 5c9b1769c1

use timestamp size from FSFWConfig.h 097244bf8b

Merge remote-tracking branch 'origin/development' into mueller/pus-c-support 6ede3f9ba2

Merge pull request 'use timestamp size from FSFWConfig.h' (#418 ) from mueller/use-config-timestamp-size into development 0a76c5b0b5

Reviewed-on: #418

small format change for event to test f3530d3c7e

Merge remote-tracking branch 'origin/development' into mueller/pus-c-support 86431c854b

Merge pull request 'PUS C Telemetry implementation' (#414 ) from mueller/pus-c-support into development 08b9e92d25

Reviewed-on: #414

continued tmtc server and bridge 126def219b

TCP server implementation finished c1d30aad13

A lot of smaller tweaks and smaller refactoring done
in UDP TMTC bridge as well

Merge remote-tracking branch 'upstream/mueller/master' into mueller/master d7d24bd9aa

Added Network Byte Order 8b17c40aa6

Added Missing includes in Host Osal d807998f4d

Updated correct defaults for Host MessageQueues

Added a returnvalue 9d0155d9ae

some fixes and tweaks e1c91f82b7

event manager printout refactoring cd016c8281

added missing include 5b23b928cf

define fixes d81c6f40fb

more include fixes 8293e6b0c7

event manager update a6dd2d5dcb

added platform header file d27f49c968

platform header file 1626b266d7

Merge remote-tracking branch 'gaisser/gaisser_network_serialize' into mueller/merge-test 14027e449c

Merge pull request 'Implements Network Endianness' (#419 ) from gaisser/fsfw:gaisser_network_serialize into development 9496ed42e2

Reviewed-on: #419

Merge branch 'development' into mueller/update-package d20f0c5da1

some more preprocessor replacements 4095be449a

Merge branch 'mueller/update-package' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/update-package a320e3e1ef

moved string port argument 4fa56a2f1d

Merge remote-tracking branch 'origin/development' into mueller/master b06113993c

Merge remote-tracking branch 'upstream/mueller/tcp-server' into mueller/master 1e9c789287

renamed tcpip tasks 0bc124fd21

tweaks and fixes for TCP 5847081a24

Merge remote-tracking branch 'ksat/mueller/master' into mueller/master ff6b4134a5

Merge remote-tracking branch 'upstream/mueller/master' into mueller/master ac027e3ff2

added health service to fsfw objects 58a532fc4d

minot changes d3423b30b0

comment added 9e0146f579

added more pus services 94062c67d3

copmment block for fw class ids 6db2efc20d

changed class id file for refactored modgen c07672f9b4

updated documentation e2ae9756f3

added tmtc chapter in doc ed27d388d5

some fixes a8c0d96c39

some more information e147d5a4f5

update README b7060a9c78

typo 36030ef87c

Merge remote-tracking branch 'ksat/mueller/master' into mueller/master fc4e65b2fc

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

Merge remote-tracking branch 'ksat/mueller/master' into mueller/master f3d9fb645e

Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 07ba05b209

Merge pull request 'Update Package' (#420 ) from KSat/fsfw:mueller/update-package into development 2737bc390c

Reviewed-on: #420

Merge branch 'development' into mueller/tcp-server 0cde6f317d

Merge pull request 'TCP Server Update' (#421 ) from KSat/fsfw:mueller/tcp-server into development f4cb63c53c

Reviewed-on: #421

Merge branch 'development' into mueller/another-update-package 7fa0443725

Merge pull request 'Doc Update + PUS IDs' (#422 ) from mueller/another-update-package into development 5ac68f731e

Reviewed-on: #422

abstract function defined again 5d2c62e75d

introduced std check 2bf5a972e1

file system message update 5eadcaf10d

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

added more messages 59e7f0caae

added FreeRTOS queue map manager e15f03fb0a

queue map manager working e6868464bf

for for ISR variant 46cfe7452a

removed unrelated changes aab3fd828b

more unrelated changes removed 237ba8112b

Merge branch 'development' into mueller/freertos-queue-map-manager 95c6a24437

maybe this works e7ac2c7009

Merge branch 'mueller/freertos-queue-map-manager' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/freertos-queue-map-manager e46615e830

indentation f0a7b1cad2

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

Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 43d4953e4a

added missing event translation 567699954c

corrected include 404c3821e6

minor tweak c9836abf03

better error handling for mq_receive() e961f3f038

cleaned up a bit 54e60f4ddc

Merge remote-tracking branch 'upstream/mueller/master' into source/develop 442b9370ae

renamed variable 722a7b3240

important bugfix ad820fbe99

Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 6b9747ee0b

Merge remote-tracking branch 'upstream/mueller/master' into mueller/master c3be4cdee6

linux error print handling improved 3891014340

added example usage 070c3f3bbf

added hal class ids 33e7c635c5

object manager is now a singleton 57699cccb7

Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master 8b83541264

Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 50fac22f54

fixed merge conflict 145dd33fb1

Merge pull request 'FreeRTOS Queue Map Manager' (#423 ) from KSat/fsfw:mueller/freertos-queue-map-manager into development b6b144bcdb

Reviewed-on: #423

removed obsolete code 0157681471

small update 75adf52d28

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

Merge pull request 'Make Object Manager a Singleton and Refactored Linux Error Printing' (#424 ) from KSat/fsfw:mueller/master into development 7030d3e108

Reviewed-on: #424

added generic file system message 40b2979ce8

Merge branch 'development' into mueller/generic-filesyste-message bc151983b5

added clear message fb7b059137

Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 4b095eea89

added function to set color 1630682548

void function now 589e64fc46

default color is magneta now for wanring 73bae057bd

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

Merge pull request 'EIVE FSFW Update' (#430 ) from eive/fsfw:eive/develop into development a993872884

Reviewed-on: #430

added pus a tc 537a30a4de

added getter function 1b6759020a

added pus c support for tc d0f37b851b

tiny changes 8dc66784a8

srv 20 fixes 40a8c9a495

Merge branch 'mueller/fsfw-pus-c-tc' into mueller/master dadba69272

cleaned up a bit 56d2af9d25

const correctness b1e3a1b2b5

fixes for pus tc c 7cf4aa0d5a

added deletions 99b007f37e

updated generic file system message a7068acca7

Moved leap second management eead2a8a49

Merge remote-tracking branch 'upstream/development' into mueller/update-package 1d2dabb4b4

indentation af99303eac

indentation 5f27fe6392

Merge branch 'development' into mueller/generic-filesyste-message 3076c423c0

max tm packet size now configurable aa33ff2f48

Merge branch 'mueller/update-package' into mueller/master 0a0c5592f3

added way to set source ID 105a498b93

Merge branch 'development' into gaisser_clock_leap_seconds_move 21d213f35f

added HAL gpio class ID 4b248740f3

Merge pull request 'added generic file system message' (#428 ) from KSat/fsfw:mueller/generic-filesyste-message into development 398250c959

Reviewed-on: #428

Merge remote-tracking branch 'upstream/development' into mueller/update-package ad191409f4

changelog update c371cf4851

Merge branch 'mueller/update-package' into mueller/master 0f484abcaa

DHB update aa1bfcbb96

Merge branch 'development' into mueller/dhb-tweak 41e3a6b54b

DHB update 1c7c532ef6

Merge branch 'mueller/dhb-tweak' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/dhb-tweak 996fbf134e

type cc5c8ca698

const correctness 03e1a3e945

Merge pull request 'DHB tweak and class ID for GPIO HAL' (#434 ) from eive/fsfw:mueller/dhb-tweak into development fbbc640f4d

Reviewed-on: #434

Added some precautions in DHB::replyToReply 0cde65f5a1

Merge pull request 'Added some precautions in DHB::replyToReply' (#435 ) from gaisser/fsfw:gaisser_overflow_avoid_dhb into development 05edb7a00c

Reviewed-on: #435

Merge branch 'development' into gaisser_clock_leap_seconds_move b1f6252e30

Moved Code to own cpp ecb03b8a6d

Merge remote-tracking branch 'my_fork/gaisser_clock_leap_seconds_move' into gaisser_clock_leap_seconds_move b0a69d4c9d

Fixed wrong namespace qualifier 717971f69c

Removed old check dbfcf8b271

Removed author tag ee89a2f00d

Merge pull request 'Moved leap second handling from OSALs to clock.h' (#436 ) from gaisser/fsfw:gaisser_clock_leap_seconds_move into development cfbdb10a55

Reviewed-on: #436

Removed wrong static 2ccc0dbb00

Merge branch 'development' into gaisser_clock_leap_seconds_move 8a5a3c0243

Merge pull request 'Removed wrong static' (#437 ) from gaisser/fsfw:gaisser_clock_leap_seconds_move into development 5f9a6bb155

Reviewed-on: #437

Merge branch 'development' into mueller/update-package 66d1d14ae3

Merge pull request 'PUS C support for Telecommands and first FSFW.h file' (#432 ) from KSat/fsfw:mueller/update-package into development 2684e82c7f

Reviewed-on: #432

NO_COMMANDER was not using NO_QUEUE in DHB bd7c13ff7e

Merge pull request 'NO_COMMANDER was not using NO_QUEUE in DHB' (#438 ) from gaisser/fsfw:gaisser_small_dhb_fix into development 1e380fe562

Reviewed-on: #438

added missing include 47af5260a2

Merge pull request 'added missing include' (#439 ) from mueller/missing-include into development cae69d5400

Reviewed-on: #439

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

tiny form fix b52644dd2a

Merge pull request 'Missing function for TC Constructor' (#440 ) from KSat/fsfw:mueller/master into development 2b2899e100

Reviewed-on: #440

gaisser merged commit b00bfe4bda into master

2021-06-29 14:11:46 +02:00

gaisser referenced this issue from a commit

2021-06-29 14:11:47 +02:00

Merge pull request 'ASTP 1.1.0 Merge Development in Master' (#441) from development into master

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No Assignees

1 Participants

Notifications

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: fsfw/fsfw#441