added massive comment in memory.h about how memory is laid out to work with the bootloader. more code cleanup

This commit is contained in:
2019-08-14 15:30:41 -04:00
parent 797f180a5c
commit 0d425faf6f
5 changed files with 99 additions and 25 deletions

View File

@@ -141,7 +141,7 @@
<property key="asmlist" value="true"/>
<property key="default-bitfield-type" value="true"/>
<property key="default-char-type" value="true"/>
<property key="define-macros" value="LINK_FOR_BOOTLOADER"/>
<property key="define-macros" value=""/>
<property key="disable-optimizations" value="true"/>
<property key="extra-include-directories"
value="..\src;..\..\common_src\framework\usb\inc;..\..\common_src"/>
@@ -172,7 +172,7 @@
</HI-TECH-COMP>
<HI-TECH-LINK>
<property key="additional-options-checksum" value=""/>
<property key="additional-options-code-offset" value="0x2000"/>
<property key="additional-options-code-offset" value="0x1400"/>
<property key="additional-options-command-line" value=""/>
<property key="additional-options-errata" value=""/>
<property key="additional-options-extend-address" value="false"/>
@@ -183,7 +183,7 @@
<property key="calibrate-oscillator-value" value="0x3400"/>
<property key="clear-bss" value="true"/>
<property key="code-model-external" value="wordwrite"/>
<property key="code-model-rom" value="default,-0-1FFF,-2006-2007,-2016-2017"/>
<property key="code-model-rom" value="default,-0-13FF,-1406-1407,-1416-1417"/>
<property key="create-html-files" value="false"/>
<property key="data-model-ram" value=""/>
<property key="data-model-size-of-double" value="32"/>
@@ -275,7 +275,7 @@
<conf name="standalone" type="2">
<toolsSet>
<developmentServer>localhost</developmentServer>
<targetDevice>PIC18F2550</targetDevice>
<targetDevice>PIC18F4550</targetDevice>
<targetHeader></targetHeader>
<targetPluginBoard></targetPluginBoard>
<platformTool>PICkit3PlatformTool</platformTool>
@@ -294,9 +294,10 @@
<archiverTool>
</archiverTool>
<loading>
<loadableFile>../../bootloader/clubdance_v2_bootloader.X/dist/default/production/clubdance_v2_bootloader.X.production.hex</loadableFile>
<useAlternateLoadableFile>false</useAlternateLoadableFile>
<parseOnProdLoad>false</parseOnProdLoad>
<alternateLoadableFile></alternateLoadableFile>
<alternateLoadableFile>../../bootloader/clubdance_v2_bootloader.X/dist/default/production/clubdance_v2_bootloader.X.production.hex</alternateLoadableFile>
</loading>
<subordinates>
</subordinates>
@@ -318,7 +319,7 @@
<property key="define-macros" value=""/>
<property key="disable-optimizations" value="true"/>
<property key="extra-include-directories"
value="..\src;..\..\common_src\framework\usb\inc"/>
value="..\src;..\..\common_src\framework\usb\inc;..\..\common_src"/>
<property key="favor-optimization-for" value="-speed,+space"/>
<property key="garbage-collect-data" value="true"/>
<property key="garbage-collect-functions" value="true"/>
@@ -337,7 +338,7 @@
<property key="pack-struct" value="true"/>
<property key="preprocess-assembler" value="true"/>
<property key="short-enums" value="true"/>
<property key="undefine-macros" value="LINK_FOR_BOOTLOADER"/>
<property key="undefine-macros" value=""/>
<property key="use-cci" value="false"/>
<property key="use-iar" value="false"/>
<property key="verbose" value="false"/>
@@ -346,7 +347,7 @@
</HI-TECH-COMP>
<HI-TECH-LINK>
<property key="additional-options-checksum" value=""/>
<property key="additional-options-code-offset" value=""/>
<property key="additional-options-code-offset" value="1400"/>
<property key="additional-options-command-line" value=""/>
<property key="additional-options-errata" value=""/>
<property key="additional-options-extend-address" value="false"/>
@@ -357,7 +358,7 @@
<property key="calibrate-oscillator-value" value="0x3400"/>
<property key="clear-bss" value="true"/>
<property key="code-model-external" value="wordwrite"/>
<property key="code-model-rom" value=""/>
<property key="code-model-rom" value="default,-0-13FF,-1406-1407,-1416-1417"/>
<property key="create-html-files" value="false"/>
<property key="data-model-ram" value=""/>
<property key="data-model-size-of-double" value="32"/>

View File

@@ -31,7 +31,7 @@
#ifdef LINK_FOR_BOOTLOADER
// only define this if building fw to be used with the bootloader
const uint16_t VersionWord __at(0x2016) = 0x0100;
const uint16_t VersionWord __at(APP_FW_VERSION_ADDRESS) = 0x0100;
#endif
void main(void)