Add STM32.flashErase()/STM32.flashProgram() for OTA; move USBD to use timer based USB_VBUS detection

Author: GrumpyOldPizza

cores/stm32l4/STM32.cpp

@@ -196,6 +196,43 @@ void STM32Class::reset()
     stm32l4_system_reset();
 }
 
+bool STM32Class::flashErase(uint32_t address)
+{
+    if (address & 2047) {
+	return false;
+    }
+
+    if ((address < FLASHSTART) || (address >= FLASHEND)) {
+	return false;
+    }
+
+    stm32l4_flash_unlock();
+    stm32l4_flash_erase(address, 1);
+    stm32l4_flash_lock();
+    
+    return true;
+}
+
+bool STM32Class::flashProgram(uint32_t address, const void *data, uint32_t count)
+{
+    if ((address & 7) || (count & 7)) {
+	return false;
+    }
+
+    if ((address < FLASHSTART) || ((address + count) > FLASHEND)) {
+	return false;
+    }
+
+    if (count)
+    {
+	stm32l4_flash_unlock();
+	stm32l4_flash_program(address, (const uint8_t*)data, count);
+	stm32l4_flash_lock();
+    }
+
+    return true;
+}
+
 void STM32Class::lsco(bool enable)
 {
     stm32l4_system_lsco_configure((enable ? SYSTEM_LSCO_MODE_LSE : SYSTEM_LSCO_MODE_NONE));

cores/stm32l4/STM32.h

@@ -50,6 +50,9 @@
 #define WAKEUP_SYNC          0x00000400
 #define WAKEUP_TIMEOUT       0x00000800
 
+#define FLASHSTART           ((uint32_t)(&__FlashBase))
+#define FLASHEND             ((uint32_t)(&__FlashLimit))
+
 class STM32Class {
 public:
     uint64_t getSerial();
@@ -69,6 +72,9 @@ class STM32Class {
     void  shutdown(uint32_t pin, uint32_t mode, uint32_t timeout = 0);
     void  reset();
 
+    bool  flashErase(uint32_t address);
+    bool  flashProgram(uint32_t address, const void *data, uint32_t count);
+
     void  lsco(bool enable);
 };
 

cores/stm32l4/avr/eeprom.c

@@ -113,7 +113,7 @@ static void eeprom_flash_initialize(void)
 	wdata[14] = (uint8_t)(EEPROM_FLASH_MAGIC_2 >> 16);
 	wdata[15] = (uint8_t)(EEPROM_FLASH_MAGIC_2 >> 24);
 
-	stm32l4_flash_program((uint32_t)eeprom_flash_data + 1*EEPROM_FLASH_BANK - 16, 16, &wdata[0]);
+	stm32l4_flash_program((uint32_t)eeprom_flash_data + 1*EEPROM_FLASH_BANK - 16, &wdata[0], 16);
 
 	stm32l4_flash_lock();
 
@@ -208,7 +208,7 @@ static void eeprom_flash_write(uint32_t offset, const uint8_t *data)
 	wdata[6] = 0x00;
 	wdata[7] = 0x00;
 
-	stm32l4_flash_program((uint32_t)eeprom_flash_data + eeprom_flash_slot, 8, &wdata[0]);
+	stm32l4_flash_program((uint32_t)eeprom_flash_data + eeprom_flash_slot, &wdata[0], 8);
 
 	eeprom_flash_slot += 8;
     }
@@ -244,7 +244,7 @@ static void eeprom_flash_write(uint32_t offset, const uint8_t *data)
 		eeprom_flash_read(soffset +4, &wdata[4]);
 	    }
 
-	    stm32l4_flash_program((uint32_t)eeprom_flash_data +sbottom +soffset, 8, &wdata[0]);
+	    stm32l4_flash_program((uint32_t)eeprom_flash_data +sbottom +soffset, &wdata[0], 8);
 	}
 
 	sequence = ((eeprom_flash_data[eeprom_flash_limit +0] <<  0) |
@@ -271,7 +271,7 @@ static void eeprom_flash_write(uint32_t offset, const uint8_t *data)
 	wdata[14] = (uint8_t)(EEPROM_FLASH_MAGIC_2 >> 16);
 	wdata[15] = (uint8_t)(EEPROM_FLASH_MAGIC_2 >> 24);
 
-	stm32l4_flash_program((uint32_t)eeprom_flash_data +sbottom +EEPROM_FLASH_BANK - 16, 16, &wdata[0]);
+	stm32l4_flash_program((uint32_t)eeprom_flash_data +sbottom +EEPROM_FLASH_BANK - 16, &wdata[0], 16);
 
 	eeprom_flash_bottom = sbottom;
 	eeprom_flash_top = sbottom + EEPROM_FLASH_SIZE;

cores/stm32l4/stm32l4_wiring.h

@@ -37,7 +37,7 @@ extern "C" {
 
 #include "armv7m.h"
 
-#define retained __attribute__((section(".databkp")))
+#define retained __attribute__((section(".backup")))
 
 static inline void interrupts(void)
 {
@@ -181,6 +181,9 @@ extern uint32_t SystemCoreClock;
 
 #define F_CPU SystemCoreClock
 
+extern uint32_t __FlashBase;
+extern uint32_t __FlashLimit;
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

cores/stm32l4/stm32l4_wiring_private.h

@@ -48,6 +48,7 @@ extern "C" {
 #include "stm32l4_system.h"
 #include "stm32l4_rtc.h"
 #include "stm32l4_sai.h"
+#include "stm32l4_flash.h"
 
 #define STM32L4_SVCALL_IRQ_PRIORITY  15
 #define STM32L4_PENDSV_IRQ_PRIORITY  15

system/STM32L4xx/Include/armv7m_timer.h

@@ -53,7 +53,6 @@ extern void armv7m_timer_create(armv7m_timer_t *timer, armv7m_timer_callback_t c
 extern bool armv7m_timer_start(armv7m_timer_t *timer, uint32_t timeout);
 extern bool armv7m_timer_stop(armv7m_timer_t *timer);
 
-extern void armv7m_timer_heartbeat(uint32_t millis);
 extern void armv7m_timer_initialize(void);
 
 #ifdef __cplusplus

system/STM32L4xx/Include/stm32l4_flash.h

@@ -41,7 +41,7 @@ extern uint32_t stm32l4_flash_size(void);
 extern bool     stm32l4_flash_unlock(void);
 extern void     stm32l4_flash_lock(void);
 extern bool     stm32l4_flash_erase(uint32_t address, uint32_t count);
-extern bool     stm32l4_flash_program(uint32_t address, uint32_t count, const uint8_t *data);
+extern bool     stm32l4_flash_program(uint32_t address, const uint8_t *data, uint32_t count);
 
 #ifdef __cplusplus
 }

system/STM32L4xx/Include/stm32l4_system.h

@@ -234,7 +234,7 @@ extern uint32_t stm32l4_system_hclk(void);
 extern uint32_t stm32l4_system_pclk1(void);
 extern uint32_t stm32l4_system_pclk2(void);
 extern uint32_t stm32l4_system_saiclk(void);
-extern void     stm32l4_system_notify(uint32_t slot, stm32l4_system_callback_t callback, void *context, uint32_t events); 
+extern int      stm32l4_system_notify(int slot, stm32l4_system_callback_t callback, void *context, uint32_t events); 
 extern void     stm32l4_system_lock(uint32_t lock); 
 extern void     stm32l4_system_unlock(uint32_t lock);
 extern bool     stm32l4_system_stop(uint32_t timeout);