3125 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	5c91697cf1	removed accidental typed stuff	2022-05-26 12:09:01 +02:00
Robin Mueller	9f42ac9875	Merge branch 'mueller/scex-additions' into irini	2022-05-26 12:08:18 +02:00
Robin Mueller	a1faa3a73c	Merge remote-tracking branch 'origin/develop' into irini	2022-05-26 12:08:07 +02:00
Robin Mueller	1276cc2dc6	scex additions	2022-05-26 12:04:27 +02:00
Robin Mueller	97db44e500	fix raspberry pi build	2022-05-26 11:46:28 +02:00
Robin Mueller	e5459bb1f7	re-run generators	2022-05-25 18:15:44 +02:00
Robin Mueller	335d3ba3b0	bump submodules	2022-05-25 15:45:11 +02:00
Jakob.Meier	f50682b56a	Merge pull request 'Split ACU HK' (#256) from mueller/split-acu-hk into develop ... Reviewed-on: #256 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 15:23:19 +02:00
Jakob.Meier	ad679a810e	Merge pull request 'add and schedule PUS11' (#259) from mueller/add-schedule-pus-11 into develop ... Reviewed-on: #259 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 15:21:25 +02:00
Jakob.Meier	686ec4bffa	Merge pull request 'GPS Reset Pin Handling Update' (#261) from mueller/gps-reset-pin-update into develop ... Reviewed-on: #261 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 15:20:12 +02:00
Robin Mueller	ae434853aa	bump number stored packets	2022-05-25 13:14:36 +02:00
Robin Mueller	bb1e1d80cc	resolve merge conflict	2022-05-25 11:00:18 +02:00
Robin Mueller	01bac87afb	update reset pin handling	2022-05-25 10:59:20 +02:00
Irini Kosmidou	44d36587aa	precised printouts	2022-05-25 10:51:22 +02:00
Robin Müller	ffdd6bbc3c	Merge branch 'develop' into mueller/add-schedule-pus-11	2022-05-25 10:27:36 +02:00
Robin Müller	d870f5ab10	Merge pull request 'Core Controller Remount SD Handling' (#253) from mueller/core-controller-remount-sd-handling into develop ... Reviewed-on: #253 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 10:27:10 +02:00
Robin Mueller	0b3fd65c9a	Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11	2022-05-25 10:16:31 +02:00
Robin Mueller	0ac38e8490	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-25 10:16:14 +02:00
Robin Mueller	d79177e544	Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling	2022-05-25 10:15:48 +02:00
Robin Müller	addcb2b21f	Merge pull request 'IMTQ improvements' (#260) from meier/imtq into develop ... Reviewed-on: #260 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-05-25 10:15:13 +02:00
Robin Mueller	7646b683b2	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-25 09:59:14 +02:00
Robin Mueller	3eca96fef5	Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling	2022-05-25 09:58:06 +02:00
Robin Mueller	43fc1ab780	Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11	2022-05-25 09:57:34 +02:00
Robin Mueller	2bf044422f	Merge remote-tracking branch 'origin/develop' into meier/imtq	2022-05-25 09:56:41 +02:00
Jakob.Meier	7f180ebc45	Merge pull request 'Reboot Command' (#242) from mueller/reboot-cmd into develop ... Reviewed-on: #242 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-24 19:11:07 +02:00
Jakob Meier	1ccd12e2e1	enable hk in imtq	2022-05-24 19:08:00 +02:00
Irini Kosmidou	2f4d44433d	scexDeviceHandler::interpretDeviceReply	2022-05-24 18:38:34 +02:00
Robin Mueller	88faf8f87d	bump fsfw	2022-05-24 16:23:00 +02:00
Robin Mueller	c0da8aef2e	delete obsolete folder	2022-05-24 15:50:39 +02:00
Robin Mueller	59d0d880bb	bump fsfw	2022-05-24 15:45:12 +02:00
Robin Mueller	3eb8525419	update changelog	2022-05-24 15:22:45 +02:00
Robin Mueller	3fff3ba21e	add and schedule PUS11	2022-05-24 15:21:37 +02:00
Robin Mueller	3e9b337e31	changelog	2022-05-24 01:14:47 +02:00
Robin Mueller	633fe00cd6	run afmt, minor improvements	2022-05-24 01:14:04 +02:00
Robin Mueller	23d7b8f2fb	repoint tmtc	2022-05-24 00:55:17 +02:00
Robin Mueller	d088d728b1	Merge branch 'mueller/reboot-cmd' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/reboot-cmd	2022-05-24 00:54:55 +02:00
Robin Müller	237dd00216	Merge branch 'develop' into mueller/reboot-cmd	2022-05-24 00:54:49 +02:00
Robin Mueller	f7075a1397	Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd	2022-05-24 00:54:39 +02:00
Robin Mueller	2ebdb5c797	tweak sd card check countdown	2022-05-24 00:53:29 +02:00
Robin Mueller	1519b13b78	appears to work now	2022-05-24 00:52:08 +02:00
Robin Mueller	b2c286cd7e	improve and optimize SD card handling	2022-05-24 00:20:23 +02:00
Robin Mueller	a1d2ec3db4	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-23 22:24:28 +02:00
Robin Müller	b66a91da2e	Merge branch 'develop' into mueller/core-controller-remount-sd-handling	2022-05-23 21:32:27 +02:00
Jakob.Meier	72305cc4c2	Merge pull request 'rtd bugfixes' (#258) from mueller/rtd-bugfixes into develop ... Reviewed-on: #258 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-23 19:36:13 +02:00
Robin Mueller	f111001572	bump tmtc	2022-05-23 18:59:31 +02:00
Robin Mueller	5df905182c	these brackets are less confusing	2022-05-23 18:40:17 +02:00
Robin Mueller	2f155d8350	bump changelog	2022-05-23 18:39:13 +02:00
Robin Müller	e9908139e7	Merge branch 'develop' into mueller/core-controller-remount-sd-handling	2022-05-23 18:37:50 +02:00
Robin Müller	43269d4add	Merge branch 'develop' into mueller/rtd-bugfixes	2022-05-23 18:37:40 +02:00
Robin Mueller	40b02aa46b	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-23 18:37:28 +02:00