6306 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	103800e40c	oopsie	2023-04-06 19:26:57 +02:00
Robin Mueller	aa78d744b4	compile fix	2023-04-06 19:23:45 +02:00
Robin Mueller	54c29e893d	Merge branch 'feature_i2c_reboot_procedure' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into feature_i2c_reboot_procedure	2023-04-06 19:20:59 +02:00
Robin Mueller	b9d0e4bdd9	Merge remote-tracking branch 'origin/develop' into feature_i2c_reboot_procedure	2023-04-06 19:20:54 +02:00
Robin Müller	cdcadf3c18	Merge branch 'develop' into feature_i2c_reboot_procedure	2023-04-06 19:18:47 +02:00
Robin Müller	a8d19b0ff9	Merge pull request 'bugfix RW asyy' (#579) from bugfix_rw_assy into develop ... Reviewed-on: #579	2023-04-06 19:12:22 +02:00
Robin Mueller	5bdb7414bf	changelog	2023-04-06 19:12:15 +02:00
Robin Mueller	77b8c6eb3e	bugfix RW asyy	2023-04-06 19:11:26 +02:00
Robin Mueller	db669c44f6	Merge branch 'feature_i2c_reboot_procedure' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into feature_i2c_reboot_procedure	2023-04-06 18:07:03 +02:00
Robin Mueller	bfb91f1baa	fix for FM build	2023-04-06 18:06:56 +02:00
Robin Müller	3c33d01089	Merge branch 'develop' into feature_i2c_reboot_procedure	2023-04-06 17:56:14 +02:00
Robin Müller	bd8389e0c9	Merge pull request 'log store delay' (#577) from tm_log_store_delay into develop ... Reviewed-on: #577	2023-04-06 17:50:25 +02:00
Robin Mueller	58aef99bbc	theoretically done	2023-04-06 17:49:34 +02:00
Robin Mueller	9020014245	added some more safety features	2023-04-06 17:01:28 +02:00
Robin Mueller	e523c2fe25	log store delay	2023-04-06 16:51:03 +02:00
Robin Mueller	3bd434bbc3	I2C reboot procedure for EIVE system	2023-04-06 16:50:33 +02:00
Robin Müller	d8ec121131	Merge pull request 'preparing v1.43.2' (#575) from prep_v1.43.2 into develop ... Reviewed-on: #575	2023-04-05 18:21:11 +02:00
Robin Mueller	3e54bc9c3f	preparing v1.43.2	2023-04-05 17:29:09 +02:00
Marius Eggert	4ca45f348c	Merge pull request 'Bug' (#574) from bugfix_syrlinks into develop ... Reviewed-on: #574 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-04-05 17:15:17 +02:00
Robin Müller	34a0288987	Merge branch 'develop' into bugfix_syrlinks	2023-04-05 17:13:20 +02:00
Robin Mueller	f031c46cb5	ACS Board assy	2023-04-05 17:10:50 +02:00
Marius Eggert	dbf627cc12	Merge pull request 'Assembly and FDIR updates' (#572) from bugfix_syrlinks into develop ... Reviewed-on: #572 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-04-05 17:02:50 +02:00
Robin Mueller	b06db0a0fc	Merge branch 'bugfix_syrlinks' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into bugfix_syrlinks	2023-04-05 16:58:40 +02:00
Robin Mueller	0a68b50ad7	copy and paste fix	2023-04-05 16:58:32 +02:00
Robin Müller	b11ed219a2	Merge branch 'develop' into bugfix_syrlinks	2023-04-05 16:47:53 +02:00
Robin Müller	67082a6559	Merge pull request 'No more RW commands during Safe Mode' (#573) from acs-safe-no-rw-cmd into develop ... Reviewed-on: #573 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-04-05 16:47:19 +02:00
Robin Mueller	36d5f8fd31	changelog, updates	2023-04-05 16:41:49 +02:00
meggert	cdba7985ea	Merge branch 'develop' into acs-safe-no-rw-cmd	2023-04-05 16:26:31 +02:00
meggert	38b7593900	changelog	2023-04-05 16:23:29 +02:00
meggert	78cc0fc52d	set commanded speed to 0 during off transition	2023-04-05 16:21:38 +02:00
meggert	4ed112d019	safe mode controller no longer commands RWs	2023-04-05 16:21:10 +02:00
Robin Mueller	7549a24f6f	same adaption for IMTQ	2023-04-05 16:19:53 +02:00
Robin Müller	d53fdf9078	Merge branch 'develop' into bugfix_syrlinks	2023-04-05 16:09:19 +02:00
Robin Müller	67988dad64	Merge pull request 'str assembly mode checks' (#571) from syrlinks_assy_mode_checks into develop ... Reviewed-on: #571 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-04-05 16:08:16 +02:00
Robin Mueller	56c5838d15	str assembly include mode off	2023-04-05 16:06:59 +02:00
Robin Mueller	2950876ce4	syrlinks ASSY	2023-04-05 16:05:05 +02:00
Robin Müller	a875bf55b8	Merge branch 'develop' into syrlinks_assy_mode_checks	2023-04-05 15:31:12 +02:00
Robin Müller	a28ba4ec66	Merge pull request 'SUS Assembly bug' (#569) from bugfix_sus_assy into develop ... Reviewed-on: #569	2023-04-05 15:30:12 +02:00
Robin Mueller	c65b402361	changelog	2023-04-05 15:29:44 +02:00
Robin Mueller	f5e47c6114	some more mode checks	2023-04-05 15:29:03 +02:00
Robin Mueller	600921e3a0	some code fixes	2023-04-05 15:11:37 +02:00
Robin Mueller	3c38410643	some more tweaks	2023-04-05 15:08:07 +02:00
Robin Mueller	2e0a685507	overwrite health corrections	2023-04-05 15:06:41 +02:00
Robin Mueller	0ade2ae0ee	str assembly mode checks	2023-04-05 15:05:32 +02:00
Robin Mueller	b050047d9a	special handling for sus groups	2023-04-05 14:50:33 +02:00
Robin Mueller	65c231e92d	that was a lot of printouts	2023-04-05 14:46:45 +02:00
Robin Mueller	5e93282662	seems to work now, but the whole printout crap needs to be removed	2023-04-05 14:41:34 +02:00
Robin Mueller	0cabe3a9ea	Merge remote-tracking branch 'origin/develop' into bugfix_sus_assy	2023-04-05 10:29:38 +02:00
Robin Mueller	845548ed25	maybe that fixes the issues	2023-04-05 10:27:19 +02:00
Marius Eggert	858c6c301e	Merge pull request 'whoops' (#570) from fix into develop ... Reviewed-on: #570	2023-04-05 09:55:20 +02:00