Fix mistakes for STM32L475, add STM32WB55RG (#61)

* Erase both bank

* Fix page size

* Rename STM32WB55 to STM32WB55RG

* Clean code

* Add STM32WB55RC

Author: jnthbdn

projects.yaml

@@ -161,9 +161,12 @@ projects:
     stm32l475:
         - *module_tools
         - records/projects/st/STM32L475.yaml
-    stm32wb55:
+    stm32wb55rg:
         - *module_tools
-        - records/projects/st/STM32WB55.yaml
+        - records/projects/st/STM32WB55RG.yaml
+    stm32wb55rc:
+        - *module_tools
+        - records/projects/st/STM32WB55RC.yaml
     ncs36510:
         - *module_tools
         - records/projects/onsemi/ncs36510.yaml

records/projects/st/STM32WB55.yaml renamed to records/projects/st/STM32WB55RC.yaml

@@ -6,7 +6,7 @@ common:
         - STM32WB55xx
     includes:
         - source/FlashOS.h
-        - source/st/STM32WB55
-        - source/st/STM32WB55/inc
+        - source/st/STM32WB55RC
+        - source/st/STM32WB55RC/inc
     sources:
-        - source/st/STM32WB55
+        - source/st/STM32WB55RC

records/projects/st/STM32WB55RG.yaml

@@ -0,0 +1,12 @@
+common:
+    target:
+        - cortex-m4
+    macros:
+        - FLASH_DRV_VERS=0
+        - STM32WB55xx
+    includes:
+        - source/FlashOS.h
+        - source/st/STM32WB55RG
+        - source/st/STM32WB55RG/inc
+    sources:
+        - source/st/STM32WB55RG

source/st/STM32L475/FlashDev.c

@@ -41,14 +41,16 @@ struct FlashDevice const FlashDevice  =  {
    ONCHIP,                     // Device Type
    0x08000000,                 // Device Start Address
    0x00100000,                 // Device Size in Bytes (1024 kB)
-   1024,                       // Programming Page Size    -- maybe 256 by default ? --
+   2048,                       // Programming Page Size    
    0,                          // Reserved, must be 0
    0xFF,                       // Initial Content of Erased Memory
    100,                        // Program Page Timeout 100 mSec
    6000,                       // Erase Sector Timeout 6000 mSec
 
 // Specify Size and Address of Sectors
-   0x00800, 0x000000,          // Sector Size  2kB (512 Sectors)
-   SECTOR_END
+   {
+      {0x00800, 0x000000},          // Sector Size  2kB (512 Sectors)
+      {SECTOR_END}
+   }
 };
 #endif

source/st/STM32L475/FlashPrg.c

@@ -184,15 +184,16 @@ int UnInit (unsigned long fnc) {
  *    Return Value:   0 - OK,  1 - Failed
  */
 int EraseChip (void) {
-
-  FLASH->CR |=  FLASH_MER1;                              // Mass Erase Enabled (sectors  0..11)
-  FLASH->CR |=  FLASH_STRT;                             // Start Erase
+  FLASH->CR |=  FLASH_MER1;                              // Mass Erase Enabled (Bank 1)
+  FLASH->CR |=  FLASH_MER2;                              // Mass Erase Enabled (Bank 2)
+  FLASH->CR |=  FLASH_STRT;                              // Start Erase
 
   while (FLASH->SR & FLASH_BSY) {
     IWDG->KR = 0xAAAA;                                  // Reload IWDG
   }
 
   FLASH->CR &= ~FLASH_MER1;                              // Mass Erase Disabled
+  FLASH->CR &= ~FLASH_MER2;                              // Mass Erase Disabled
 
   return (0);                                           // Done
 }
@@ -245,7 +246,7 @@ int ProgramPage (unsigned long adr, unsigned long sz, unsigned char *buf) {
   FLASH->CR  =  0;                                      // reset CR 
 
   while (sz) {
-    FLASH->CR |= (FLASH_PG              |               // Programming Enabled
+    FLASH->CR |= (FLASH_PG |                            // Programming Enabled
                   FLASH_PSIZE_Word);                    // Programming Enabled (Word)
 
     M32(adr) = *((u32 *)buf);                           // Program Double Word

source/st/STM32WB55RC/FlashDev.c

@@ -0,0 +1,54 @@
+/* -----------------------------------------------------------------------------
+ * Copyright (c) 2021 ZeUGMA.
+ *
+ * This software is provided 'as-is', without any express or implied warranty. 
+ * In no event will the authors be held liable for any damages arising from 
+ * the use of this software. Permission is granted to anyone to use this 
+ * software for any purpose, including commercial applications, and to alter 
+ * it and redistribute it freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not 
+ *    claim that you wrote the original software. If you use this software in
+ *    a product, an acknowledgment in the product documentation would be 
+ *    appreciated but is not required. 
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be 
+ *    misrepresented as being the original software. 
+ * 
+ * 3. This notice may not be removed or altered from any source distribution.
+ *   
+ *
+ * $Date:        16/06/2021
+ * $Revision:    V1.00
+ *  
+ * Project:      Flash Programming Functions for STMicroelectronics STM32WB55xx Flash
+ * --------------------------------------------------------------------------- */
+
+/* History:
+ *  Version 1.00
+ *    Initial release
+ */ 
+
+
+#include "FlashOS.h"        // FlashOS Structures
+
+#ifdef STM32WB55xx
+struct FlashDevice const FlashDevice  =  {
+   FLASH_DRV_VERS,             // Driver Version, do not modify!
+   "STM32WB55RC 256kB Flash",  // Device Name (256 kB)
+   ONCHIP,                     // Device Type
+   0x08000000,                 // Device Start Address
+   0x00040000,                 // Device Size in Bytes (256 kB)
+   4096,                       // Programming Page Size
+   0,                          // Reserved, must be 0
+   0xFF,                       // Initial Content of Erased Memory
+   100,                        // Program Page Timeout 100 mSec
+   6000,                       // Erase Sector Timeout 6000 mSec
+
+// Specify Size and Address of Sectors
+   {
+      {0x01000, 0x000000},          // Sector Size  4kB (256 Sectors)
+      {SECTOR_END}
+   }
+};
+#endif

source/st/STM32WB55/FlashPrg.c renamed to source/st/STM32WB55RC/FlashPrg.c

@@ -35,18 +35,20 @@
 #ifdef STM32WB55xx
 struct FlashDevice const FlashDevice  =  {
    FLASH_DRV_VERS,             // Driver Version, do not modify!
-   "STM32L475VG 1024kB Flash", // Device Name (1024 kB)
+   "STM32WB55RG 1024kB Flash", // Device Name (1024 kB)
    ONCHIP,                     // Device Type
    0x08000000,                 // Device Start Address
    0x00100000,                 // Device Size in Bytes (1024 kB)
-   1024,                       // Programming Page Size    -- maybe 256 by default ? --
+   4096,                       // Programming Page Size    -- maybe 256 by default ? --
    0,                          // Reserved, must be 0
    0xFF,                       // Initial Content of Erased Memory
    100,                        // Program Page Timeout 100 mSec
    6000,                       // Erase Sector Timeout 6000 mSec
 
 // Specify Size and Address of Sectors
-   0x01000, 0x000000,          // Sector Size  4kB (256 Sectors)
-   SECTOR_END
+   {
+      {0x01000, 0x000000},          // Sector Size  4kB (256 Sectors)
+      {SECTOR_END}
+   }
 };
 #endif