avr/fantemp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change to stk500v2 compatible bootloader

Browse Source
This commit is contained in:
BlackMark 2020-04-13 00:49:21 +02:00
parent eee2e6172a
commit 16ebed63c2
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fantemp/adc

@ -1 +1 @@
Subproject commit 7fe32b9717285aef6c264fb294f1d37f91075d1c Subproject commit 5e9dac872aac65a7dbcc300430efe1d95e7b15fc

4
fantemp/bootloader.cpp
View File

@ -9,7 +9,7 @@ namespace {
typedef void (*jmp_fn)() __attribute__((noreturn)); typedef void (*jmp_fn)() __attribute__((noreturn));
jmp_fn boot = reinterpret_cast<jmp_fn>(0x0000); 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 } // namespace
@ -31,7 +31,7 @@ void Bootloader::reset()
bool Bootloader::check() 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 true;
return false; return false;

2
fantemp/clock.hpp
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#define F_CPU 16000000 #define F_CPU 16'000'000
#include <util/delay.h> #include <util/delay.h>
#include <stdint.h> #include <stdint.h>

4
fantemp/fantemp.cppproj
View File

@ -81,6 +81,10 @@
</ToolNumber> </ToolNumber>
<ToolName>Custom Programming Tool</ToolName> <ToolName>Custom Programming Tool</ToolName>
</custom> </custom>
<AAFDebugger>
<AAFDebugFiles xmlns="">
</AAFDebugFiles>
</AAFDebugger>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<ToolchainSettings> <ToolchainSettings>

2
fantemp/terminal.hpp
View File

@ -26,7 +26,7 @@ GF(RESET_CMD, "reset");
GF(HISTOGRAM_CMD, "histogram"); GF(HISTOGRAM_CMD, "histogram");
GF(VERSION_CMD, "version"); 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) static inline bool substringEquals(const char *str, const ::detail::FlashString *flashStr, const size_t &size)
{ {

2
fantemp/uart

@ -1 +1 @@
Subproject commit ae03c8d43e46dfbd396a052f71670727b293ac76 Subproject commit 04b6782ec457fb22759a097892b863a3ec6eaab4