diff --git a/latest/Firmware/Transponder/.cproject b/latest/Firmware/Transponder/.cproject
index c4d25d9..6c42df1 100644
--- a/latest/Firmware/Transponder/.cproject
+++ b/latest/Firmware/Transponder/.cproject
@@ -14,7 +14,7 @@
-
+
@@ -188,7 +188,7 @@
-
+
@@ -538,7 +538,7 @@
-
+
@@ -701,6 +701,362 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/latest/Firmware/Transponder/.gitignore b/latest/Firmware/Transponder/.gitignore
index 463f615..0944256 100644
--- a/latest/Firmware/Transponder/.gitignore
+++ b/latest/Firmware/Transponder/.gitignore
@@ -23,3 +23,4 @@ Debug
/L422-NewBreakouts/
/L432-LegacyBreakouts/
/L432-NewBreakouts/
+/L422-NewBreakouts-Bootloader/
diff --git a/latest/Firmware/Transponder/Inc/Configuration.hpp b/latest/Firmware/Transponder/Inc/Configuration.hpp
index e0577a8..a701fa1 100644
--- a/latest/Firmware/Transponder/Inc/Configuration.hpp
+++ b/latest/Firmware/Transponder/Inc/Configuration.hpp
@@ -63,6 +63,7 @@ private:
const char *serNum();
const char *mcuType();
const char *breakoutType();
+ bool isBootloaderPresent();
private:
ConfigFlags mFlags = {0};
};
diff --git a/latest/Firmware/Transponder/STM32L4xx_FLASH-Bootloader.ld b/latest/Firmware/Transponder/STM32L4xx_FLASH-Bootloader.ld
new file mode 100644
index 0000000..81e2bbf
--- /dev/null
+++ b/latest/Firmware/Transponder/STM32L4xx_FLASH-Bootloader.ld
@@ -0,0 +1,202 @@
+/*
+******************************************************************************
+**
+
+** File : LinkerScript.ld
+**
+** Author : Auto-generated by System Workbench for STM32
+**
+** Abstract : Linker script for STM32L412KBUx series
+** 128Kbytes FLASH and 40Kbytes RAM
+**
+** Set heap size, stack size and stack location according
+** to application requirements.
+**
+** Set memory bank area and size if external memory is used.
+**
+** Target : STMicroelectronics STM32
+**
+** Distribution: The file is distributed “as is,” without any warranty
+** of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** © COPYRIGHT(c) 2019 STMicroelectronics
+**
+** Redistribution and use in source and binary forms, with or without modification,
+** are permitted provided that the following conditions are met:
+** 1. Redistributions of source code must retain the above copyright notice,
+** this list of conditions and the following disclaimer.
+** 2. Redistributions in binary form must reproduce the above copyright notice,
+** this list of conditions and the following disclaimer in the documentation
+** and/or other materials provided with the distribution.
+** 3. Neither the name of STMicroelectronics nor the names of its contributors
+** may be used to endorse or promote products derived from this software
+** without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x2000A000; /* end of RAM */
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x400; /* required amount of heap */
+_Min_Stack_Size = 0x400; /* required amount of stack */
+
+/* Specify the memory areas */
+MEMORY
+{
+RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 39K
+FLASH (rx) : ORIGIN = 0x8004800, LENGTH = 110K
+}
+
+/* Define output sections */
+SECTIONS
+{
+ /* The startup code goes first into FLASH */
+ .isr_vector :
+ {
+ . = ALIGN(8);
+ KEEP(*(.isr_vector)) /* Startup code */
+ . = ALIGN(8);
+ } >FLASH
+
+ /* The program code and other data goes into FLASH */
+ .text :
+ {
+ . = ALIGN(8);
+ *(.text) /* .text sections (code) */
+ *(.text*) /* .text* sections (code) */
+ *(.glue_7) /* glue arm to thumb code */
+ *(.glue_7t) /* glue thumb to arm code */
+ *(.eh_frame)
+
+ KEEP (*(.init))
+ KEEP (*(.fini))
+
+ . = ALIGN(8);
+ _etext = .; /* define a global symbols at end of code */
+ } >FLASH
+
+ /* Constant data goes into FLASH */
+ .rodata :
+ {
+ . = ALIGN(8);
+ *(.rodata) /* .rodata sections (constants, strings, etc.) */
+ *(.rodata*) /* .rodata* sections (constants, strings, etc.) */
+ . = ALIGN(8);
+ } >FLASH
+
+ .ARM.extab :
+ {
+ . = ALIGN(8);
+ *(.ARM.extab* .gnu.linkonce.armextab.*)
+ . = ALIGN(8);
+ } >FLASH
+ .ARM : {
+ . = ALIGN(8);
+ __exidx_start = .;
+ *(.ARM.exidx*)
+ __exidx_end = .;
+ . = ALIGN(8);
+ } >FLASH
+
+ .preinit_array :
+ {
+ . = ALIGN(8);
+ PROVIDE_HIDDEN (__preinit_array_start = .);
+ KEEP (*(.preinit_array*))
+ PROVIDE_HIDDEN (__preinit_array_end = .);
+ . = ALIGN(8);
+ } >FLASH
+
+ .init_array :
+ {
+ . = ALIGN(8);
+ PROVIDE_HIDDEN (__init_array_start = .);
+ KEEP (*(SORT(.init_array.*)))
+ KEEP (*(.init_array*))
+ PROVIDE_HIDDEN (__init_array_end = .);
+ . = ALIGN(8);
+ } >FLASH
+ .fini_array :
+ {
+ . = ALIGN(8);
+ PROVIDE_HIDDEN (__fini_array_start = .);
+ KEEP (*(SORT(.fini_array.*)))
+ KEEP (*(.fini_array*))
+ PROVIDE_HIDDEN (__fini_array_end = .);
+ . = ALIGN(8);
+ } >FLASH
+
+ /* used by the startup to initialize data */
+ _sidata = LOADADDR(.data);
+
+ /* Initialized data sections goes into RAM, load LMA copy after code */
+ .data :
+ {
+ . = ALIGN(8);
+ _sdata = .; /* create a global symbol at data start */
+ *(.data) /* .data sections */
+ *(.data*) /* .data* sections */
+ *(.code_in_ram) /* code executing from RAM */
+ . = ALIGN(8);
+ _edata = .; /* define a global symbol at data end */
+ } >RAM AT> FLASH
+
+
+ /* Uninitialized data section */
+ . = ALIGN(4);
+ .bss :
+ {
+ /* This is used by the startup in order to initialize the .bss secion */
+ _sbss = .; /* define a global symbol at bss start */
+ __bss_start__ = _sbss;
+ *(.bss)
+ *(.bss*)
+ *(COMMON)
+
+ . = ALIGN(4);
+ _ebss = .; /* define a global symbol at bss end */
+ __bss_end__ = _ebss;
+ } >RAM
+
+ /* User_heap_stack section, used to check that there is enough RAM left */
+ ._user_heap_stack :
+ {
+ . = ALIGN(8);
+ PROVIDE ( end = . );
+ PROVIDE ( _end = . );
+ . = . + _Min_Heap_Size;
+ . = . + _Min_Stack_Size;
+ . = ALIGN(8);
+ } >RAM
+
+
+
+ /* Remove information from the standard libraries */
+ /DISCARD/ :
+ {
+ libc.a ( * )
+ libm.a ( * )
+ libgcc.a ( * )
+ }
+
+ .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/latest/Firmware/Transponder/STM32L4xx_FLASH.ld b/latest/Firmware/Transponder/STM32L4xx_FLASH.ld
index 81e2bbf..6fc33fe 100644
--- a/latest/Firmware/Transponder/STM32L4xx_FLASH.ld
+++ b/latest/Firmware/Transponder/STM32L4xx_FLASH.ld
@@ -62,7 +62,7 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
MEMORY
{
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 39K
-FLASH (rx) : ORIGIN = 0x8004800, LENGTH = 110K
+FLASH (rx) : ORIGIN = 0x8000000, LENGTH = 110K
}
/* Define output sections */
diff --git a/latest/Firmware/Transponder/Src/Configuration.cpp b/latest/Firmware/Transponder/Src/Configuration.cpp
index 63cc200..9081a0b 100644
--- a/latest/Firmware/Transponder/Src/Configuration.cpp
+++ b/latest/Firmware/Transponder/Src/Configuration.cpp
@@ -26,25 +26,13 @@
#include
-// These are not defined in ANY CMSIS or HAL header, WTF ST???
+// These are not defined in ANY CMSIS or HAL header, WTF???
#define OTP_ADDRESS 0x1FFF7000
#define OTP_SIZE 0x00000400
+
#define CONFIG_FLAGS_MAGIC 0x2092ED2C
-#if 0
-static StationData __THIS_STATION__ = {
- STATION_DATA_MAGIC,
- 987654321, // MMSI
- "NAUT", // Name
- "", // Call sign
- 0, // Length overall
- 0, // Beam
- 0, // Bow offset
- 0, // Port offset
- VESSEL_TYPE_UNSPECIFIED
-};
-#endif
//static StationDataPage __page;
@@ -115,29 +103,37 @@ const char *Configuration::serNum()
const char *Configuration::mcuType()
{
- const OTPData *otp = readOTP();
- if ( otp )
- return __mcuNames[otp->mcuType];
- else
+#ifdef STM32L422xx
+ return "STM32L422";
+#elif defined STM32L432xx
+ return "STM32L432";
+#else
return "";
+#endif
}
const char *Configuration::breakoutType()
{
#if LEGACY_BREAKOUTS == 0
- return "New";
+ return "1";
#else
- return "Legacy";
+ return "0";
#endif
}
+bool Configuration::isBootloaderPresent()
+{
+ return true;
+}
+
void Configuration::reportSystemData()
{
Event *e = EventPool::instance().newEvent(PROPR_NMEA_SENTENCE);
if ( !e )
return;
- sprintf(e->nmeaBuffer.sentence, "$PAISYS,%s,%s,%s,%s*", hwRev(), FW_REV, serNum(), mcuType());
+ sprintf(e->nmeaBuffer.sentence, "$PAISYS,%s,%s,%s,%s,%s,%d*", hwRev(), FW_REV, serNum(), mcuType(),
+ breakoutType(), isBootloaderPresent());
Utils::completeNMEA(e->nmeaBuffer.sentence);
EventQueue::instance().push(e);
diff --git a/latest/Firmware/Transponder/Src/system_stm32l4xx.c b/latest/Firmware/Transponder/Src/system_stm32l4xx.c
index bc27bf0..57d5f24 100644
--- a/latest/Firmware/Transponder/Src/system_stm32l4xx.c
+++ b/latest/Firmware/Transponder/Src/system_stm32l4xx.c
@@ -123,8 +123,17 @@
/*!< Uncomment the following line if you need to relocate your vector Table in
Internal SRAM. */
/* #define VECT_TAB_SRAM */
+
+#ifndef VECT_TAB_OFFSET
+#define VECT_TAB_OFFSET 0
+#endif
+
+#if 0
#define VECT_TAB_OFFSET 0x4800 /*!< Vector Table base offset field.
This value must be a multiple of 0x200. */
+
+#endif
+
/******************************************************************************/
/**
* @}