Update to fix flash and other related bugs

STM32F103RCTx_FLASH.ld

@@ -37,12 +37,13 @@ _estack = 0x2000C000;    /* end of RAM */
 /* Generate a link error if heap and stack don't fit into RAM */
 _Min_Heap_Size = 0x200;      /* required amount of heap  */
 _Min_Stack_Size = 0x400; /* required amount of stack */
-
+_Reserved_Space = 0x800;
 /* Specify the memory areas */
 MEMORY
 {
 RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 48K
-FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = 256K
+FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = 256K - _Reserved_Space
+RESERVED_FLASH (rw) : ORIGIN = 0x8000000 + 256K - _Reserved_Space, LENGTH = _Reserved_Space
 }
 
 /* Define output sections */
@@ -82,15 +83,6 @@ SECTIONS
     . = ALIGN(4);
   } >FLASH
 
-  /* create a section in flash which is aligned on a page boundary, don't really care where. */
-  .myFlashSection :
-  {
-     . = ALIGN(2048);
-     *(.myFlashSection)
-     *(.myFlashSection*)
-     . = ALIGN(2048);
-  } >FLASH
-
   .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
   .ARM : {
     __exidx_start = .;
@@ -118,6 +110,15 @@ SECTIONS
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
   } >FLASH
+
+  /* create a section in flash which is aligned on a page boundary, don't really care where. */
+  .myFlashSection :
+  {
+     . = ALIGN(2048);
+     *(.myFlashSection)
+     . = ALIGN(2048);
+  } >RESERVED_FLASH
+
 
   /* used by the startup to initialize data */
   _sidata = LOADADDR(.data);
@@ -175,4 +176,3 @@ SECTIONS
   .ARM.attributes 0 : { *(.ARM.attributes) }
 }
 
-

platformio.ini

@@ -23,7 +23,7 @@ build_flags =
     -I${PROJECT_DIR}/src/hbprotocol/
     -DUSE_HAL_DRIVER
     -DSTM32F103xE
-    -Wl,-T./STM32F103RCTx_FLASH.ld
+    -Wl,-T${PROJECT_DIR}/STM32F103RCTx_FLASH.ld
     -Wl,-lc
     -Wl,-lm
 #    -Wl,-lnosys
@@ -42,7 +42,7 @@ build_flags =
     -I${PROJECT_DIR}/src/hbprotocol/
     -DUSE_HAL_DRIVER
     -DSTM32F103xE
-    -Wl,-T./STM32F103RCTx_FLASH.ld
+    -Wl,-T${PROJECT_DIR}/STM32F103RCTx_FLASH.ld
     -Wl,-lc
     -Wl,-lm
     -Og
@@ -117,7 +117,7 @@ build_flags =
     -I${PROJECT_DIR}/src/hbprotocol/
     -DUSE_HAL_DRIVER
     -DSTM32F103xE
-    -Wl,-T./STM32F103RCTx_FLASH.ld
+    -Wl,-T${PROJECT_DIR}/STM32F103RCTx_FLASH.ld
     -Wl,-lc
     -Wl,-lm
     -Og
@@ -184,7 +184,7 @@ build_flags =
     -I${PROJECT_DIR}/src/hbprotocol/
     -DUSE_HAL_DRIVER
     -DSTM32F103xE
-    -Wl,-T./STM32F103RCTx_FLASH.ld
+    -Wl,-T${PROJECT_DIR}/STM32F103RCTx_FLASH.ld
     -Wl,-lc
     -Wl,-lm
     -Og
@@ -247,7 +247,7 @@ build_flags =
     -I${PROJECT_DIR}/src/hbprotocol/
     -DUSE_HAL_DRIVER
     -DSTM32F103xE
-    -Wl,-T./STM32F103RCTx_FLASH.ld
+    -Wl,-T${PROJECT_DIR}/STM32F103RCTx_FLASH.ld
     -Wl,-lc
     -Wl,-lm
     -Og
@@ -295,4 +295,4 @@ build_flags =
     -D STEER_COEFFICIENT=0.5     ; higher value == stronger. if you do not want any steering, set it to 0.0; 0.0 to 1.0
     -D INVERT_R_DIRECTION
     -D INVERT_L_DIRECTION
-    -D BEEPS_BACKWARD=0          ; 0 or 1
+    -D BEEPS_BACKWARD=0          ; 0 or 1

src/comms.c

@@ -102,7 +102,7 @@ void consoleLog(char *message)
         USART2_IT_send((unsigned char *)message, strlen(message));
       #elif defined(SERIAL_USART3_IT) && !defined(READ_SENSOR)
         USART3_IT_send((unsigned char *)message, strlen(message));
-      #else
+      #elif !defined(READ_SENSOR)
         HAL_UART_Transmit_DMA(&huart2, (uint8_t *)message, strlen(message));
       #endif
     #endif
@@ -231,4 +231,4 @@ SERIAL_USART_IT_BUFFERTYPE serial_usart_buffer_pop(volatile SERIAL_USART_BUFFER
       usart_buf->tail = ((usart_buf->tail + 1 ) % SERIAL_USART_BUFFER_SIZE);
   }
   return t;
-}
+}

src/flashaccess.c

@@ -15,7 +15,7 @@
 //extern volatile const uint8_t flash_data[];
 
 // last two pages of the first half
-volatile uint8_t *flash_data = (uint8_t *) 0x08000000 + 62*2048;
+volatile uint8_t *flash_data = (uint8_t *) 0x08000000 + 0x40000 - 0x800;
 int flashlen = 4096; // two pages
 
 // routines to read and write config data
@@ -230,4 +230,4 @@ int writeflashchunk( void *addr, unsigned char *data, int len ){
 }
 
 
-#endif
+#endif

src/flasharea.c

@@ -2,7 +2,7 @@
 #include "defines.h"
 #include "config.h"
 
-#ifdef FLASH_STORAGE
+#ifdef FLASH_STORAGE_INIT
 // this should reserve a single 2k flash block at 0x0800C000
 // page = 30
 
@@ -150,4 +150,4 @@ const uint8_t __attribute__((section (".myFlashSection"))) flash_data_inimage[FL
 
     };
 
-#endif
+#endif

src/main.c

@@ -301,6 +301,9 @@ int main(void) {
   #ifdef SERIAL_USART3_IT
   USART3_IT_init();
   #endif
+  #ifdef SOFTWARE_SERIAL
+  SoftwareSerialInit();
+  #endif
 
 #ifdef FLASH_STORAGE
   init_flash_content();
@@ -336,10 +339,6 @@ int main(void) {
     HallInterruptinit();
   #endif
 
-  #ifdef SOFTWARE_SERIAL
-    SoftwareSerialInit();
-  #endif
-
   #ifdef CONTROL_PPM
     PPM_Init();
   #endif