Merge branch 'gpiod'

author dl1ycf <dl1ycf@darc.de>

Sat, 28 Aug 2021 09:24:01 +0000 (11:24 +0200)

committer dl1ycf <dl1ycf@darc.de>

Sat, 28 Aug 2021 09:24:01 +0000 (11:24 +0200)
author dl1ycf <dl1ycf@darc.de>
Sat, 28 Aug 2021 09:24:01 +0000 (11:24 +0200)
committer dl1ycf <dl1ycf@darc.de>
Sat, 28 Aug 2021 09:24:01 +0000 (11:24 +0200)
diff --cc Makefile
Simple merge
diff --cc old_protocol.c
Simple merge
author	dl1ycf <dl1ycf@darc.de>
	Sat, 28 Aug 2021 09:24:01 +0000 (11:24 +0200)
committer	dl1ycf <dl1ycf@darc.de>
	Sat, 28 Aug 2021 09:24:01 +0000 (11:24 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
old_protocol.c	patch \|	diff1 \|	diff2 \|	blob \| history