eive/eive-obsw

meier/master #33

Merged

muellerr merged 24 commits from meier/master into develop

2021-05-17 14:59:47 +02:00

meierj commented

2021-05-17 14:28:39 +02:00

Owner

No description provided.

muellerr was assigned by meierj

2021-05-17 14:28:39 +02:00

meierj added 24 commits 2021-05-17 14:28:39 +02:00

max1227 wip ed6eea82c5

Merge branch 'meier/master' into meier/max1227Handler f2caa84098

spi decoder callbacks wip b873831645

rad sensor change wip f708a67fa8

another try to read out the adc 31b4246bca

rad sensor working fd9adee1ae

rad sensor working 3c6ec68faa

save before implementing SusHandler with chip select 5ce0a63ad6

save before making change in spicomif 1eb9909377

some tries to get data from max1227 in externally clocked mode be29d0e71f

this worked with the prototype SUS eeb8167cdc

this works with the old SUS 950eab2373

this works with q7s and new sus 98387a6d24

write setup byte and conversions 261f16f15b

working SUS in externally clocked mode fab28904de

save before changing to internally clocked mode a6465c42ba

changed SusHandler MAX1227 to internal clock mode e1e69539ca

sus delay implementation 2d170a1f61

Sus handler complete 65d0c1fabf

solved merge conflicts 44bde15a46

all sus initialized 33c229d08a

updated fsfw_hal b0c2606e6a

added etl and tmtc 8508957f5b

Merge branch 'develop' into meier/master 09e66ceb49

muellerr approved these changes 2021-05-17 14:59:40 +02:00

muellerr merged commit 9e6a7c6faf into develop

2021-05-17 14:59:47 +02:00

muellerr referenced this issue from a commit

2021-05-17 14:59:47 +02:00

Merge pull request 'meier/master' (#33) from meier/master into develop

muellerr referenced this issue from a commit

2021-07-22 15:22:53 +02:00

Merge pull request 'meier/master' (#33) from meier/master into develop

Sign in to join this conversation.

2 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: eive/eive-obsw#33

No description provided.