v1.10.0 #220

Merged

meierj merged 592 commits from develop into main 2022-04-22 07:42:20 +02:00

Conversation 0 Commits 592 Files Changed 218 +10878 -6525

muellerr commented 2022-04-21 14:27:16 +02:00

Owner

Copy Link

No description provided.

muellerr added 584 commits 2022-04-21 14:27:19 +02:00

improvements in ploc mpsoc handler 632759bf8a

Merge branch 'meier/startracker' into meier/plocMPSoC ee0d3bb446

mpsoc flash fopen command 305e63cf4e

flash close command b0df5b9439

removed unsued variable 7fae7afdf6

flash write wip 996a8a226e

flash write wip f8eebe2e7d

flash write wip 45c7f9555d

mpsoc sequence count restructured 0f0f5e2fcb

improved sequence count f0bf743f88

ploc mpsoc handler improved tc mem read 1133ea08c8

fix ack size 5634f15293

crc fixes c20acfc9c8

added empty PL PCDU handler 02a8fd124f

added PL PCDU GPIO names 77f718bfce

plpcdu stuff 9313fa4639

added first startup code version 00f411eaca

pass comn if to handler 513c907962

apply auto format 656eaf4dea

implemented core switch on state machine ce566b0fa8

transition delay 20 minutes 773242cc8e

auto formatter d51e2c19f6

merge 201bfd1b07

branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/master 602a6cd86e

refactoring 66bd5f8fbf

update SuS code a1409fbcdf

debug output 1981be6e2f

somethings still wrong 2a4905a1f7

sus 0 on now 84f77642d5

no perform op a38dd52d7b

remove some code 1fd7ba18e9

some minor fixes 938c361097

added empty file for common max 1227 code 4c60e54fe7

fsfw update 35322add7a

small fix GPS dev handler bc88dfd9a4

Merge remote-tracking branch 'origin/mueller/sus-update' into mueller/master 3a6be97c26

changed default TMTC handler 4af119d904

added preprocessor guard to avoid hk spam 4a5b201eba

Merge branch 'mueller/plpcdu' into mueller/master 666188036f

add temp read for ext clocked mode a2ec4a4828

move generic max1227 code to separate source file 82f9d9db4b

small fix c6c9a02f09

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

apply clang format ce41b3316c

possible some fixes in decoder logic f5879f5867

more sus testing 3387a71399

added more max1227 tests c06ef5d6b5

more test code 25b4af1921

nothing works effe461380

update spi test task for PL PCDU ae4d1e6db3

added new max1227 helper functions 49decb8e9a

added rad sensor enable, obj factory fixes 64b4ab3249

update spi test class ce57f0b0f7

small tweak 029ed7de9b

added missing gpioID ec7d624cca

added periodic test capability 151621b49a

this delay seems to do the job 6326ac71ca

sun sensors working in test class b6f3b838b7

sus handler update 16680663fd

updated PST a01ddf6a5b

pass SUS idx to dev handler 9cae806dd9

sus dev handler update bbb07dd459

print event listeners a6f3b6fc83

increase tm funnel queue depth 2bc717caa0

first mq args test 1e3311f635

fix compilation for rpi 1400945d99

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

some more rtd tests fc3fb70025

cleaned up config flags a bit 4fce0fd0e0

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

avoid code duplication f95abfe032

sus printout runtime configurable 68e1208b7f

set ID fix 4b7a4ebe3a

reverted some changes aee3f7b075

continuing pl pcdu cd2097850e

Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates 134b0d3822

added adc and temp handling 8953f6f60d

continued pl pcdu handler c683097635

update object list bd0df3493f

update .cproject file and README for watchdog aaefe9e1ca

new defintions file 292cf8f5e4

Merge branch 'mueller/watchdog-update' into mueller/master 03afb7ed2e

fix for Pi 0964eb85ec

fsfw update ee45418f8c

something is not working yet 4eb5e8acba

ping working on Pi now eb1b4f1b05

small fix 71d257fd12

Merge branch 'mueller/plpcdu-sus-updates' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/plpcdu-sus-updates ee2c194aeb

files cad967ec56

Merge branch 'mueller/plpcdu-sus-updates' into mueller/master 8abd6c39e7

pl pcdu bugfixes 3e1cefe5a4

changes to .h.in file 1b97dd4968

update cmakelists.txt d35ba2c894

apply clang format 121b4ed974

Merge branch 'mueller/watchdog-tweaks' into mueller/plpcdu-sus-updates d5e978adc6

added back pl pcdu source compilation 9823823742

fsfw updates 495badaef6

Merge remote-tracking branch 'origin/mueller/create-unique-bin-name' into mueller/plpcdu-sus-updates 66b579a63a

checking other way to get all data at once 9e3d7bccd9

issues with external pl pcdu conversion 3f318afe2c

finished ext conv callback 5dcc6e2003

additional comment e1f9a4bbd9

moved some more code to mission folder 4da0555bfd

smaller tweaks 9245815f97

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

another small tweak db57a52bf6

better printout ceb8911403

found bug in srv5 ctor f30005cc49

fsfw updates fcb9d401f0

Merge branch 'mueller/uart-test-task-update' into mueller/master 631a4334f9

Merge branch 'mueller/plpcdu-sus-updates' into mueller/master d54695faeb

reduced ctor 61b5836acd

link libxiphos and use it for reboot fa93ca4dc0

bugfix and first reboot handler code dbba10185c

continued reboot handler a3f63e970f

continued reboot handler 00eb5a2f1e

first implementation finished 37cf7ac01b

introduced reboot events 75563d107b

Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates c7c2ae0ca3

cleaned up includes a bit 69e36f4667

Merge branch 'mueller/move-deply-handler' into mueller/plpcdu-sus-updates 20074dcbd7

move execute action block be8734dd59

Merge branch 'mueller/rad-sensor-update' into mueller/master 42da2f2153

Merge branch 'mueller/rad-sensor-update' into mueller/master 446940f219

created back transition handler and channel enum 608d45f055

added new system folder 6955d4a3d9

added subsystems 11fb5f9e81

bugfix obj factory 203bb8f618

Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates f959ffb6ee

Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates 07da61d8c5

include fix fec2d718af

Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates a85aba92f9

Merge branch 'mueller/plpcdu-sus-updates' into mueller/master 8a0757dcef

separate branch for new system components 9597e3868c

added processed values to dataset f6e0487558

need to merge core controller changes as well.. a36a6dc847

Merge branch 'mueller/reboot-file-handling' into mueller/plpcdu-sus-updates 006e9e2229

small changes to NVM JSON api, regenerate events 3f3bbfcde4

param file init success a5e2208e01

adc check handling done 49e58b2365

first sucessfull full transition 30f4beb5f6

lower HPA lower bound a3d806a923

fixes all generator scripts 77042ef297

Merge branch 'mueller/plpcdu-sus-updates' into mueller/master af19d40444

update gpio API cffafb6a6b

resolve merge conflict e250ddc43e

fsfw update dc4c721360

fix for RPi config 8ecf7dda9e

use more generic preproc define 02d092fb23

Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates 501b35c20c

Merge branch 'mueller/reboot-file-handling' into mueller/master b98a24373e

Merge branch 'mueller/plpcdu-sus-updates' into mueller/master be9242b975

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

added complete parameter handling for PL PCDU c569900968

smaller fixes and separate pl pcdu adc speed conf 58e4b9f347

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

deleted old str handler 20f1cb4ef9

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

Merge remote-tracking branch 'origin/develop' into mueller/plpcdu e1b8debb27

catch exception in NVM param base d8240881cc

update tmtc submodule 566c7913c9

Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems 0b200cd296

continued acs board assembly 5873371d36

finished ACS board ASS 5255e7d2ed

check children state on implementation c7183b730e

submodule update 1586c3e69a

started SUS assembly ... ff0da65662

fixes for PCDU code and switcher list handling

completed switcher switch case 261b4a808d

Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems 63c4095d4d

update .h.in config 42d3ebe1b0

Merge remote-tracking branch 'origin/develop' into mueller/plpcdu bf10fe4cdb

some fixes for pl pcdu b44442b282

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

Merge branch 'mueller/plpcdu' into mueller/master 90972cf2f5

added mutex protection for power switches a7c1dafce5

finished most of sus handler 0595e29100

added some missing acs board ass code 120153e9c7

Merge branch 'mueller/system-subsystems' into mueller/master 60f9bf8fe5

regenerated events bc310c9dfb

regenerate returnvalues 38e5a97015

moved some archive files a74c606307

regenerated events ad3fcbf0f3

comment fix 12b0ac5847

Merge branch 'develop' into mueller/system-subsystems c4ed263e6c

Merge branch 'develop' into mueller/system-subsystems fe7394bded

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

Merge branch 'mueller/plpcdu' into mueller/master ffe1fd9af4

fsfw update bb99c195e9

start acs task 4eb948c5ef

continued ACS board assembly 0904cadde5

some more bugfixes cbb8103278

first version of ACS board ASS working ... 32def71502

- Testes transition OFF to NORMAL for A side
- Refactored power switching so it can be used by SUS ass as well
- Generate events for sending switch command
- Generate event if switch state changes
- Deny Q7S switch commanding

regenerate object and events debc72014a

bump fsfwgen dependency 59b89b730d

Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems 970b8c33e5

update events and objects d5c755a331

subsystem ID bugfix b53900071c

command init switch state f83153934c

update switch initializer b5660d582e

improved preproc handling in obj factory a1ea5db4f0

Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems a2fee43c8c

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

switch initialization is now optional (default on) e678b53452

reattempt power switching at least once d262b8ab8b

update event list b9139d5c40

update event list again 597ab9c74c

bugfixes for NORMAL to OFF transition 62229cb999

Merge branch 'develop' into mueller/system-subsystems 9ab8188034

Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems 39c47a1abf

Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems e2ad666d07

Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems 124703aa99

name fix 84dead546c

Merge branch 'develop' into mueller/system-subsystems db1a4267bb

use new version getter function b66b1e0fff

Merge branch 'mueller/system-subsystems' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/system-subsystems 45dff6b920

bump version b9c1523e81

Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems b2ad33a1c6

Merge branch 'mueller/system-subsystems' into mueller/master ea49e3b8cd

minor fixes 3dbf66383a

Merge branch 'mueller/hotfixes' into mueller/system-subsystems 29f0c5b8f6

add quiet flag 95e694d01a

suppress Catch2 warning 39b4393b13

added status message 8cf3220cd0

fixes some issues bfc8d8a7c4

Merge pull request 'Catch2 hotfix' (#177) from mueller/suppress-catch2-warning into develop ... 636dbda36b

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

small tweaks d836f6ea10

reworked fsfw version handling 62348bb37d

fsfw and tmtc update 85372a10c8

update for version handling 406f44ae26

fsfw update 3f54a3a5a5

Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems 6a59f6338c

fsfw update 662e8cae17

small fsfw update 1dcf34f3ba

fixes where FSFW version is used 03aba8b080

Merge branch 'mueller/system-subsystems' into mueller/master bf8a76c1f5

created new dual lane assembly base 1742371c14

started integrating new base obj into sus assembly 3cfb58d681

docs 8c41669d1f

more docs fec6cc3ea9

update for gen scripts, small fixes dd37f90b47

Merge branch 'mueller/system-subsystems' into mueller/master 47beaad58c

Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/master 0587295c1b

extend q7s-port script 4ca4db621a

extend q7s-port script 3aa641f05c

update cp script to allow copying multiple files cbb8b6e16b

update cp script to allow copying multiple files 99fa736947

q7s-port.sh: Make FM default 4c7b527735

q7s-port.sh: Make FM default 245e3a0ff7

Merge pull request 'q7s-port.sh: Make FM default' (#180) from mueller/q7s-port-make-fm-default into develop ... b863dfb981

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

Merge pull request 'update cp script to allow copying multiple files' (#179) from mueller/update-cp-script into develop ... a50be52f50

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

fixed em tcf port c3115fc974

core housekeeping d99825e20e

initialization of core pool variables 27063f102b

tmtc update fb162e3332

Merge pull request 'meier/coreHk' (#181) from meier/coreHk into develop ... e8ced3c4c4

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

make SW more robust 4415cb4eda

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

enable both boards 6cc6870934

added periodic HK subscription for PDU sets bfb9985a46

tmtc update f3bf1a6085

fixes 79d2ae837c

fixed conflicts 9fc1e57943

Add Latchup print commands 1a0f9164ef

more useful PCDU printout a362e71388

Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems 8e3f40a780

update FSFW and related version handling 0063ce0ccd

update obsw.cpp file 197d1a4ce0

use develop Object Factory 08a1101000

run generator scripts f8f7848200

Merge pull request 'Update FSFW version' (#182) from mueller/update-fsfw-version-handling into develop ... 037d68587b

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

disable init switches cfg 38e8c4f035

flash write wip 595b9aff6c

tmtc dc7c48d211

ploc handler wip 8bf91f2645

added ploc helper objects b0b2854d44

small form changes 1edfc48acf

pass switch type instead of uint8_t 1b2060694b

Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems bbf3a4df91

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

Major update for power handling ... 40d9829700

and various smaller updates

Obj Factory fixes c212f0ad48

Merge pull request 'Power Update' (#183) from mueller/power-handling-update into develop ... 4e3562f9fe

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

Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems 72acab599a

tmtc update 03c04aa2e6

Merge remote-tracking branch 'origin/mueller/system-subsystems' into mueller/master 1c5c15bdc7

apply auto-formatter e23687dd66

Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems ad30b84c83

.h.in file fix 3c1055f988

tmtc update dabc3e1fbc

small fix in power state machine 4fef5781a8

small fixes e373fe0769

build configuration for trenz te0720-1cfa 9dc124004d

continued ACS board + SUS board assemblies ... acd0307591

- Handling and Testing of basic FDIR

fix in mem write command b8fb5c289c

fixed conflicts 8d70560968

add and instantiate SUS ASS + SUS FDIR e5a4065055

fixed conflicts 33b250562b

only include lxiphos when building for q7s 253e2731bd

rerun generators a18a752b8e

tmtc update 5763485688

flash delete wip 5875868f72

mpsoc flash delete command be45d21486

fsfw update f37c57d0bc

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

tc replay stop wip 664670573a

e-band control commands bbed4a3b6e

tmtc update 05b43d4d72

refresh events, objects, retvals c95374bfbd

various smaller bugfixes e4d1cdafcc

update fsfwgen deps 5589eb2c7b

restructured flash write command 78b3f28188

started TCS subsystem bcd97076e1

added init function 73e3d29ed0

set test flag for rad sensor to 0 1c7601aa1c

TCS subsystem continued ce8253b940

hmm this is awkward c184385e12

Merge pull request 'System and Subsystem Init' (#166) from mueller/system-subsystems into develop ... 27f9cb7469

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

derive from ASS base instead 1ebd92a17e

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

Merge remote-tracking branch 'origin/develop' into mueller/tcs-subsystem c21dae1afc

merge develop and apply afmt e95d25db66

continued tcs board assembly 14d9efce1f

assign rtd fdir , create TCS BOARD ASS 5b7dd7c432

new system ctl task 4afacbe82b

prevent RTD spam 22154f2851

update object list, bugfix 5fb4e468ba

tcs assembly working for now 3e9910b1d2

add children lost mode event 9c6f349a08

added new event 017eaf07f5

Merge pull request 'TCS Board Assembly' (#184) from mueller/tcs-subsystem into develop ... 8f63e6321e

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

flash write tc, fix in pus data extraction f99e96a20a

include fixes 368b01c081

update submodules c9930c6cc8

Merge remote-tracking branch 'origin/mueller/tcs-subsystem' into mueller/master 1cd98c5604

better rtd printout 6e91462cba

plpcdu refactoring 2fb8ca4aaa

replay command 1e2df7bf91

get status function 3df7a7f896

update tmtc 53a780ed0f

changed some error messages to warnings 4ccec03e47

README update 59dfff9bf8

README update 7f7a756094

made egse port executable 4b6cf3c30a

correction for transition delay 3e3fc20fc6

update project file, new definitions file c8c2e543a1

corrections during e-band test 931c53f1a6

another fix c949f9f795

Merge pull request 'correction for transition delay' (#185) from mueller/pl-pcdu-hotfix into develop ... 563bf0747a

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

update fsfw c4ea13a5f4

Merge pull request 'update fsfw' (#186) from update-fsfw into develop ... c47919bb3d

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

Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-refactoring 184ce2917d

tmtc update 71639f21e8

use transition mode 0937697637

add dual lane power switcher for PL PCDU 74fa98d161

change to more generic type f88a063d83

rpi fix 15d1da8199

tmtc update 6db4092dc8

increased pl pcdu debug divider 4bf0521a5d

longer timeout for mode service 0ff84b31ef

fixed merge conflicts 2f6d9ab7f1

rerun generators 9351c8285b

fixed conflicts 94dc4eb367

tmtc update 80fe0bdce6

fixed conflicts 47a3804145

fsfw update 043984172c

Merge remote-tracking branch 'origin/mueller/various-smaller-fixes' into mueller/master 9d10af35d8

various improvements ac0326a944

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

fix compile warnings for RPI build 243af65ca6

remove links which change regularly 83d90f41b0

apply auto-formatter 7612564a8f

added SUS component creation to RPi 2410c6ccc6

mpsoc flash write command 471a981ccf

tmtc update 98795f9529

Merge pull request 'Various Improvements & Fixes' (#187) from mueller/various-improvements-rpi-tweaks into develop ... af57f02840

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

fixed merge conflicts ceb7f40d35

removed te0720 code form q7s files 44a0d4af61

renamed win q7s env script a359afb1c3

preprocessor define correction 022ae4091d

preprocessor define correction b41806d6c2

added missing includes d4d1c8106c

tmtc update 7f9b2a5bd0

regnerated return values 1dfc18ae66

created i2c com if fpr tmp1075 handler ad9f40d70a

tmtc update 0f77c606e0

return execution finished in executeAction 0d8ccd649a

tmtc update 3fe9599c48

run clang formatting script 6d04c278c3

adding uart isolator switches wip e2c9bece05

uart isolator switch handling 758c4e6f4f

fsfw update 27419f48e3

gpio dummy if 5db4b9cb86

fsfw update a6f2227490

fixed conflicts a9a6bbd948

Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-refactoring 0c889f9492

tmtc update 6e25cf912f

use power switcher to turn on supervisor d6ed952fa9

tmtc update 25fe13a4a4

implemented switch handling 66029cb47a

Merge branch 'develop' into mueller/rpi-sus-port 01f601e761

submodule updates 39b9ed06c3

Merge branch 'mueller/rpi-sus-port' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/rpi-sus-port 4447a9d4b1

changed rootfs env variable from q7s to zynq7020 b66c730c49

switched to docker_d3 1f12a249f5

update power API d80ef280dd

run auto-formatter e6ad0978de

simplified PL PCDU 6fa975cc74

rerun generators 98ec92a880

increased hpa current limit b18cb0cb64

duplicated id 50b8bca6b7

dsiabled switching to normal mode during mode on transition 876a13ec37

star tracker fixes 991f864375

Merge branch 'meier/plocMPSoC' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/plocMPSoC 618d7a3358

print out hpa current limit exceeding f8c548659f

corrected prinout 6b543dc7bb

star tracker switch 25c3f39c82

Merge pull request 'meier/plocMPSoC' (#188) from meier/plocMPSoC into develop ... 2b8728fcd8

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

Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-refactoring b5363604bc

Merge remote-tracking branch 'origin/develop' into mueller/rpi-sus-port 9f937781b7

perform nReset handling in Assembly now 69ba11acc1

delete code which is not required anymore 9eaa732644

set the time in the code directly now 0ba2caaf61

small safety mechanism for time a8457d7966

only set time every 60 seconds 9cfb2bad51

mpsoc startup command 2dca9d598d

fsfw update cfaba492da

tmtc update ea23fda599

fixed merge conflicts 9236486a0f

syrlinks writing lcl register 61a7f71e80

tmtc update f2f350116f

submodule update 2bb9cdc612

changes for FSFW power refactoring dec5dc7c96

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

fsfw update f1fe115447

write lcl config register 53aca633b8

continued rpi sus port 2c8b691ca4

Merge branch 'mueller/power-update' into mueller/rpi-sus-port c61a29db12

added missing cast 44bd42ded6

moved spi dev name to definitions file a4f99b3e78

afmt 9958b37fba

rad sensor debug flag d01d6d92f8

submodule updates 6052363cdb

minor bugfix, works now ac0e1aebba

reading temperature value 387595495e

mpsoc sending action command during startup to supervisor e9b2def10e

important bugfixes 637941e089

Merge pull request 'Power Update' (#191) from mueller/power-update into develop ... 6d807b3959

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

merged develop 0abdf0291e

Merge pull request 'PL PCDU Refactoring v1' (#189) from mueller/plpcdu-refactoring into develop ... ee497ecf2a

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

fsfw update f20ad98a52

Merge branch 'develop' into meier/deviceHandlerUpdate 222f17edcc

improvements from sus test 413f552639

Merge remote-tracking branch 'origin/develop' into mueller/rpi-sus-port 053c65b6cd

syrlinks temperature set and temperature protection b29a0cd0fb

ported RTD code as well 33ec092998

fixes 487c21f16a

Merge pull request 'Port of Sun Sensor and RTD code to Raspberry Pi' (#190) from mueller/rpi-sus-port into develop ... ff86b9bbb3

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

activate all suses again 61769de4bf

syrlinks fault flag ca1e8f3dc1

Merge remote-tracking branch 'origin/develop' into meier/deviceHandlerUpdate d769d3ce22

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

Merge branch 'develop' into mueller/rpi-sus-port 1a280dd5cf

move GNSS NReset handling to assembly ... 1eb5a428cb

- Also update fsfwgen dependency

Merge pull request 'meier/deviceHandlerUpdate' (#192) from meier/deviceHandlerUpdate into develop ... 2cc14532cd

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

Merge remote-tracking branch 'origin/develop' into mueller/move-gnss-nreset-handling c231a775b3

fsfw update c55fafee48

update fsfw dependency d3050625bb

update header file as well 8a4de72713

syrlinks test 07c242282d

Merge pull request 'activate all suses again' (#193) from mueller/rpi-sus-port into develop ... afb1d22f76

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

Merge pull request 'move GNSS NReset handling to assembly' (#194) from mueller/move-gnss-nreset-handling into develop ... 04de6c7136

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

Merge pull request 'update fsfw dependency' (#195) from mueller/update-fsfw into develop ... a57f3faafb

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

re-enable all suses 189674a9bb

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

bugfix in SUS device handler 007badc324

Merge branch 'mueller/sus-bugfix' into mueller/master 4cb434e750

Merge pull request 'bugfix in SUS device handler' (#196) from mueller/sus-bugfix into develop ... 50db2fedef

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

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

tmtc update 99f56a89af

PL PCDU switch states like mode bitmask now b12ffb6f44

apply auto-formatter ec880d4232

Merge pull request 'apply auto-formatter' (#197) from mueller/afmt into develop ... 734972af07

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

tmtc update d315d6b458

set internal state properly 4327fcb92e

syrlinks d2f54f033f

tmtc update a30e57142a

improved P60 HK handling 65ce25ec7a

Merge remote-tracking branch 'origin/develop' into mueller/improve-pcdu-hk-handling 5031e78365

hk handling 6020b20fc9

debug flag 40403b81c3

prepared pr f91efd8c1e

prepared pr 1f4328d9a0

tmtc update 29b7c97892

fixed conflicts d48ec92d09

fsfw update 146868da21

set p60 dock HK vars to valid 3cfd0deb22

tmtc update 36db47466f

p60 dock HK is diagnostic again 65d504bed1

Merge pull request 'meier/syrlinks' (#199) from meier/syrlinks into develop ... 1d6ae35465

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

p60 dock HK does not need to be diagnostic f325d139da

Merge remote-tracking branch 'origin/develop' into mueller/improve-pcdu-hk-handling d7e899e113

switch handling working now 834e935c64

submodule updates 06a15ccec1

Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-update-mode-handling 042a6b2960

resolve merge conflict, ran afmt c6e16e0866

run auto-formatter bc47402a6d

GPS linux controller update a6d20de0a5

tmtc update 81e33348bb

update for gps ... c3aa9fb908

- GPSD/NTPD finally seem to work now. Still keep code to set it manually for  now

Merge pull request 'HK handling improvements' (#198) from mueller/improve-pcdu-hk-handling into develop ... 569735474a

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

Merge branch 'develop' into mueller/gps-update 8f391d3a68

Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-update-mode-handling 1a5196f9d2

fsfw update b2933f95d7

exclude gps changes 5c4ae861b1

Merge pull request 'PL PCDU Update Mode Handling' (#200) from mueller/pl-pcdu-update-mode-handling into develop ... b5ce035c09

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

Merge remote-tracking branch 'origin/develop' into mueller/gps-update 1876bbe449

longer HK intervals 8f4f271331

enable periodic HK by default ca92b85864

Merge pull request 'GPS Update' (#201) from mueller/gps-update into develop ... 68992e77dc

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

periodic HK definitions for all device handlers 66627741f9

hk update for gps 64dce75e09

Merge remote-tracking branch 'origin/develop' into mueller/hk-check bf849b24e6

split P60 dock HK into core and aux HK 4e3fa54ae2

Merge pull request 'HK Update' (#202) from mueller/hk-check into develop ... 160df15cbf

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

split up p60 hk packets 5e4c3728ed

new event for battery mode: broadcast and changed 64b3afae22

use different severities d570b5c460

add p60 boot count broadcast 0e7cd7de6f

Add time file handling 796b814b49

Merge remote-tracking branch 'origin/develop' into mueller/gps-time-update 5801c17509

update translation files 45007d726d

Merge branch 'develop' into mueller/pcdu-hk-core-sets cb81798c0c

splitting pdu1 and pdu2 sets done 59d58da4f2

Merge remote-tracking branch 'origin/develop' into mueller/split-pdu1-pdu2-sets 8f0d0917ab

bugfixes and improvements ... 4a6840f098

- Tests finished

some tweaks 351920aa7b

more useful printout 6ae9e539a6

small tweak c83efd149e

Merge pull request 'GPS Time Handling' (#203) from mueller/gps-time-update into develop ... ff5e271f88

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

Merge remote-tracking branch 'origin/develop' into mueller/pcdu-hk-core-sets 90e8d7ecaf

tmtc update a9419cd328

Merge pull request 'PCDU P60 HK Set Update' (#204) from mueller/pcdu-hk-core-sets into develop ... 6a875d5f0b

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

Merge remote-tracking branch 'origin/develop' into mueller/split-pdu1-pdu2-sets f05922e19e

update tmtc submodule 1d98582bbd

update for new fsfw API ... 8a0999851f

- Apply auto-formatter

fsfw update 5e8262657f

bump fsfw and tmtc deps d96ff72635

some warning fixes for release build df38903fe9

repoint fsfw e2e85c19e1

repoint fsfw again 6e33af7a75

bugfix for pool ID 2cd5450333

some important bugfixes 2529ed905c

using vector for convert enables a14ca283cc

Merge pull request 'Development fixes' (#207) from mueller/develop-fixes into develop ... b618302db0

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

Merge branch 'develop' into mueller/release-warning-fixes 52885919d0

fsfw update a807aab97e

Merge pull request 'Split up PDU1 and PDU2 sets' (#205) from mueller/split-pdu1-pdu2-sets into develop ... 435f8164a1

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

Merge branch 'develop' into mueller/release-warning-fixes 42b7b4a7c4

Merge pull request 'Release build warning fixes' (#208) from mueller/release-warning-fixes into develop ... 9b6f254954

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

submodule and obj factory updates a72c2f7b7d

assign power switcher for imtq and star tracker fd3313fc62

apply afmt 655497934b

update submodules 94896c9e74

add subsystem impls 6c63356edc

Merge remote-tracking branch 'origin/mueller/fsfw-update' into mueller/add-subsystem-impls fd9fbe4543

Merge pull request 'submodule and obj factory updates' (#209) from mueller/fsfw-update into develop ... 17aa70f5e0

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

Merge pull request 'Assign power switcher to IMTQ and Star Tracker' (#210) from mueller/assign-more-power-switches into develop ... 6fdf7f704d

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

Merge branch 'develop' into mueller/add-subsystem-impls 0f7f17b591

Merge pull request 'Add Empty Subsystem Impls' (#211) from mueller/add-subsystem-impls into develop ... aefd8b696d

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

update fsfwgen deps 9fa745cfb2

switcher handling extension 1db5d278f6

repoint fsfw cf575f0d70

Merge pull request 'Extend Power Switch Handling' (#212) from mueller/extend-power-switch-handling into develop ... 500c54e430

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

repoint fsfw again 23730349b0

bugfix for inverse copying f5d88a4b6a

fix initializer list order 1fb5b48455

include improvements 850722eae5

fix out-of-bounds read 9c54696d91

Merge pull request 'fix out-of-bounds read in PCDU Handler' (#218) from mueller/hotfix-pcdu-handler into develop ... b68c58fd37

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

Merge pull request 'fix and improvement for include handling in OBSW watchdog' (#216) from mueller/watchdog-fixes into develop ... 34c0ac3f05

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

Merge pull request 'fix initializer list order' (#215) from mueller/imtq-order-fix into develop ... daf50a83fd

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

Merge pull request 'bugfix for inverse copying' (#213) from mueller/q7s-cp-bugfix into develop ... 4325eaa956

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

add changelog ae2cd52087

update CHANGELOG 2c491b27c0

muellerr added this to the v1.10.0 milestone 2022-04-21 14:32:52 +02:00

meierj approved these changes 2022-04-22 07:41:58 +02:00

meierj merged commit a24464f13e into main 2022-04-22 07:42:20 +02:00

meierj referenced this issue from a commit 2022-04-22 07:42:22 +02:00

Merge pull request 'v1.10.0' (#220) from develop into main

Sign in to join this conversation.

Reviewers

No reviewers

meierj

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.10.0

Assignees

Clear assignees

No Assignees

2 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#220

No description provided.