2002 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marius Eggert	4b054b7628	Merge pull request 'new scex event' (#225) from scex-event into main ... Reviewed-on: #225 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-08-02 09:46:09 +02:00
Robin Mueller	9001a28545	new scex event	2023-08-02 09:41:19 +02:00
Marius Eggert	6b2fbc6917	Merge pull request 'SCEX code improvements' (#224) from scex-code-improvements into main ... Reviewed-on: #224 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-27 11:21:38 +02:00
Robin Mueller	ab770a0057	Merge remote-tracking branch 'origin/main' into scex-code-improvements	2023-07-27 09:59:49 +02:00
Robin Mueller	0cbf28f25c	scex code improvenemtns	2023-07-27 09:59:34 +02:00
Marius Eggert	cbcc06ede7	Merge pull request 'ACS downwards compatibility' (#223) from acs-downwards-compat into main ... Reviewed-on: #223 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-26 13:17:35 +02:00
Robin Mueller	a55aa4a667	added comments	2023-07-26 13:15:08 +02:00
Robin Mueller	d2324dace9	changelog and init	2023-07-26 13:13:41 +02:00
Robin Mueller	1e4e524f95	update CTRL STATE enum and make it global	2023-07-26 13:12:12 +02:00
Robin Müller	39d6ec73c2	Merge pull request 'prep v5.3.0' (#222) from prep-v5.3.0 into main ... Reviewed-on: #222	2023-07-26 12:56:18 +02:00
Robin Mueller	74cfa2949a	flake8 and black	2023-07-26 12:54:13 +02:00
Robin Mueller	ffdb4451f6	prep v5.3.0	2023-07-26 12:51:56 +02:00
Robin Müller	15716c988b	Merge pull request 'new safe mode' (#221) from new-safe into main ... Reviewed-on: #221 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-07-26 09:51:26 +02:00
meggert	f5ec50b674	guess i added PTG strats in june ...	2023-07-24 09:47:52 +02:00
meggert	02b70ee203	Merge branch 'main' into new-safe	2023-07-24 09:25:22 +02:00
Robin Müller	95b6954175	Merge pull request 'new event' (#220) from active-sd-info-event into main ... Reviewed-on: #220 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-21 11:49:59 +02:00
Robin Mueller	a82cbff5a8	works well	2023-07-21 11:47:37 +02:00
Robin Mueller	87b766dfb8	active SD info	2023-07-21 11:36:01 +02:00
meggert	09b7a01ff6	init	2023-07-21 11:20:20 +02:00
Robin Mueller	fd6b76bfdd	update events.csv	2023-07-21 11:04:32 +02:00
Robin Mueller	40c086086b	new event	2023-07-21 10:26:37 +02:00
Marius Eggert	83e8fe0587	Merge pull request 'TMTC improvements' (#219) from tmtc-improvements into main ... Reviewed-on: #219 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-19 14:46:51 +02:00
Robin Mueller	6cffae4397	the name is okay..	2023-07-19 14:42:02 +02:00
Robin Mueller	d73ef3a314	better name for HK module	2023-07-19 14:41:19 +02:00
Marius Eggert	0b8bd61e80	Merge pull request 'Update STR Commands' (#218) from update-str-cmds into main ... Reviewed-on: #218 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-14 12:24:50 +02:00
Robin Mueller	380a02ee94	add new STR COM error event	2023-07-13 21:09:14 +02:00
Robin Müller	c6e2e2de49	Merge branch 'main' into update-str-cmds	2023-07-13 18:28:15 +02:00
Marius Eggert	6479aeda63	Merge pull request 'STR: time conversion bugfix' (#217) from str-time-conversion-fix into main ... Reviewed-on: #217 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-13 14:59:58 +02:00
Robin Mueller	26cf112121	Merge branch 'str-time-conversion-fix' into update-str-cmds	2023-07-13 14:59:03 +02:00
Robin Mueller	62bd535622	time conversion bugfix	2023-07-13 14:49:03 +02:00
Robin Müller	eea7683581	Merge pull request 'prep v5.2.0' (#216) from prep_v5.2.0 into main ... Reviewed-on: #216	2023-07-13 11:55:26 +02:00
Robin Mueller	df6aa80169	changelog	2023-07-13 11:47:47 +02:00
Robin Mueller	2fd1a46e66	bump tmtccmd to v5.0.0	2023-07-13 11:46:38 +02:00
Robin Mueller	2153aa2842	prep v5.2.0	2023-07-13 11:30:43 +02:00
Robin Mueller	1f2f2aac13	update STR commands	2023-07-13 10:53:42 +02:00
Marius Eggert	9be81f1725	Merge pull request 'max burn time event' (#213) from tcs-heater-upper-limit into main ... Reviewed-on: #213 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-11 10:15:55 +02:00
Robin Müller	601adfc9c2	Merge branch 'main' into tcs-heater-upper-limit	2023-07-11 09:45:37 +02:00
Marius Eggert	ac84ac2c3e	Merge pull request 'TCS CTRL Info Set' (#215) from tcs-ctrl-info-set into main ... Reviewed-on: #215 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-11 09:31:49 +02:00
Marius Eggert	7ed18bd570	Merge pull request 'HK level is a CLI argument now' (#214) from hk-level-as-cli-arg into main ... Reviewed-on: #214 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-11 09:21:39 +02:00
Robin Mueller	e27ad147d4	done	2023-07-10 18:29:24 +02:00
Robin Mueller	ba47757b50	added way to request new HK set	2023-07-10 16:29:54 +02:00
Robin Mueller	7e9c626ec8	add command demultiplexing for tcs ctrl	2023-07-10 16:25:44 +02:00
Robin Mueller	8d6dd97d85	Merge branch 'hk-level-as-cli-arg' into tcs-ctrl-info-set	2023-07-10 16:11:18 +02:00
Robin Mueller	2fae5613ce	fix	2023-07-10 16:09:42 +02:00
Robin Mueller	fdb14cbdc5	HK level is a CLI argument now	2023-07-10 16:07:01 +02:00
Robin Mueller	0cef3fa924	and now it works	2023-07-10 16:04:36 +02:00
Robin Mueller	37a35c4446	cli argument	2023-07-10 16:03:08 +02:00
Robin Mueller	15d25b4c5b	max burn time event	2023-07-07 12:06:27 +02:00
Robin Müller	069f84d220	Merge pull request 'Add TCS CTRL heater events' (#212) from add-tcs-ctrl-heater-events into main ... Reviewed-on: #212	2023-07-07 10:53:32 +02:00
Robin Müller	627a16d51a	Merge branch 'main' into add-tcs-ctrl-heater-events	2023-07-06 19:03:27 +02:00