WIP: Comparison branch #157

Closed

muellerr wants to merge 0 commits from mueller/master into develop

pull from: mueller/master

merge into: eive:develop

eive:main

eive:use-different-rot-rate-for-detumble

eive:allow-mekf-str

eive:mpsoc-file-split

eive:auto-switch-image-feature

eive:mohr/introspection

Conversation 0 Commits - Files Changed -

muellerr commented 2022-03-01 15:28:09 +01:00

Owner

Copy Link

Shouls not be merged, branch used to create smaller PRs

Shouls not be merged, branch used to create smaller PRs

muellerr added 163 commits 2022-03-01 15:28:14 +01:00

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

fsfw and tmtc update 00bd6e260a

separate branch for reboot file handling 3a6c7e3183

update README 55618e381c

cleanDocker dfaaae5512

cleanDocker da78e57dd3

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

Merge remote-tracking branch 'origin/develop' into mueller/reboot-file-handling ba68c80d6b

reboot logic unittest init 042acc1a23

update gpio API cffafb6a6b

resolve merge conflict e250ddc43e

fsfw update dc4c721360

fsfw update ff35986a16

use catch2 main 8e6d8a6fa8

improved mount logic, create conf folder is missing a2bc72a798

continued tests, first fixes 8c2c402821

some more fixes 8e8fe3d0c9

added missing command d4dcd8c03f

various bugfixes from unittest 0d1ff8585c

bugfix by inspection 165e6e829e

added last unittests 1c17aac544

small README 65961695de

fix for RPi config 8ecf7dda9e

use more generic preproc define 02d092fb23

extended reboot file handling daa3b0084a

update gitignore b279434ef0

updated OBSW code 4a5ad4fb4d

repoint fsfw 684d9b8059

extension for additional safety e1112f1903

small tweak 84367f8424

small but important bugfix be122038ed

apply clang format to unittest folder as well 9e03f9babe

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

muellerr added 1 commit 2022-03-01 15:30:32 +01:00

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

muellerr added 1 commit 2022-03-01 17:34:37 +01:00

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

muellerr added 1 commit 2022-03-01 17:35:29 +01:00

deleted old str handler 20f1cb4ef9

muellerr added 1 commit 2022-03-01 18:00:51 +01:00

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

muellerr added 1 commit 2022-03-03 16:19:39 +01:00

update .h.in config 42d3ebe1b0

muellerr added 2 commits 2022-03-03 18:36:27 +01:00

some fixes for pl pcdu b44442b282

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

muellerr added 7 commits 2022-03-03 19:11:45 +01:00

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/plpcdu e1b8debb27

catch exception in NVM param base d8240881cc

update tmtc submodule 566c7913c9

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

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

muellerr added 13 commits 2022-03-04 09:40:53 +01:00

separate branch for new system components 9597e3868c

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

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

muellerr added 1 commit 2022-03-04 10:26:34 +01:00

regenerated events bc310c9dfb

muellerr added 2 commits 2022-03-04 10:38:41 +01:00

regenerate returnvalues 38e5a97015

moved some archive files a74c606307

muellerr added 2 commits 2022-03-04 14:28:47 +01:00

regenerated events ad3fcbf0f3

comment fix 12b0ac5847

muellerr added 1 commit 2022-03-04 14:55:42 +01:00

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

muellerr added 4 commits 2022-03-04 15:33:18 +01:00

added PL PCDU code 7f42de1c82

added last small fixes for successfull compilation e7c0066d5d

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

fsfw update bb99c195e9

muellerr added 1 commit 2022-03-07 15:47:02 +01:00

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

muellerr added 39 commits 2022-03-08 10:37:18 +01:00

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

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

move archive folder b71ea7c4c7

Merge branch 'develop' into mueller/move-archive-folder f419ac8fd7

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 branch 'develop' into mueller/move-archive-folder 7134401570

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

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 pull request 'move archive folder' (#170) from mueller/move-archive-folder into develop ... a145a868dc

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

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

enabled more GCC warnings 6ccf16f56d

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

minor update in fsfw 10a2973dc7

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

repoint tmtc d799e3768d

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

name fix 84dead546c

Merge pull request 'enabled more GCC warnings' (#174) from mueller/additional-gcc-warnings into develop ... 7b4f45b082

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

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

muellerr added 1 commit 2022-03-09 19:06:02 +01:00

reworked fsfw version handling 62348bb37d

muellerr added 14 commits 2022-03-10 10:06:14 +01:00

minor fixes 3dbf66383a

hotfix for countdown in SDC manager b992058e00

bump revision 15151e0400

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

add quiet flag 95e694d01a

small tweaks d836f6ea10

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

muellerr added 7 commits 2022-03-11 14:34:17 +01:00

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

muellerr added 1 commit 2022-03-11 14:47:30 +01:00

extend q7s-port script 4ca4db621a

muellerr added 1 commit 2022-03-11 15:05:01 +01:00

update cp script to allow copying multiple files cbb8b6e16b

muellerr added 1 commit 2022-03-11 15:19:26 +01:00

q7s-port.sh: Make FM default 4c7b527735

muellerr added 3 commits 2022-03-14 09:39:36 +01:00

make SW more robust 4415cb4eda

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

enable both boards 6cc6870934

muellerr added 1 commit 2022-03-14 09:42:58 +01:00

added periodic HK subscription for PDU sets bfb9985a46

muellerr added 1 commit 2022-03-14 10:04:36 +01:00

tmtc update f3bf1a6085

muellerr added 1 commit 2022-03-14 11:04:59 +01:00

fixes 79d2ae837c

muellerr added 1 commit 2022-03-14 14:46:41 +01:00

Add Latchup print commands 1a0f9164ef

muellerr added 1 commit 2022-03-14 17:41:21 +01:00

more useful PCDU printout a362e71388

muellerr added 1 commit 2022-03-15 18:33:19 +01:00

disable init switches cfg 38e8c4f035

muellerr added 1 commit 2022-03-16 18:45:28 +01:00

small form changes 1edfc48acf

muellerr added 1 commit 2022-03-16 19:21:40 +01:00

pass switch type instead of uint8_t 1b2060694b

muellerr added 1 commit 2022-03-16 19:57:05 +01:00

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

muellerr added 5 commits 2022-03-17 10:20:19 +01:00

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

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

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

muellerr added 1 commit 2022-03-21 10:15:26 +01:00

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

muellerr added 1 commit 2022-03-22 17:59:11 +01:00

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

muellerr added 1 commit 2022-03-23 13:35:17 +01:00

update submodules c9930c6cc8

muellerr added 16 commits 2022-03-23 13:39:22 +01:00

started TCS subsystem bcd97076e1

added init function 73e3d29ed0

TCS subsystem continued ce8253b940

hmm this is awkward c184385e12

derive from ASS base instead 1ebd92a17e

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 remote-tracking branch 'origin/mueller/tcs-subsystem' into mueller/master 1cd98c5604

muellerr added 1 commit 2022-03-23 15:02:50 +01:00

better rtd printout 6e91462cba

muellerr added 1 commit 2022-03-25 12:20:26 +01:00

README update 59dfff9bf8

muellerr added 1 commit 2022-03-25 12:22:05 +01:00

README update 7f7a756094

muellerr added 1 commit 2022-03-25 12:25:17 +01:00

made egse port executable 4b6cf3c30a

muellerr added 1 commit 2022-03-26 13:36:10 +01:00

fsfw update 043984172c

muellerr added 5 commits 2022-03-26 13:54:16 +01:00

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>

update project file, new definitions file c8c2e543a1

longer timeout for mode service 0ff84b31ef

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

various improvements ac0326a944

muellerr added 1 commit 2022-03-26 13:54:34 +01:00

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

muellerr added 1 commit 2022-03-26 14:08:47 +01:00

fix compile warnings for RPI build 243af65ca6

muellerr added 1 commit 2022-03-26 14:10:05 +01:00

remove links which change regularly 83d90f41b0

muellerr added 1 commit 2022-03-26 14:10:40 +01:00

apply auto-formatter 7612564a8f

muellerr closed this pull request 2022-03-28 12:24:47 +02:00

All checks were successful

Hide all checks

EIVE/eive-obsw/pipeline/pr-develop This commit looks good

Details

EIVE/eive-obsw/pipeline/head This commit looks good

Details

Pull request closed

This pull request cannot be reopened because the branch was deleted.

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

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#157

No description provided.