fixes/improvements

- fixed uploader offset (i just wrote a bad python scipt (forgot flash_base, and it must be hex()))
- fixed platformio-build.py dependency (by using the newest stm32duino core version, which includes fixes). See stm32duino/Arduino_Core_STM32#2135
- cleaned up some minor stuff

Author: thijses

Diff for: README.md

@@ -9,16 +9,13 @@ Jumping to the user program takes about ~1.5ms if using 'leave_LSE_same'  (asin
 
 Usage: (see example project)
 - (to compile the example script, copy the whole library into the lib folder of that project)
-- replace the platformio-build.py script in .platformio\packages\framework-arduinoststm32\tools\platformio  with the one in patches\    (this makes setting a VECT_TAB_OFFSET possible)
-- in the platformio.ini file, there are 2 targets. One is for uploading bootloader code and the other is for uploading application code. (Note: currently, my ST-links are overwriting the bootloader when uploading user-applications. Very annoying, will fix soon).
-- Upload the user-app (by selecting the 'OTA_z_STM32WB55' target)
+- in the platformio.ini file, there are 2 targets. One is for uploading bootloader code and the other is for uploading application code.
+- Upload the user-app (by selecting the 'OTA_z_STM32WB55' target) (Note: if your uploader offset settings are correct, this should not overwrite bootloaders)
 - then upload the bootloader (by selecting the 'BOOTL_STM32WB55' target)
 - watch the serial monitor show it booting twice
 
 
 current problems i'm trying to solve:
-- patching the platformio-build.py script automatically (and perhaps more eligantly than just replacing it)
-- test bluetooth before and after jump
-- add some basic watchdog suggestions
-- add some basic flash/backup-domain flag suggestions
-- (work on the full BLE OTA code that relies on this stuff)
+- find a way to perform SHCI_C2_Reinit() (from the STM32duinoBLE library, but without importing the whole library), or perhaps a more universal CPU2 reset
+- add some basic watchdog example code
+- add some basic flash/backup-domain flag example code

Diff for: examples/STM32WB55_custom_arduino_bootloader_platformIO_example/application_offsets.py

@@ -0,0 +1,15 @@
+## this script is used to help indicate when the bootloader is too large.
+## NOTE: this script does not check the size itself, but rather updates the believed max flash size, which platformIO shows after compiling
+
+Import("env")
+# print("bootloader_size_check.py has ran") # basic debug
+config = env.GetProjectConfig() # access the overall project
+PROGRAM_START_str : str = config.get("TOTALB", "PROGRAM_START") # fetch variable from other env
+PROGRAM_START = int(PROGRAM_START_str, 16 if (PROGRAM_START_str.startswith("0x")) else 10) # convert to int
+# print("PROGRAM_START:", PROGRAM_START_str, PROGRAM_START)
+flash_base : int = 0x08000000 # TODO: retrieve automatically (instead of hardcoding like this)
+# print("flash_base + PROGRAM_START:", hex(flash_base + PROGRAM_START), type(flash_base))
+board_config = env.BoardConfig() # fetch board configuration of current env
+board_config.update("upload.offset_address", hex(flash_base + PROGRAM_START)) # indicate where to start uploading the new program
+board_config.update("build.flash_offset", PROGRAM_START) # tell platformio-build.py to tell the compiler & linker to offset flash.
+## NOTE: from STM32duino version 2.7.0 onwards, platformio-build will (finally) set LD_FLASH_OFFSET flag and define VECT_TAB_OFFSET based on build.flash_offset

Diff for: examples/STM32WB55_custom_arduino_bootloader_platformIO_example/application_upload_offset.py

@@ -4,7 +4,16 @@
 Import("env")
 # print("bootloader_size_check.py has ran") # basic debug
 config = env.GetProjectConfig() # access the overall project
-PROGRAM_START_str : str = config.get("TOTALB", "PROGRAM_START") # fetch variable from other env
-# print("PROGRAM_START:", PROGRAM_START_str, int(PROGRAM_START_str, 16 if (PROGRAM_START_str.startswith("0x")) else 10))
+maxSize : str = config.get("TOTALB", "PROGRAM_START") # fetch variable from other env
+# print("PROGRAM_START:", maxSize, int(maxSize, 16 if (maxSize.startswith("0x")) else 10))
+maxSize : int = int(maxSize, 16 if (maxSize.startswith("0x")) else 10) # convert str to int
+try:
+    comm_area = config.get("TOTALB", "BOOTLOADER_COMM_SIZE")
+    # print("BOOTLOADER_COMM_SIZE:", comm_area, int(comm_area, 16 if (comm_area.startswith("0x")) else 10))
+    comm_area = int(comm_area, 16 if (comm_area.startswith("0x")) else 10) # convert str to int
+    maxSize -= comm_area
+except:
+    # print("BOOTLOADER_COMM_SIZE not found") # just to let the user know (not actually an issue)
+    doNothing = 0
 board_config = env.BoardConfig() # fetch board configuration of current env
-board_config.update("upload.maximum_size", int(PROGRAM_START_str, 16 if (PROGRAM_START_str.startswith("0x")) else 10)) # update max size (to show bootloader size limit)
+board_config.update("upload.maximum_size", maxSize) # update max size (to show bootloader size limit)