7944 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Müller	bd60246f9a	Merge pull request 'Update Internal Resistance' (#817) from update-internal-resistance into main ... Reviewed-on: #817 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-10-30 10:32:04 +01:00
meggert	a2090448ff	changelog	2023-10-30 08:52:18 +01:00
eggertm	ad6fa66daf	update internal resistance	2023-10-27 15:37:45 +02:00
Robin Müller	49b2bef8f4	Merge pull request 'PL PCDU JSON update' (#812) from plpcdu-json-file-update into main ... Reviewed-on: #812	2023-10-27 14:17:06 +02:00
Robin Müller	0c778b66f9	Merge pull request 'Reduce SUS FDIR Events' (#806) from sus-fdir-reduce-events into main ... Reviewed-on: #806 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-10-27 14:16:46 +02:00
Robin Mueller	68763e327b	Merge remote-tracking branch 'origin/main' into plpcdu-json-file-update	2023-10-27 14:05:45 +02:00
Robin Müller	3c55a07404	Merge branch 'main' into sus-fdir-reduce-events	2023-10-27 14:05:05 +02:00
Robin Müller	2e7a1c1cb5	Merge pull request 'Swap RTD9 and RTD11 chip selects' (#814) from swap-rtd-9-and-11 into main ... Reviewed-on: #814 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-10-27 14:00:14 +02:00
Robin Müller	febb36f0eb	Merge branch 'main' into swap-rtd-9-and-11	2023-10-27 13:50:28 +02:00
Robin Müller	1ba1946728	Merge pull request 'STR extensions' (#798) from str-extensions into main ... Reviewed-on: #798 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-10-27 13:50:12 +02:00
Robin Mueller	d2b5384f05	make marius happy	2023-10-27 12:54:32 +02:00
Robin Mueller	5a67ce56aa	changelog	2023-10-27 12:43:32 +02:00
Robin Müller	65bb860fb2	Merge branch 'main' into sus-fdir-reduce-events	2023-10-27 12:39:39 +02:00
Robin Mueller	6459a945ea	Merge remote-tracking branch 'origin/main' into plpcdu-json-file-update	2023-10-27 12:35:55 +02:00
Robin Mueller	b30c85866f	Merge remote-tracking branch 'origin/main' into swap-rtd-9-and-11	2023-10-27 12:34:52 +02:00
Robin Mueller	a877edf40b	bump tmtc	2023-10-27 12:34:33 +02:00
Robin Mueller	656c69f858	bump tmtc	2023-10-27 12:32:59 +02:00
Robin Mueller	db582febb7	Merge remote-tracking branch 'origin/main' into str-extensions	2023-10-27 12:32:49 +02:00
Robin Müller	c48f0678f1	Merge pull request 'Added CFDP fault handler events' (#809) from cfdp-fault-handler-event into main ... Reviewed-on: #809 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-10-27 12:32:17 +02:00
Robin Mueller	dcdceba07e	wrapping up	2023-10-27 12:17:54 +02:00
Robin Mueller	f8eb4fdd6f	add contrast set	2023-10-27 11:24:51 +02:00
Robin Mueller	964d47b909	bugfix for reset function	2023-10-27 09:59:15 +02:00
meggert	35e7fba576	smoll fix	2023-10-27 09:50:40 +02:00
meggert	44d9541e52	Merge branch 'main' into sus-fdir-reduce-events	2023-10-27 09:41:50 +02:00
Robin Mueller	0beac793a1	some more important bugfixes	2023-10-26 20:45:36 +02:00
Robin Mueller	1c7545bffa	fix	2023-10-26 19:59:16 +02:00
Robin Mueller	599ff256ff	Merge remote-tracking branch 'origin/main' into str-extensions	2023-10-26 19:18:28 +02:00
Robin Mueller	be9d00be04	Merge remote-tracking branch 'origin/main' into cfdp-fault-handler-event	2023-10-26 13:46:11 +02:00
Robin Mueller	c06cd710cf	Merge remote-tracking branch 'origin/main' into swap-rtd-9-and-11	2023-10-26 13:45:10 +02:00
meggert	54c2fc9646	validity handling	2023-10-26 09:52:25 +02:00
Marius Eggert	1e284463ac	Merge pull request 'State of Charge FDIR improvements' (#810) from eive-system-fdir into main ... Reviewed-on: #810 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-10-26 09:36:47 +02:00
Robin Mueller	7c765d037b	compile fix	2023-10-25 18:17:51 +02:00
Robin Mueller	ef2e62e418	changelog clarification	2023-10-25 17:51:41 +02:00
Robin Mueller	b7e33ebcb6	changelog	2023-10-25 17:49:31 +02:00
Robin Mueller	93e3f3578d	swap RTDs	2023-10-25 17:48:28 +02:00
Robin Mueller	70747e1864	bump PL PCDU handler	2023-10-23 17:28:20 +02:00
Robin Mueller	c67a9fa2c2	this might be a bugfix	2023-10-23 17:10:37 +02:00
Robin Mueller	3e5fae4458	Merge remote-tracking branch 'origin/main' into str-extensions	2023-10-23 13:53:01 +02:00
meggert	feb6459878	might wanna push this	2023-10-19 14:54:12 +02:00
Robin Mueller	1f203e9f76	improvements for SoC FDIR	2023-10-19 14:20:40 +02:00
Robin Mueller	f4abb3fed6	instructions unclear, wrote a whole state machine	2023-10-19 13:42:54 +02:00
Robin Mueller	3d04fb05ee	updated obj ID	2023-10-19 11:29:52 +02:00
Robin Mueller	7906274204	obj ID fix	2023-10-19 11:29:23 +02:00
Robin Mueller	0854ec878b	added CFDP fault handler events	2023-10-19 11:27:21 +02:00
Robin Müller	4ee84c0a78	Merge pull request 'CFDP source handler' (#776) from cfdp-source-handler into main ... Reviewed-on: #776 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-10-19 11:11:29 +02:00
Robin Mueller	fc626a2ad6	bump fsfw	2023-10-19 11:05:07 +02:00
meggert	4295b6b987	Merge branch 'main' into str-extensions	2023-10-19 09:37:26 +02:00
meggert	440375e64b	add cmd	2023-10-19 09:37:01 +02:00
meggert	58d9678613	woops	2023-10-19 09:32:21 +02:00
meggert	12909cb3b9	now for the fun part	2023-10-19 09:26:28 +02:00