Commit Graph

852 Commits

Author SHA1 Message Date
0ac38e8490 Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-25 10:16:14 +02:00
d79177e544 Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 10:15:48 +02:00
7646b683b2
Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 09:59:14 +02:00
43fc1ab780
Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 09:57:34 +02:00
2bf044422f
Merge remote-tracking branch 'origin/develop' into meier/imtq
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 09:56:41 +02:00
Jakob Meier
1ccd12e2e1 enable hk in imtq
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 19:08:00 +02:00
b878508fec Thermal COntroller collecting Sus Temperatures
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-24 16:52:21 +02:00
3fff3ba21e
add and schedule PUS11
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-24 15:21:37 +02:00
633fe00cd6
run afmt, minor improvements
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 01:14:04 +02:00
1519b13b78
appears to work now
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 00:52:08 +02:00
b2c286cd7e
improve and optimize SD card handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 00:20:23 +02:00
a1d2ec3db4
Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 22:24:28 +02:00
5df905182c
these brackets are less confusing
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:40:17 +02:00
43269d4add Merge branch 'develop' into mueller/rtd-bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-23 18:37:40 +02:00
40b02aa46b Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:37:28 +02:00
7d9ef6f887
run afmt
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-23 18:37:04 +02:00
62ef9c7e70
set datapool entries of rad sensor valid
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:25:39 +02:00
1f62d8284c
Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:01:37 +02:00
a4de3e9eb1
Merge remote-tracking branch 'origin/develop' into mueller/rtd-bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:00:45 +02:00
8aa664b49f
rtd bugfixes
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 17:50:54 +02:00
Jakob Meier
d808a12c31 fixed conflicts
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-23 16:53:20 +02:00
660f0d2dcd
some minor fixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 14:19:57 +02:00
e522aadd44
set HKs valid
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 14:04:46 +02:00
8ae6fe0be5
moved HK defs
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 12:39:10 +02:00
Jakob Meier
fb5c6c4c17 continuation of failed mpsoc update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-23 12:05:42 +02:00
99e27a5a63
run afmt
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 11:25:58 +02:00
3bdad61ac0
split ACU HK set
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-23 10:42:57 +02:00
c024756540 WIP extending thermal controller
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-23 00:37:49 +02:00
2f8f5ce79b thermal controller is reading pt1000 values from datapool 2022-05-19 23:08:54 +02:00
e9725e3093 gcc 12 complained... 2022-05-19 23:06:18 +02:00
ef14fa3789 Merge remote-tracking branch 'origin/mueller/fixes-for-spi-update' into mohr/thermal_controller 2022-05-19 16:29:30 +02:00
Uli
710bd58ee1 Merge branch 'develop' into mohr/thermal_controller 2022-05-19 15:31:13 +02:00
377f762ca5
fixed for new SPI HAL API
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-19 14:54:44 +02:00
90a92feee1 some thermal controller code to test TM chain
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-19 00:40:42 +02:00
e49a1af9b7
bump fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-18 14:51:33 +02:00
28a4f782f9
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-17 17:55:25 +02:00
140bbcb7b8
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-17 13:43:21 +02:00
8a5090b8ee
apply new auto-formatter on all files
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-17 13:40:19 +02:00
e2cfce634b
GenericFactory bugfix
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-17 13:35:21 +02:00
f20fcd9a72 Merge remote-tracking branch 'origin/develop' into mueller/rtds-update 2022-05-14 17:07:27 +02:00
017cfb9d56
a lot of fixes, but some stuff doesnt work..
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-14 17:04:51 +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
1c9f411e75
new RTD handler working
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-14 09:41:28 +02:00
8715683d6b
enable periodic reply for eie RTD
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-13 17:25:06 +02:00
2c684643b3 some smaller fixed for new rtd handler
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-13 16:29:57 +02:00
b12a634b81 typo
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-13 15:16:48 +02:00
3ae1812c32 some renaming
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-13 15:16:10 +02:00
44e7f06c2e
shorter debug string
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-13 10:33:35 +02:00
f3b473ea99
some more rtd tweaks
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-13 10:27:26 +02:00
d999f57fef
apply afmt
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-13 10:10:56 +02:00
6b54a4dea9
cleaning up, better fault status handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-13 10:10:02 +02:00
be1c26ddf7
rtd testing
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-13 01:17:23 +02:00
e81ddaa1a5
added auto-shutdown for faulty heaters 2022-05-12 20:44:36 +02:00
21ba8c95ff
additional parameter to identify cmd source
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 20:12:01 +02:00
e25c492aa4
create and schedule health PUS service
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 19:22:20 +02:00
Jakob Meier
919141ae10 ccsds handler sending command to enable transmitter 2022-05-12 18:32:19 +02:00
51466e68d7
Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-12 14:11:46 +02:00
a173ef4308
create low level rtd handler in obj factory
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-12 12:12:47 +02:00
6b9e49e632
continued low level MAX31865 handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-12 11:27:30 +02:00
23f209fb07
added eive specific max31865 handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-12 09:48:41 +02:00
93f605bc0a
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-12 00:45:57 +02:00
625abcfd5b
important bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-11 15:45:38 +02:00
c043375ae3
RW Refactoring
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- FSFW update: SPI device is part of ComIF now
- Only set RW mode (speed is set a side effect but not necessary) once
- Release SPI bus in the 70 ms delay duration
2022-05-11 11:13:00 +02:00
91b69eacf6
A lot of stuff
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- refactored and simplified RW assemblies
- create separate SPI Com IF for RWs
- Update .cproject file: Fixed to decrease indexer parsing times
2022-05-11 01:48:26 +02:00
45c1ac0f61
update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-10 18:34:39 +02:00
50c363fb6f new RTD reader module handling all RTD SPI Communication
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-09 21:29:54 +02:00
71d9553f90
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-08 13:11:56 +02:00
d9085e81a1
Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-08 13:06:47 +02:00
Jakob Meier
2ff8923c81 fixed reorder warning in imtq handler 2022-05-07 13:19:59 +02:00
1f6aab8124
apply afmt, some more renaming
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 13:40:43 +02:00
590fe6ca39
Some RW improvements
- Moved Events to definitions file
- Added new event if reset occurs
- Deliver state if there is an error (going to be 0, still deliver it)
2022-05-05 12:48:56 +02:00
92f95b2b97 comment out debug printout
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-04 13:25:42 +02:00
d0e18f8b35 add mutex protections for switcher states 2022-05-04 11:11:29 +02:00
50ca378318 update for updated gpio API
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-04 10:34:11 +02:00
d79323c6ca
small fix for generic factory header
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 17:45:39 +02:00
0172351e89
additional try catch block
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 22:58:06 +02:00
1f8a68dabe
re-use existing enum
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 22:55:39 +02:00
9449919b2b
Heaters are own objects with HealthIF now
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 22:45:27 +02:00
b98c691c2b
added health helper to heater handler
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 17:51:00 +02:00
238afbaa8b
add health IF to heater handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 17:37:00 +02:00
a54d89c90f Merge branch 'develop' into mueller/rw-ass
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 15:55:41 +02:00
Jakob Meier
7a6b45b102 removed debug print 2022-05-02 14:43:53 +02:00
Jakob Meier
2f90c3e937 removed debug print
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 13:51:56 +02:00
Jakob Meier
5f6a8fa37d bugfix pcdu handler command queue reading
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-02 13:50:44 +02:00
Jakob Meier
690b41777b bugfix pcdu handler command queue reading 2022-05-02 13:48:34 +02:00
bab8412f10
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-02 12:41:45 +02:00
Jakob Meier
be752997eb fixed merge conflicts
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-30 19:12:21 +02:00
Jakob Meier
03b7b802c5 removed ptme test data sending
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-30 16:33:34 +02:00
Jakob Meier
6d322c6e78 run clang format script
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-30 16:21:59 +02:00
7c770b5aec fixed conflicts
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-28 18:33:27 +02:00
1527b60fd6
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 18:26:34 +02:00
f01f63d8e8 Merge remote-tracking branch 'origin/develop' into mueller/gomspace-fdir 2022-04-28 17:55:40 +02:00
bbe1e996e6 Merge pull request 'Host Fixes and CMakeLists.txt update' (#229) from mueller/host-fixes-fsfw-update into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #229
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:16:03 +02:00
d0b7531e48
create and assign gomspace power fdir
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 15:58:31 +02:00
b97604d7d2
override event confirmed as well
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 15:36:56 +02:00
7e230b64ea
create and add syrlinks fdir
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 15:29:57 +02:00
7e2a993211
create rudimentary syrlinks fdir
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-28 15:25:03 +02:00
7682a1d214 fixed conflicts 2022-04-27 16:56:16 +02:00
7543a92dd9 added test code 2022-04-27 16:44:03 +02:00
Jakob Meier
8610e48b19 countdown based timeout 2022-04-27 16:08:17 +02:00