Commit Graph

56 Commits

Author SHA1 Message Date
7e6c25901b
Squashed commit of the following:
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
commit c137df64ab
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 4179e8e124
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 51f9d5e1fe
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 a17f57cbb5
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:34:45 2023 +0200

    changelog

commit 26f5eff6d5
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 8a0f13bafb
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 14baa3563c
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:30:09 2023 +0200

    hello

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

    changelog

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

    changelog

commit 4074e08480
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 23796345d9
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:04:30 2023 +0200

    changelog and stop payload tracking

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

    changelog

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

    that is more robust

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

    changelog

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

    changelog

commit 38686ac3f6
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 74d5d70973
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 13:58:08 2023 +0200

    this bugfix might be super important

commit 48355e8263
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 189a312628
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 a12794281b
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 10:20:31 2023 +0200

    changelog

commit fcaabb4e42
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 6c326489cb
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 862a4f2685
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 5691fe8e72
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 2daca272f8
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Thu Apr 27 11:29:18 2023 +0200

    changelog

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

    lower live TM handler frequency

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

    host SW works properly again

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

    configurable event manager queue depth

commit 00dab64628
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 4aafca64a6
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 6901eae816
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 7d630ebcf3
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:00:04 2023 +0200

    EM adaptions

commit 641b8e847d
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 1314268682
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 4040304ef0
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 13:15:42 2023 +0200

    this is annoying

commit a919b3d164
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 9672d6d6cc
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:11:09 2023 +0200

    changelog

commit e22f2a53ea
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 b076e80b44
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:04:10 2023 +0200

    changelog

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

    changelog

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

    update PTME code

commit 097be17a29
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:13:02 +02:00
99e6ea6000
that should do the job
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-18 14:34:09 +01:00
21899d663e
start groundwork for new TM downlink arch 2023-03-09 01:32:27 +01:00
ffbf7df557
rename ploc supv and i2c dev symlinks
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2022-11-29 11:05:19 +01:00
1a17770bbc
all TMP1075 dev except the OBC IF board one working
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-11 18:52:12 +01:00
95d2bc0887
first IRQ impl
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 10:49:52 +02:00
bc277067ed
add PDEC IRQ uio file entry
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-10-27 09:20:41 +02:00
f24ea413c8 Merge branch 'develop' into mueller/uio-updates
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2022-10-27 08:53:08 +02:00
8dd1d81e0d
consistent dev names
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-27 08:51:49 +02:00
4a8096998d
added two todos and new uio file names
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-25 18:21:48 +02:00
8b35bbd241
use new SCEX uart dev name
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-06 15:08:33 +02:00
0341865e98
this seems to work
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-06 11:15:55 +02:00
c5e5df03d9
new Uart16550 for SCEX, try stop bits
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-05 18:13:49 +02:00
Irini Kosmidou
308a855d8c bugfix for scex testcode
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-27 18:54:48 +02:00
Irini Kosmidou
a1cc5b0ca7 Merge remote-tracking branch 'origin/develop' into irini
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-27 17:36:19 +02:00
Jakob Meier
8c850614e5 fixed merge conflicts 2022-06-05 10:54:46 +02:00
478975db26
spi setup more stable now
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-14 11:34:25 +02:00
Jakob Meier
907b8f4a5d ccsds config for te0720-1cfa 2022-05-10 07:48:36 +02:00
07d345183e
rename gps dev 2022-04-17 01:07:23 +02:00
Jakob Meier
ca1e8f3dc1 syrlinks fault flag
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-01 09:20:35 +02:00
Jakob Meier
758c4e6f4f uart isolator switch handling 2022-03-28 09:08:11 +02:00
9f60c82725
intermediate PR
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-02-23 19:26:02 +01:00
4050521e5a
added GNSS select pin
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-02-01 11:17:00 +01:00
3bd4c57b85
replaced all names
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 18:32:54 +01:00
0a315f203b
renamed some deivces
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 18:29:14 +01:00
0b9b24ca08
try new symlink for eive-i2c
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 17:06:21 +01:00
ef48c8c6ad correction for i2c device
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-27 16:08:53 +01:00
5c535784e9
added back old GPS handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-26 17:59:31 +01:00
Jakob Meier
a07468f7b7 introduced uio mapper class 2022-01-24 16:33:22 +01:00
Jakob Meier
a56224c339 ptme axi interface
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-01-24 07:43:14 +01:00
77c45c0de9
applied formatting
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-01-17 15:58:27 +01:00
433b218227
added new GNSS mux select pin
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-12-21 18:29:27 +01:00
861d92f3c2
update uart device names
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-12-21 18:13:20 +01:00
636c1fdf26
added GNSS enable pin handling
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-12-20 13:37:28 +01:00
e442a8c968
ACS and TCS board working together now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-12-17 14:20:22 +01:00
Jakob Meier
63965e2f68 enabled rx lines of syrlinks rs485 transceiver chips 2021-11-21 13:59:18 +01:00
Jakob Meier
709661ff67 pdec handler print tc
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-11-03 18:19:36 +01:00
Jakob Meier
3e2f4e7a10 class to generate pdec config words 2021-11-02 11:11:38 +01:00
Jakob Meier
556a3986c1 pdec handler 2021-11-01 12:41:20 +01:00
Jakob Meier
5da2a45881 gpios to enable rs485 tx clock and tx data
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-10-08 14:15:33 +02:00
Jakob Meier
5b26564058 ptme ip core packet insertion 2021-09-26 08:29:30 +02:00
Jakob Meier
f0885fcb2e removed unused gpio definitions in busConf.h
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-09-25 11:09:29 +02:00
Jakob Meier
9fd4c477f0 changed all gpio configurations to open by line name
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-25 10:49:03 +02:00
28040f85cc fixes for new gpio update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-21 19:28:22 +02:00
Jakob Meier
26162f8e78 gpio chips now opened by label 2021-09-20 17:47:29 +02:00
8af3a91b5a
correct RW pin
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2021-09-16 11:11:25 +02:00
3354f2a696 acd board tests continued
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-13 18:07:07 +02:00
c67a7ef1d8 added more package pin comments
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-13 11:48:11 +02:00
0343372910 very important bugfix for reset pin gnss
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2021-09-08 19:27:49 +02:00
94979e3561 pulling reset pin gnss high
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2021-09-02 20:27:12 +02:00