From 630b83bccd7ee077c48245ab3b3d8ce579ffd495 Mon Sep 17 00:00:00 2001
From: BlackMark <me@blackmark.me>
Date: Sat, 28 May 2022 15:44:59 +0200
Subject: [PATCH] Switch to software spi to avoid conflict with ICSP pins

---
 eink/eink         | 2 +-
 eink/eink.cppproj | 3 +++
 eink/io           | 2 +-
 eink/main.cpp     | 4 ++--
 eink/spi          | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/eink/eink b/eink/eink
index 4387655..9a4193e 160000
--- a/eink/eink
+++ b/eink/eink
@@ -1 +1 @@
-Subproject commit 438765511c8965357b20c3f46e092da5fd00aba1
+Subproject commit 9a4193ee75ca2e25ff8dc1de5fa1e14802725e04
diff --git a/eink/eink.cppproj b/eink/eink.cppproj
index 911c6ce..d84d846 100644
--- a/eink/eink.cppproj
+++ b/eink/eink.cppproj
@@ -236,6 +236,9 @@
     <Compile Include="spi\hardware.hpp">
       <SubType>compile</SubType>
     </Compile>
+    <Compile Include="spi\software.hpp">
+      <SubType>compile</SubType>
+    </Compile>
     <Compile Include="spi\spi.hpp">
       <SubType>compile</SubType>
     </Compile>
diff --git a/eink/io b/eink/io
index 80de36e..d89322b 160000
--- a/eink/io
+++ b/eink/io
@@ -1 +1 @@
-Subproject commit 80de36ee7ee3e6b0842d5eaee81d54062cb496b2
+Subproject commit d89322bdaae6c08bedc65209373e0a1fc5c9af05
diff --git a/eink/main.cpp b/eink/main.cpp
index dd29bc5..759087c 100644
--- a/eink/main.cpp
+++ b/eink/main.cpp
@@ -441,7 +441,7 @@ constexpr auto IMAGE [[gnu::progmem]] = util::to_array<uint8_t>({
 
 int main()
 {
-	using spi_t = spi::Hardware<spi::Config<>>;
+	using spi_t = spi::Software<spi::SoftwareConfig<io::P::C4, io::P::NONE, io::P::C5, io::P::C3>>;
 
 	uart_t serial;
 	serial.init();
@@ -450,7 +450,7 @@ int main()
 
 	serial << F("e-Paper demo") << F("\r\n");
 
-	auto einkDisplay = eink::Eink<200, 200, spi_t, io::P::C1, io::P::C0, io::P::C2>{};
+	auto einkDisplay = eink::Eink<200, 200, spi_t, io::P::C1, io::P::C2, io::P::C0>{};
 	einkDisplay.init();
 
 	serial << F("e-Paper init") << F("\r\n");
diff --git a/eink/spi b/eink/spi
index bb78d22..999cd0e 160000
--- a/eink/spi
+++ b/eink/spi
@@ -1 +1 @@
-Subproject commit bb78d2291d603647b19600eb3cc02dabce2f8ea5
+Subproject commit 999cd0e0c973834e641f7bbeb0c339d696b45415