eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity
6,611 Commits 5 Branches 124 Tags
Commit Graph

2476 Commits

Author SHA1 Message Date
Robin Mueller
00e98a2fd6
Squashed commit of the following:
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
Details
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Details 
commit 120e50299b3b43d42f47054bb5f11ba412fbcb68
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed May 10 14:24:39 2023 +0200

    update IP core handler

commit a13687a7dcac179c6d7f9037976d40d612208ab4
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed May 10 14:21:05 2023 +0200

    update AXI PTME config code

commit c137df64ab43e5b20fcf26c8821982fa71e43cff
Merge: a919b3d1 4179e8e1
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:38:52 2023 +0200

    Merge remote-tracking branch 'origin/main' into update_ptme_code

commit 4179e8e124b3f9f425ac64b7df8b7e7395982dbf
Merge: 26f5eff6 51f9d5e1
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:35:54 2023 +0200

    Merge pull request 'This bugfix might be super important' (#621) from possible_bugfix_dual_lane_assy into main

    Reviewed-on: #621
    Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
    Reviewed-by: Steffen Gaisser <gaisser@irs.uni-stuttgart.de>

commit 51f9d5e1fe8e71445ec15b833020c4e30b254e72
Merge: a17f57cb 26f5eff6
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:35:10 2023 +0200

    Merge branch 'main' into possible_bugfix_dual_lane_assy

commit a17f57cbb587f960366baae7059309d18619cdc4
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:34:45 2023 +0200

    changelog

commit 26f5eff6d5957e4898f6d5a84200e77b1bd6250c
Merge: 4074e084 8a0f13ba
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:32:03 2023 +0200

    Merge pull request 'More System Modes' (#612) from more-system-modes into main

    Reviewed-on: #612

commit 8a0f13bafbb995b724321a3936a674078d01882f
Merge: 14baa356 4074e084
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:31:51 2023 +0200

    Merge branch 'main' into more-system-modes

commit 14baa3563c3dc6499bac49bb83c08ba98bfad171
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:30:09 2023 +0200

    hello

commit 7045b6034afdb819f4978f91f697d7f23806ab89
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:18:47 2023 +0200

    changelog

commit 37b9615525637294118266910979236127f8a8ce
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:18:16 2023 +0200

    changelog

commit 4074e0848012042565047726b8c526c6b5809a2c
Merge: 862a4f26 38686ac3
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:12:46 2023 +0200

    Merge pull request 'Adaption for EM: Add P60 dock without ACU' (#620) from adaption_em_p60_dock_without_acu into main

    Reviewed-on: #620
    Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

commit 23796345d966787f6f43c1d89b9555413bfe583a
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:04:30 2023 +0200

    changelog and stop payload tracking

commit b10275ca43f13ee68be013c7ece3b63acf762130
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:28:05 2023 +0200

    changelog

commit 383849c5cb62b1543037ab07c904b2725c91be13
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:25:14 2023 +0200

    that is more robust

commit c66cef9129586e8708a8f2679ff86b3c9977c5f5
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:23:21 2023 +0200

    changelog

commit 02ea8a7298ff14c8acab55b2f693e8593c277624
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:22:21 2023 +0200

    changelog

commit 38686ac3f621e50ea76be023520167841d2e2c19
Merge: 189a3126 74d5d709
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:04:03 2023 +0200

    Merge branch 'possible_bugfix_dual_lane_assy' into adaption_em_p60_dock_without_acu

commit 74d5d70973b46c70d1483077e71e2820d3ca4ad6
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 13:58:08 2023 +0200

    this bugfix might be super important

commit 48355e82635b071b9347b62f2bd1da636bf4eae5
Merge: 5691fe8e 862a4f26
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 10:25:50 2023 +0200

    Merge branch 'main' into more-system-modes

commit 189a312628e561f54491ec238a2d2d5e2f211b57
Merge: a1279428 862a4f26
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 10:23:46 2023 +0200

    Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu

commit a12794281bfc2ebb27a02bbc151696023e69a9f0
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 10:20:31 2023 +0200

    changelog

commit fcaabb4e421b5f792ede490b6dd135ce661c9db5
Merge: 6c326489 4aafca64
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 10:20:02 2023 +0200

    Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu

commit 6c326489cbc59f2d70993542f05676472ca0102f
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 10:18:46 2023 +0200

    adapt EM SW: GS PCDU added, but use dummy for ACU

commit 862a4f268510e04fc3cfb878b5eed9f0f9d62f05
Merge: 4aafca64 2daca272
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 09:37:55 2023 +0200

    Merge pull request 'Host SW bugfixes' (#618) from try_fix_host_obsw into main

    Reviewed-on: #618
    Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

commit 5691fe8e72a2e3b008d6130f31be32d9d7aee9b7
Merge: 097be17a 4aafca64
Author: meggert <eggertm@irs.uni-stuttgart.de>
Date:   Thu Apr 27 15:40:31 2023 +0200

    Merge branch 'main' into more-system-modes

commit 2daca272f8f0397125349c0f6c193e22d0a26383
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Thu Apr 27 11:29:18 2023 +0200

    changelog

commit 03762f962020b55188d445ee3dd429b6e1a32135
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:38:06 2023 +0200

    lower live TM handler frequency

commit a296f16e5ce9d803ce5db54d9602e396dad7ebce
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:36:38 2023 +0200

    host SW works properly again

commit 83f07a6e16cbbf5fc4a9ccb2e7d92c3fdffb172b
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:26:32 2023 +0200

    configurable event manager queue depth

commit 00dab64628a53d2109fceb5f9a4ffc765a72fab6
Merge: 641b8e84 4aafca64
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:03:35 2023 +0200

    Merge remote-tracking branch 'origin/main' into try_fix_host_obsw

commit 4aafca64a67589826f1578865c92fa76141e8531
Merge: f271242d 6901eae8
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:03:01 2023 +0200

    Merge pull request 'EM adaptions' (#619) from em_adaptions into main

    Reviewed-on: #619

commit 6901eae81689981937e7eb49b98886f8c78b727b
Merge: 7d630ebc f271242d
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:02:24 2023 +0200

    Merge remote-tracking branch 'origin/main' into em_adaptions

commit 7d630ebcf3894a9a9896d1c3f05548d5ef230333
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:00:04 2023 +0200

    EM adaptions

commit 641b8e847d2b63ad11f28c4a37434a6161443690
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 16:41:40 2023 +0200

    add back tm funnel handler for hosted build

commit 13142686823bedee1a79ae5f851f124968822a54
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 16:23:50 2023 +0200

    host build requires dedicated live TM task..

commit 4040304ef09a172f9d2bef42547d6b1effb8ca76
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 13:15:42 2023 +0200

    this is annoying

commit a919b3d1645d5c4a6e20903d973ce96424508cae
Merge: e22f2a53 9672d6d6
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:11:30 2023 +0200

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

commit 9672d6d6cca3ad7369bb4b06fd91a7f17a0f9db9
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:11:09 2023 +0200

    changelog

commit e22f2a53ea7388cc5c75c2024953aab293c8d277
Merge: b076e80b 0eb6b7cc
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:05:58 2023 +0200

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

commit b076e80b44e7ef2b2417def66ec1f1a684cfb228
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:04:10 2023 +0200

    changelog

commit 269aa6f7b0006125e9a516f8ecb6cdc32c91cbe5
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:03:42 2023 +0200

    changelog

commit caae2b4ba925747aa0ed1e2112582c6deff39d77
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:02:24 2023 +0200

    update PTME code

commit 097be17a2900e64021fcbb457c89d6d4756ab697
Author: meggert <eggertm@irs.uni-stuttgart.de>
Date:   Wed Apr 19 15:07:21 2023 +0200

    added remaining acs modes as system modes
 2023-05-12 09:17:05 +02:00
Robin Mueller
670c753a75 hello 2023-05-11 19:32:37 +02:00
Robin Mueller
141438bd24 changelog and stop payload tracking 2023-05-11 19:32:37 +02:00
meggert
f5e20db03f added remaining acs modes as system modes 2023-05-11 19:32:37 +02:00
Robin Mueller
490790bd0c host SW works properly again 2023-05-11 19:31:23 +02:00
Robin Mueller
3e9933c7ee this is annoying 2023-05-11 19:30:45 +02:00
Robin Mueller
a75f9553be okay lets see if this works
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2023-05-11 18:38:41 +02:00
Robin Mueller
befa84a74b the hottest fix
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
Details
EIVE/eive-obsw/pipeline/pr-main Build started...
Details
2023-04-19 18:09:57 +02:00
Robin Mueller
468fb096c9
high event severity
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
Details
2023-04-17 11:44:51 +02:00
Robin Mueller
2658cabc9d
remove TODO 2023-04-17 11:41:21 +02:00
Robin Mueller
00da51b6a2
okay its an afmt thing
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
Details
EIVE/eive-obsw/pipeline/pr-develop Build queued...
Details
2023-04-17 11:36:34 +02:00
Robin Mueller
f846a18b33
update defines
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
Details
2023-04-17 11:36:17 +02:00
Robin Mueller
ab588b4844
fixes and tweaks TCS and EM build
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
Details
2023-04-17 11:35:10 +02:00
meggert
e05d9d4b2a prevent low pass filter if no sensor data is available 2023-04-17 09:29:50 +02:00
meggert
07572ab3a0 fixed shadowing 2023-04-17 09:20:09 +02:00
Robin Müller
a9a0266a84 Merge branch 'develop' into update_sagittactl_v10.7
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-16 11:01:19 +02:00
Robin Mueller
740275f57a
normal mode now works as well
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details
2023-04-16 04:04:57 +02:00
Robin Mueller
ddbe30f832
afmt 2023-04-16 03:52:45 +02:00
Robin Mueller
680d496b28
STR seems to work well now 2023-04-16 03:52:10 +02:00
Robin Mueller
f4fedd20c9
added more bugfixes for list dir dump
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
Details
2023-04-16 02:56:46 +02:00
Robin Mueller
7bf880a29f
use gzip directly
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-15 22:17:50 +02:00
Robin Mueller
c1ccfe66eb
this compiles with warnings
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
Details
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-15 15:17:22 +02:00
Robin Mueller
ae9f43c707
adaptions for new sagittalib
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details
2023-04-15 15:15:06 +02:00
Robin Mueller
b8d010cd39
CHANGELOG + FS helpers
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
Details
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-15 13:01:41 +02:00
Robin Mueller
d24a983985
some EM fixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-14 21:02:39 +02:00
Robin Mueller
fa746f910d
Merge remote-tracking branch 'origin/develop' into acs-flp-safe
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
Details
2023-04-14 20:13:50 +02:00
Robin Mueller
379fd6046e
ge-generate files
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
Details
2023-04-14 20:08:05 +02:00
Robin Mueller
aa800c4524
trigger special reboot events 2023-04-14 20:04:51 +02:00
Robin Mueller
7f1fe3a2d8
bugfix
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details
2023-04-14 19:58:22 +02:00
Robin Mueller
8cf9dd9136
use config constant
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-14 19:30:40 +02:00
Robin Mueller
62d18826f1
proper post reset handling for PDEC reset
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-14 19:29:22 +02:00
meggert
41f762c6ff also only use mekf for detumble check if allowed to
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-14 19:12:05 +02:00
Robin Mueller
756ea6d90d Merge remote-tracking branch 'origin/develop' into feature_com_pdec_fdir
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-14 19:01:22 +02:00
meggert
2d19d94d09 Merge branch 'acs-flp-safe' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into acs-flp-safe
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-14 18:58:47 +02:00
meggert
09a2ba7843 fixed type 2023-04-14 18:57:06 +02:00
Robin Müller
716f2b2832 Merge branch 'develop' into acs-flp-safe
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-14 18:56:11 +02:00
meggert
6934721a42 prevent div by zero
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
Details
2023-04-14 18:56:05 +02:00
Robin Müller
5e53795cbe Merge branch 'develop' into tmp_dev_custom_fdir 2023-04-14 18:55:36 +02:00
Robin Mueller
ca30fed4c3
Merge remote-tracking branch 'origin/develop' into str_update_v10.7
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
Details
2023-04-14 18:53:45 +02:00
Robin Mueller
4bfd675073
Merge remote-tracking branch 'origin/develop' into tmp_dev_custom_fdir
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
Details
2023-04-14 18:48:20 +02:00
Robin Mueller
33d60ccf7f
v10.7
Some checks are pending
EIVE/eive-obsw/pipeline/head This commit looks good
Details
EIVE/eive-obsw/pipeline/pr-develop Build queued...
Details
2023-04-14 18:31:56 +02:00
meggert
a306b2a0af Merge branch 'develop' into acs-flp-safe 2023-04-14 16:50:31 +02:00
meggert
f112c28391 enabled commanding from ACS ctrl
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-14 16:50:02 +02:00
meggert
4693407b68 fixed parameters 2023-04-14 16:47:53 +02:00
meggert
4e6b3ec9ed fixed shadowing
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-14 16:44:37 +02:00
Robin Mueller
9b1d4de9c5 Merge remote-tracking branch 'origin/develop' into tmp_dev_custom_fdir 2023-04-14 14:44:40 +02:00
Robin Mueller
998f93e3fa Merge remote-tracking branch 'origin/develop' into heater_health_device
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-14 14:32:27 +02:00
Robin Müller
b5e1e0c31b Merge branch 'develop' into feature_com_pdec_fdir
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-14 14:29:59 +02:00
Robin Müller
b2a52b0bfc Merge branch 'develop' into str_update_arcsec_lib
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
Details
2023-04-14 13:28:22 +02:00
Robin Mueller
46862825ec
2 minutes countdown for ptme was attempted CD
Some checks are pending
EIVE/eive-obsw/pipeline/head This commit looks good
Details
EIVE/eive-obsw/pipeline/pr-develop Build queued...
Details
2023-04-14 13:27:50 +02:00