Thermal Controller Update #399

Merged
muellerr merged 84 commits from thermal_controller into develop 2023-04-03 15:12:49 +02:00

84 Commits

Author SHA1 Message Date
Robin Müller ba7a2c3ece Merge branch 'develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop Build started... Details
2023-04-03 15:12:30 +02:00
Robin Müller a8a0299b46
some adaptions, heater to off seems to work
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-04-03 14:38:00 +02:00
Robin Müller f4b47a24c0
adaptions for EM build
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-04-03 14:22:58 +02:00
Robin Müller e9c5bfe324
event spam has stopped
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-04-03 14:09:54 +02:00
Robin Müller 62952b89b1
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-04-01 16:00:15 +02:00
Robin Müller d1775a52aa
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-31 19:18:05 +02:00
Robin Müller def7eca2f2
cleaning up a bit
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-28 19:38:02 +02:00
Robin Müller 520b41c53b
transition basic mode handling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-28 17:21:43 +02:00
Robin Müller 28d7dcf177
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-28 16:37:09 +02:00
Irini Kosmidou 36d7852c1d changes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-28 16:35:49 +02:00
Irini Kosmidou 5c97020087 small change
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-28 15:11:21 +02:00
Robin Müller 861bee8083 Merge branch 'develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-26 16:58:30 +02:00
Robin Müller 3e7901f060
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-26 16:52:39 +02:00
Robin Müller 0301c18af2
resolve some merge conflicts
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-24 21:20:27 +01:00
Robin Müller f71972609c
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-24 21:15:29 +01:00
Robin Müller 9c8fc84053
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-21 23:44:25 +01:00
Robin Müller 2153294e6f
EM build working now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-21 15:17:31 +01:00
Robin Müller 0fdc79df5e
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-21 14:55:55 +01:00
Robin Müller 0e5a3a2f6c
update changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-21 14:46:07 +01:00
Robin Müller b81618344e
update eive system FDIR
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-21 14:38:10 +01:00
Robin Müller d85ddcdbff
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-21 14:18:57 +01:00
Robin Müller 092e9fa508
bump deps 2023-03-21 14:18:32 +01:00
Irini Kosmidou ba9cf5d79d small changes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-18 18:03:59 +01:00
Robin Müller 4871479ed5
fixes for q7s build
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-18 11:17:24 +01:00
Robin Müller eb46841237 update thermal controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-17 17:40:11 +01:00
Robin Müller d44142ac26 Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-17 17:36:51 +01:00
Robin Müller f7be8ea63c
use supervisor fdir
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
controls the power switch
2023-03-16 19:10:05 +01:00
Robin Müller 3c6eb265c7
PLOC SUPV dummy has switch now
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-16 18:52:32 +01:00
Robin Müller b1d2f73b01
move Switches enum
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-16 18:47:51 +01:00
Robin Müller eda1f7e212
syrlinks event works
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-16 18:28:51 +01:00
Robin Müller 56a4378a63
that should be transition safe
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-16 18:05:23 +01:00
Robin Müller a16671762d
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-16 17:48:17 +01:00
Robin Müller 350ed59033
handle syrlinks overheating in COM SS
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 17:13:25 +01:00
Robin Müller 096253a9a3 Merge branch 'feature_scheduling_tweaks' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 16:25:13 +01:00
Robin Müller 11e5866f31
added some defines
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 16:24:46 +01:00
Robin Müller 9b8092fb09
this seems to work
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 16:24:01 +01:00
Robin Müller f546df50a1 Merge branch 'feature_boot_sequence_eive_sys' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 16:21:14 +01:00
Robin Müller 8201a4140a
works better now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 16:19:37 +01:00
Robin Müller 364342855d
maybe force a mode command?
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 15:52:20 +01:00
Robin Müller c688a51838 Merge remote-tracking branch 'origin/feature_boot_sequence_eive_sys' into thermal_controller 2023-03-15 15:52:14 +01:00
Robin Müller 715a69db89
this should cover upper bound checking when heater is off
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 15:43:20 +01:00
Robin Müller dc44af5b29
copy and paste error
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 15:20:47 +01:00
Robin Müller 27f29eda40
small error
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 15:16:12 +01:00
Robin Müller 50a62b9243
sth broke..
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 15:13:53 +01:00
Robin Müller da7c450e06
most temps should be valid now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 15:00:06 +01:00
Robin Müller a92fa31cb5
better variable names, tweaks for less init events
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 14:56:26 +01:00
Robin Müller d273621419
some tweaks
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 14:36:18 +01:00
Robin Müller 64ec76bfb7 Merge branch 'develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-15 14:14:56 +01:00
Robin Müller 69525b6fd1
bump fsfw
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-15 14:10:53 +01:00
Robin Müller c1d8eda2c7 Merge remote-tracking branch 'origin/develop' into thermal_controller 2023-03-15 14:10:36 +01:00
Robin Müller 8b11302028
unittest works again
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-14 20:35:49 +01:00
Robin Müller c1b4a1c164 Merge branch 'thermal_controller' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-14 20:04:03 +01:00
Robin Müller 58212d7081 Merge remote-tracking branch 'origin/develop' into thermal_controller 2023-03-14 20:04:00 +01:00
Robin Müller a6e6ee053d Merge branch 'develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-14 20:03:29 +01:00
Robin Müller e82777479b
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-14 18:50:28 +01:00
Robin Müller a51a680396
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-14 15:34:25 +01:00
Robin Müller d3bf70243b
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-14 14:25:35 +01:00
Robin Müller 4392598a67
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-14 14:16:59 +01:00
Robin Müller 26a9dce0a0
basic implementation for passive cooling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-13 17:36:41 +01:00
Robin Müller 9d1d62aee0
bump fsfw
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-13 16:02:24 +01:00
Robin Müller bf2d97bd60
continue thermal controller overheating
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-13 15:59:19 +01:00
Irini Kosmidou 721a01409e Merge branch 'thermal_controller' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details
2023-03-13 13:28:02 +01:00
Irini Kosmidou a0d6552781 . 2023-03-13 13:27:36 +01:00
Robin Müller c709b2a526 Merge branch 'develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-13 13:01:31 +01:00
Irini Kosmidou 5793d73ff6 printouts
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-13 12:53:40 +01:00
Irini Kosmidou c63b13fc40 overheating
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-09 16:53:48 +01:00
Irini Kosmidou 224a3af6f8 Merge remote-tracking branch 'origin/develop' into thermal_controller 2023-03-09 16:09:01 +01:00
Irini Kosmidou 131c508cae position heaterTransitionControl()
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-09 09:37:10 +01:00
Irini Kosmidou 7a62624687 changes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-08 15:56:05 +01:00
Irini Kosmidou 337717d271 Merge branch 'thermal_controller' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-08 14:35:04 +01:00
Robin Müller 9c77703ada Merge branch 'develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-03-05 16:19:59 +01:00
Irini Kosmidou 718d067b40 small 2023-03-05 13:27:42 +01:00
Irini Kosmidou 37b540fd48 switch
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
Transition
2023-03-05 13:05:32 +01:00
Robin Müller 88db78fed9
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-02-28 19:17:45 +01:00
Irini Kosmidou 5f3bd5c754 Merge branch 'thermal_controller' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-02-24 13:46:14 +01:00
Irini Kosmidou 63275df3f0 formal changes 2023-02-24 13:39:23 +01:00
Robin Müller d6f537da5f
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-02-23 15:58:10 +01:00
Irini Kosmidou 9a7779cffb struct heaterStates and more
EIVE/eive-obsw/pipeline/head This commit looks good Details
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details
2023-02-22 21:46:56 +01:00
Irini Kosmidou 0fa1bab94d comments
EIVE/eive-obsw/pipeline/head This commit looks good Details
2023-02-22 19:14:35 +01:00
Irini Kosmidou 29179bde0c merge conflicts
EIVE/eive-obsw/pipeline/head This commit looks good Details
2023-02-22 18:01:54 +01:00
Irini Kosmidou b9a6425078 dummy change
EIVE/eive-obsw/pipeline/head This commit looks good Details
2023-02-22 17:50:03 +01:00
Irini Kosmidou e13636167f limit for error events thermalcontroller + dummy beta
EIVE/eive-obsw/pipeline/head This commit looks good Details
2023-02-22 17:30:30 +01:00
Irini Kosmidou 9b849d10e9 small changes
EIVE/eive-obsw/pipeline/head This commit looks good Details
2023-02-21 17:49:55 +01:00
Irini Kosmidou 77b7433caf enum ThermalComponents
EIVE/eive-obsw/pipeline/head This commit looks good Details
2023-02-10 12:18:16 +01:00