Commit Graph

200 Commits

Author SHA1 Message Date
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
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
4864394590 renamed heaters
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-09 16:13:33 +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
646925c571
removed redundant SUS OBJ ID defs
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-08 13:08:49 +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
6dd57a3f5e fixed merge conflicts
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-06 19:44:18 +02:00
22060b9b16
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-06 01:12:07 +02:00
68938c3b42
remove duplicate object ID
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 20:27:20 +02:00
a11a8c493d
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-05 19:53:18 +02:00
0c82d06ec4
Merge remote-tracking branch 'origin/develop' into mueller/rename-sus
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 19:41:36 +02:00
b426475ca4
better RTD names 2022-05-05 16:55:08 +02:00
a232b9bf98
assign better sus names
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 16:46:04 +02:00
4c809e354d
better heater obj id names
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 16:23:46 +02:00
95a634ea7f
update .cproject file 2022-05-05 01:33:18 +02:00
bcb6df87b0
update tmtc, gen files and formatting in config file
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 00:47:50 +02:00
1536a0f94b
named heaters
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 18:17:10 +02:00
ae0120f3ef
Merge branch 'mueller/refactoring-conf-handling' into mueller/heater-health-if
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 17:44:02 +02:00
0f4fe7694b Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling 2022-05-03 00:01:55 +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
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
c1248dd4e1
building new EM config
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-29 15:47:54 +02:00
f01f63d8e8 Merge remote-tracking branch 'origin/develop' into mueller/gomspace-fdir 2022-04-28 17:55:40 +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
Jakob Meier
582d2db05f fixed conflicts 2022-04-28 14:29:23 +02:00
2b33d8772c
fixes most warnings for host build
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-26 10:37:25 +02:00
9fe2de5244 Merge pull request 'CMake git describe support' (#226) from mueller/cmake-git-describe-support into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #226
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-22 20:03:34 +02:00
8bd7d00ab1
forgot to bump version
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2022-04-22 16:15:04 +02:00
a416ca406b
git describe support finished
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-22 14:09:08 +02:00
Jakob Meier
1ce45acba3 merged develop 2022-04-17 14:52:43 +02:00
Jakob Meier
7b54855397 supervisor fixes detected during testing 2022-04-16 17:19:32 +02:00
Jakob Meier
10343a0dab supervisor event buffer request 2022-04-14 07:52:21 +02:00
Jakob Meier
a807aab97e fsfw update
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-13 12:01:39 +02:00
8a0999851f
update for new fsfw API
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
- Apply auto-formatter
2022-04-11 14:56:20 +02:00
f05922e19e Merge remote-tracking branch 'origin/develop' into mueller/split-pdu1-pdu2-sets 2022-04-11 08:55:25 +02:00
Jakob Meier
b440fc3df6 ploc update
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-10 18:46:39 +02:00
90e8d7ecaf
Merge remote-tracking branch 'origin/develop' into mueller/pcdu-hk-core-sets
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-08 14:15:58 +02:00
59d58da4f2
splitting pdu1 and pdu2 sets done
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-07 19:48:09 +02:00
796b814b49
Add time file handling 2022-04-07 17:23:50 +02:00
64b3afae22
new event for battery mode: broadcast and changed
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-07 13:07:28 +02:00
Jakob Meier
c0fd9aee6f update helper wip 2022-04-07 11:00:07 +02:00
b5363604bc
Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-refactoring
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-29 15:40:02 +02:00
50b8bca6b7 duplicated id 2022-03-28 17:37:02 +02:00
0c889f9492 Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-refactoring 2022-03-28 10:33:49 +02:00
Jakob Meier
758c4e6f4f uart isolator switch handling 2022-03-28 09:08:11 +02:00
Jakob Meier
44a0d4af61 removed te0720 code form q7s files
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-27 10:56:40 +02:00
Jakob Meier
ceb7f40d35 fixed merge conflicts
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-27 10:44:32 +02:00