From 16ebed63c24947bc521a45f795ea7ddddb64b376 Mon Sep 17 00:00:00 2001
From: BlackMark <me@blackmark.me>
Date: Mon, 13 Apr 2020 00:49:21 +0200
Subject: [PATCH] Change to stk500v2 compatible bootloader

---
 fantemp/adc             | 2 +-
 fantemp/bootloader.cpp  | 4 ++--
 fantemp/clock.hpp       | 2 +-
 fantemp/fantemp.cppproj | 4 ++++
 fantemp/terminal.hpp    | 2 +-
 fantemp/uart            | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/fantemp/adc b/fantemp/adc
index 7fe32b9..5e9dac8 160000
--- a/fantemp/adc
+++ b/fantemp/adc
@@ -1 +1 @@
-Subproject commit 7fe32b9717285aef6c264fb294f1d37f91075d1c
+Subproject commit 5e9dac872aac65a7dbcc300430efe1d95e7b15fc
diff --git a/fantemp/bootloader.cpp b/fantemp/bootloader.cpp
index b57b4c3..f34ad74 100644
--- a/fantemp/bootloader.cpp
+++ b/fantemp/bootloader.cpp
@@ -9,7 +9,7 @@ namespace {
 typedef void (*jmp_fn)() __attribute__((noreturn));
 
 jmp_fn boot = reinterpret_cast<jmp_fn>(0x0000);
-jmp_fn bootloader = reinterpret_cast<jmp_fn>(0x7E00 / 2);
+jmp_fn bootloader = reinterpret_cast<jmp_fn>(0x7800 / 2);
 
 } // namespace
 
@@ -31,7 +31,7 @@ void Bootloader::reset()
 
 bool Bootloader::check()
 {
-	if (pgm_read_byte(reinterpret_cast<uint16_t>(bootloader) * 2) == 0xF8)
+	if (pgm_read_byte(reinterpret_cast<uint16_t>(bootloader) * 2) != 0xFF)
 		return true;
 
 	return false;
diff --git a/fantemp/clock.hpp b/fantemp/clock.hpp
index fe832be..1667865 100644
--- a/fantemp/clock.hpp
+++ b/fantemp/clock.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#define F_CPU 16000000
+#define F_CPU 16'000'000
 #include <util/delay.h>
 
 #include <stdint.h>
diff --git a/fantemp/fantemp.cppproj b/fantemp/fantemp.cppproj
index a4d9ead..8df4960 100644
--- a/fantemp/fantemp.cppproj
+++ b/fantemp/fantemp.cppproj
@@ -81,6 +81,10 @@
       </ToolNumber>
       <ToolName>Custom Programming Tool</ToolName>
     </custom>
+    <AAFDebugger>
+      <AAFDebugFiles xmlns="">
+      </AAFDebugFiles>
+    </AAFDebugger>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <ToolchainSettings>
diff --git a/fantemp/terminal.hpp b/fantemp/terminal.hpp
index ab33938..f9ef939 100644
--- a/fantemp/terminal.hpp
+++ b/fantemp/terminal.hpp
@@ -26,7 +26,7 @@ GF(RESET_CMD, "reset");
 GF(HISTOGRAM_CMD, "histogram");
 
 GF(VERSION_CMD, "version");
-GF(VERSION, "1.6");
+GF(VERSION, "1.7");
 
 static inline bool substringEquals(const char *str, const ::detail::FlashString *flashStr, const size_t &size)
 {
diff --git a/fantemp/uart b/fantemp/uart
index ae03c8d..04b6782 160000
--- a/fantemp/uart
+++ b/fantemp/uart
@@ -1 +1 @@
-Subproject commit ae03c8d43e46dfbd396a052f71670727b293ac76
+Subproject commit 04b6782ec457fb22759a097892b863a3ec6eaab4