stevstrong · stevstrong · Feb 28, 2024 · Oct 31, 2016 · Oct 31, 2016 · Oct 31, 2016
diff --git a/.github/workflows/TestCompile.yml b/.github/workflows/TestCompile.yml
@@ -0,0 +1,84 @@
+# TestCompile.yml
+# Github workflow script to test compile all examples of an Arduino core repository.
+#
+# Copyright (C) 2020  Armin Joachimsmeyer
+# https://github.com/ArminJo/Github-Actions
+#
+
+# This is the name of the workflow, visible on GitHub UI.
+name: TestCompile
+on:
+  workflow_dispatch: # To run it manually
+    description: 'manual build check'
+  push: # see: https://help.github.com/en/actions/reference/events-that-trigger-workflows#pull-request-event-pull_request
+    paths:
+    - '**.ino'
+    - '**.cpp'
+    - '**.h'
+    - '**TestCompile.yml'
+  pull_request:
+jobs:
+  build:
+    name: Test compiling examples for Arduino_STM32
+    runs-on: ubuntu-latest
+    env:
+      # PLATFORM_DEFAULT_URL: http://dan.drown.org/stm32duino/package_STM32duino_index.json
+      # Comma separated list without double quotes around the list.
+      REQUIRED_LIBRARIES: SdFat,Streaming,Adafruit GFX Library,Adafruit SSD1306,Adafruit STMPE610,Adafruit TouchScreen,SD
+
+    strategy:
+      matrix:
+        # The matrix will produce one job for each configuration parameter of type `arduino-boards-fqbn`
+        # In the Arduino IDE, the fqbn is printed in the first line of the verbose output for compilation as parameter -fqbn=... for the "arduino-builder -dump-prefs" command
+        #
+        # Examples: arduino:avr:uno, arduino:avr:leonardo, arduino:avr:nano, arduino:avr:mega
+        # arduino:sam:arduino_due_x, arduino:samd:arduino_zero_native"
+        # ATTinyCore:avr:attinyx5:chip=85,clock=1internal, digistump:avr:digispark-tiny, digistump:avr:digispark-pro
+        # STM32:stm32:GenF1:pnum=BLUEPILL_F103C8
+        # esp8266:esp8266:huzzah:eesz=4M3M,xtal=80, esp32:esp32:featheresp32:FlashFreq=80
+        # You may add a suffix behind the fqbn with "|" to specify one board for e.g. different compile options like arduino:avr:uno|trace
+        #############################################################################################################
+        arduino-boards-fqbn:
+          - stm32duino:STM32F1:genericSTM32F103C
+          #- stm32duino:STM32F1:nucleo_f103rb
+          #- stm32duino:STM32F1:mapleMini
+
+        # Specify parameters for each board.
+        # With sketches-exclude you may exclude specific examples for a board. Use a comma separated list.
+        #############################################################################################################
+        include:
+          - arduino-boards-fqbn: stm32duino:STM32F1:genericSTM32F103C
+            # errors: BOARD_BUTTON_PIN not defined, 'textsize' was not declared in this scope, 'A0' was not declared in this scope, 'BOARD_LED_PIN' was not declared in this scope, no matching function for call to 'SPIClass::transfer(uint8_t*&, size_t&)
+            sketches-exclude: Debounce,StateChangeDetection,Button,QASlave,InteractiveTest,WhileStatementConditional,HardwareTimerOnePulseMode,HardwareTimerPWMInput,StringEx_Parsing,hello_STM,MIDI_Classic_Mode,JeeUdp,multipacketSD,udpListener,etherNode,SingleChannelContinuousConversion,OLED_I2C_NumberFonts,OLED_I2C_TinyFont_View,OLED_I2C_Scrolling_Text,OLED_I2C_Bitmap,OLED_I2C_3D_Cube,OLED_I2C_ViewFont,OLED_I2C_Graph_Demo,OLED_I2C_Brightness,OLED_I2C_NumberFonts,OLED_I2C_TinyFont_View,coos_display_blink,rtos_blink,rtos_display_blink,Twitter_Serial_GW,XivelyClientString,XivelyClient,ssd1306_128x64_i2c_STM32,breakouttouchpaint,graphicstest,stm32_graphicstest,TFT_Rainbow_ILI9341,TFT_Clock_ILI9341,TFT_Clock_Digital_ILI9341,TFT_Show_Font_ILI9341,graphicstest,stm32_graphicstest,onoffbutton_breakout,onoffbutton_breakout,onoffbutton,spitftbitmap,ssd1306_128x64_spi,ssd1306_128x32_i2c,ssd1306_128x32_spi,sdreader
+
+          #- arduino-boards-fqbn: stm32duino:STM32F1:nucleo_f103rb
+            # Examples to exclude because of ...
+            #sketches-exclude: WiiClassicJoystick,BasicUsage,DigisparkOLED,SoftPwm13Pins,TinySoftPwmDemo,DigiUSB2LCD,DigisparkUSBDemo,ArduinoNunchukDemo,DigisparkJoystickDemo
+
+      # Do not cancel all jobs / architectures if one job fails
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
+      - name: Use this repo as Arduino core
+        run: |
+          mkdir --parents $HOME/.arduino15/packages/stm32duino/hardware/STM32F1/0.0.7 # dummy release number
+          # cannot move, since we want to compile the examples in the library subfolder :-)
+          ln -s $GITHUB_WORKSPACE/STM32F1/* $HOME/.arduino15/packages/stm32duino/hardware/STM32F1/0.0.7
+          #cp --recursive $GITHUB_WORKSPACE/STM32F1/* $HOME/.arduino15/packages/stm32duino/hardware/STM32F1/0.0.7/
+          #ls -l --dereference --recursive --all $HOME/.arduino15/packages/stm32duino/hardware/STM32F1/0.0.7/
+
+      - name: Compile all examples
+        uses: ArminJo/arduino-test-compile@master
+        with:
+          required-libraries: ${{ env.REQUIRED_LIBRARIES }}
+          arduino-board-fqbn: ${{ matrix.arduino-boards-fqbn }}
+          arduino-platform: stm32duino:STM32F1,arduino:sam # we require the C compiler from it. See dependencies of package_STM32duino_index.json
+          #platform-default-url: ${{ env.PLATFORM_DEFAULT_URL }}
+          #platform-url: ${{ matrix.platform-url }}
+          sketches-exclude: ${{ matrix.sketches-exclude }}
+          build-properties: ${{ toJson(matrix.build-properties) }}
+          sketch-names: "*.ino"
+          sketch-names-find-start: STM32F1/libraries/*/examples/
+          #debug-install: true
diff --git a/README.md b/README.md
@@ -11,10 +11,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 ## Summary:
 This repo contains the "Hardware" files to support STM32 based boards on Arduino version 1.8.x (some older versions may also work) including [LeafLabs Maple, and Maple mini](http://www.leaflabs.com/about-maple/), and other generic STM32F103 boards.
 
-
-***We are also on Gitter https://gitter.im/stm32duino/Lobby/***
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/stm32duino/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 ## Background & Support:
 * Based on https://github.com/bobc/maple-asp, which is in turn based on LibMaple by Leaflabs
 * **Please read the wiki (https://github.com/rogerclarkmelbourne/Arduino_STM32/wiki) for full details**

diff --git a/STM32F1/boards.txt b/STM32F1/boards.txt
@@ -410,7 +410,16 @@ genericSTM32F103C.menu.upload_method.HIDUploadMethod.build.vect=VECT_TAB_ADDR=0x
 genericSTM32F103C.menu.upload_method.HIDUploadMethod.build.ldscript=ld/hid_bootloader.ld
 
 #-- CPU Clock frequency
-genericSTM32F103C.menu.cpu_speed.speed_72mhz=72MHz (Normal)
+
+genericSTM32F103C.menu.cpu_speed.speed_hsi_64mhz=64Mhz (HSI)
+genericSTM32F103C.menu.cpu_speed.speed_hsi_64mhz.build.f_cpu=64000000L
+genericSTM32F103C.menu.cpu_speed.speed_hsi_64mhz.build.hs_flag=-DUSE_HSI_CLOCK
+
+genericSTM32F103C.menu.cpu_speed.speed_hsi_48mhz=48Mhz (HSI- USB) 
+genericSTM32F103C.menu.cpu_speed.speed_hsi_48mhz.build.f_cpu=48000000L
+genericSTM32F103C.menu.cpu_speed.speed_hsi_48mhz.build.hs_flag=-DUSE_HSI_CLOCK -DHSI_USB_SPEED
+
+genericSTM32F103C.menu.cpu_speed.speed_72mhz=72Mhz (Normal)
 genericSTM32F103C.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
 
 genericSTM32F103C.menu.cpu_speed.speed_48mhz=48MHz (Slow - with USB)

diff --git a/STM32F1/cores/maple/avr/pgmspace.h b/STM32F1/cores/maple/avr/pgmspace.h
@@ -21,6 +21,7 @@ typedef uint32_t prog_uint32_t;
 
 #define memcpy_P(dest, src, num) memcpy((dest), (src), (num))
 #define strcpy_P(dest, src) strcpy((dest), (src))
+#define strncpy_P(dest, src, size) strncpy((dest), (src), (size))
 #define strcat_P(dest, src) strcat((dest), (src))
 #define strchr_P(s, c) strchr((s), (c))
 #define strcmp_P(a, b) strcmp((a), (b))

diff --git a/STM32F1/cores/maple/libmaple/rcc_f1.c b/STM32F1/cores/maple/libmaple/rcc_f1.c
@@ -97,6 +97,7 @@ const struct rcc_dev_info rcc_dev_table[] = {
     [RCC_TIMER13] = { .clk_domain = APB1, .line_num = 7 },
     [RCC_TIMER14] = { .clk_domain = APB1, .line_num = 8 },
 #endif
+	[RCC_CAN]	= { .clk_domain = APB1, .line_num = 25 },	//! JMD after X893
 };
 
 __deprecated

diff --git a/STM32F1/cores/maple/libmaple/rcc_private.h b/STM32F1/cores/maple/libmaple/rcc_private.h
@@ -35,7 +35,7 @@
 
 struct rcc_dev_info {
     const rcc_clk_domain clk_domain;
-    const uint8 line_num;
+    const uint8_t line_num;
 };
 
 extern const struct rcc_dev_info rcc_dev_table[];
@@ -51,14 +51,14 @@ static inline rcc_clk_domain rcc_dev_clk(rcc_clk_id id) {
 static inline void rcc_do_clk_enable(__IO uint32** enable_regs,
                                      rcc_clk_id id) {
     __IO uint32 *enable_reg = enable_regs[rcc_dev_clk(id)];
-    uint8 line_num = rcc_dev_table[id].line_num;
+    uint8_t line_num = rcc_dev_table[id].line_num;
     bb_peri_set_bit(enable_reg, line_num, 1);
 }
 
 static inline void rcc_do_reset_dev(__IO uint32** reset_regs,
                                     rcc_clk_id id) {
     __IO uint32 *reset_reg = reset_regs[rcc_dev_clk(id)];
-    uint8 line_num = rcc_dev_table[id].line_num;
+    uint8_t line_num = rcc_dev_table[id].line_num;
     bb_peri_set_bit(reset_reg, line_num, 1);
     bb_peri_set_bit(reset_reg, line_num, 0);
 }
@@ -75,7 +75,7 @@ static inline void rcc_do_set_prescaler(const uint32 *masks,
 static inline void rcc_do_clk_disable(__IO uint32** enable_regs,
                                      rcc_clk_id id) {
     __IO uint32 *enable_reg = enable_regs[rcc_dev_clk(id)];
-    uint8 line_num = rcc_dev_table[id].line_num;
+    uint8_t line_num = rcc_dev_table[id].line_num;
     bb_peri_set_bit(enable_reg, line_num, 0);
 }
 

diff --git a/STM32F1/cores/maple/libmaple/series/rcc.h b/STM32F1/cores/maple/libmaple/series/rcc.h
@@ -439,6 +439,7 @@ typedef enum rcc_clk_id {
     RCC_TIMER12,
     RCC_TIMER13,
     RCC_TIMER14,
+    RCC_CAN,
 } rcc_clk_id;
 
 /**

diff --git a/STM32F1/cores/maple/wirish.h b/STM32F1/cores/maple/wirish.h
@@ -49,6 +49,7 @@
 #include <avr/dtostrf.h>
 #include <avr/pgmspace.h>
 #include <avr/interrupt.h>
+#include "itoa.h"
 
 #include <libmaple/stm32.h>
 

diff --git a/STM32F1/cores/maple/wirish_math.h b/STM32F1/cores/maple/wirish_math.h
@@ -47,7 +47,7 @@ void randomSeed(unsigned int seed);
  * @return A pseudo-random number in the range [0,max).
  * @see randomSeed()
  */
-long random(long max);
+long random(long max = __LONG_MAX__);
 
 /**
  * @brief Generate a pseudo-random number with lower and upper bounds.

diff --git a/STM32F1/libraries/Adafruit_GFX_AS/Adafruit_GFX_AS.cpp b/STM32F1/libraries/Adafruit_GFX_AS/Adafruit_GFX_AS.cpp
@@ -59,6 +59,8 @@ POSSIBILITY OF SUCH DAMAGE.
  #define pgm_read_byte(addr) (*(const unsigned char *)(addr))
 #endif
 
+#define textsize textsize_x
+
 Adafruit_GFX_AS::Adafruit_GFX_AS(int16_t w, int16_t h): Adafruit_GFX(w, h)
 {
 }
@@ -378,3 +380,5 @@ int16_t Adafruit_GFX_AS::drawFloat(float floatNumber, int16_t decimal, int16_t p
     }
     return sumX;
 }
+
+#undef textsize
diff --git a/STM32F1/libraries/EEPROM/EEPROM.cpp b/STM32F1/libraries/EEPROM/EEPROM.cpp
@@ -10,7 +10,7 @@
   */
 uint16 EEPROMClass::EE_CheckPage(uint32 pageBase, uint16 status)
 {
-	uint32 pageEnd = pageBase + (uint32)PageSize;
+	uint32 pageEnd = pageBase + (uint32)PageSize * Pages;
 
 	// Page Status not EEPROM_ERASED and not a "state"
 	if ((*(__IO uint16*)pageBase) != EEPROM_ERASED && (*(__IO uint16*)pageBase) != status)
@@ -40,6 +40,10 @@ FLASH_Status EEPROMClass::EE_ErasePage(uint32 pageBase)
 	FlashStatus = FLASH_ErasePage(pageBase);
 	if (FlashStatus == FLASH_COMPLETE)
 		FlashStatus = FLASH_ProgramHalfWord(pageBase + 2, data);
+	for (size_t i = 1; i < Pages; i++)
+	{
+		FLASH_ErasePage(pageBase + PageSize * i);
+	}
 
 	return FlashStatus;
 }
@@ -95,7 +99,7 @@ uint16 EEPROMClass::EE_GetVariablesCount(uint32 pageBase, uint16 skipAddress)
 {
 	uint16 varAddress, nextAddress;
 	uint32 idx;
-	uint32 pageEnd = pageBase + (uint32)PageSize;
+	uint32 pageEnd = pageBase + (uint32)PageSize * Pages;
 	uint16 count = 0;
 
 	for (pageBase += 6; pageBase < pageEnd; pageBase += 4)
@@ -136,7 +140,7 @@ uint16 EEPROMClass::EE_PageTransfer(uint32 newPage, uint32 oldPage, uint16 SkipA
 	FLASH_Status FlashStatus;
 
 	// Transfer process: transfer variables from old to the new active page
-	newEnd = newPage + ((uint32)PageSize);
+	newEnd = newPage + ((uint32)PageSize * Pages);
 
 	// Find first free element in new page
 	for (newIdx = newPage + 4; newIdx < newEnd; newIdx += 4)
@@ -146,7 +150,7 @@ uint16 EEPROMClass::EE_PageTransfer(uint32 newPage, uint32 oldPage, uint16 SkipA
 		return EEPROM_OUT_SIZE;
 
 	oldEnd = oldPage + 4;
-	oldIdx = oldPage + (uint32)(PageSize - 2);
+	oldIdx = oldPage + (uint32)(PageSize * Pages - 2);
 
 	for (; oldIdx > oldEnd; oldIdx -= 4)
 	{
@@ -219,7 +223,7 @@ uint16 EEPROMClass::EE_VerifyPageFullWriteVariable(uint16 Address, uint16 Data)
 		return  EEPROM_NO_VALID_PAGE;
 
 	// Get the valid Page end Address
-	pageEnd = pageBase + PageSize;			// Set end of page
+	pageEnd = pageBase + PageSize * Pages;			// Set end of page
 
 	for (idx = pageEnd - 2; idx > pageBase; idx -= 4)
 	{
@@ -254,7 +258,7 @@ uint16 EEPROMClass::EE_VerifyPageFullWriteVariable(uint16 Address, uint16 Data)
 	// Empty slot not found, need page transfer
 	// Calculate unique variables in page
 	count = EE_GetVariablesCount(pageBase, Address) + 1;
-	if (count >= (PageSize / 4 - 1))
+	if (count >= (PageSize * Pages / 4 - 1))
 		return EEPROM_OUT_SIZE;
 
 	if (pageBase == PageBase1)
@@ -284,6 +288,7 @@ EEPROMClass::EEPROMClass(void)
 	PageBase0 = EEPROM_PAGE0_BASE;
 	PageBase1 = EEPROM_PAGE1_BASE;
 	PageSize = EEPROM_PAGE_SIZE;
+	Pages = 1;
 	Status = EEPROM_NOT_INIT;
 }
 
@@ -292,6 +297,16 @@ uint16 EEPROMClass::init(uint32 pageBase0, uint32 pageBase1, uint32 pageSize)
 	PageBase0 = pageBase0;
 	PageBase1 = pageBase1;
 	PageSize = pageSize;
+	Pages = 1;
+	return init();
+}
+
+uint16 EEPROMClass::init(uint32 pageBase0, uint32 pageBase1, uint32 pageSize, uint16 pages)
+{
+	PageBase0 = pageBase0;
+	PageBase1 = pageBase1;
+	PageSize = pageSize;
+	Pages = pages;
 	return init();
 }
 
@@ -481,7 +496,7 @@ uint16 EEPROMClass::read(uint16 Address, uint16 *Data)
 		return  EEPROM_NO_VALID_PAGE;
 
 	// Get the valid Page end Address
-	pageEnd = pageBase + ((uint32)(PageSize - 2));
+	pageEnd = pageBase + ((uint32)(PageSize * Pages - 2));
 
 	// Check each active page address starting from end
 	for (pageBase += 6; pageEnd >= pageBase; pageEnd -= 4)
@@ -564,7 +579,7 @@ uint16 EEPROMClass::count(uint16 *Count)
 
 uint16 EEPROMClass::maxcount(void)
 {
-	return ((PageSize / 4)-1);
+	return ((PageSize * Pages / 4)-1);
 }
 
 EEPROMClass EEPROM;
diff --git a/STM32F1/libraries/EEPROM/EEPROM.h b/STM32F1/libraries/EEPROM/EEPROM.h
@@ -61,6 +61,7 @@ class EEPROMClass
 
 	uint16 init(void);
 	uint16 init(uint32, uint32, uint32);
+	uint16 init(uint32, uint32, uint32, uint16);
 
 	uint16 format(void);
 
@@ -75,6 +76,7 @@ class EEPROMClass
 	uint32 PageBase0;
 	uint32 PageBase1;
 	uint32 PageSize;
+	uint16 Pages;
 	uint16 Status;
 private:
 	FLASH_Status EE_ErasePage(uint32);

diff --git a/STM32F1/libraries/EEPROM/examples/EEPROM_example/EEPROM_example.ino b/STM32F1/libraries/EEPROM/examples/EEPROM_example/EEPROM_example.ino
@@ -3,8 +3,8 @@
 int ledPin =  13;    // LED connected to digital pin 13
 const char HELP_MSG[] = "Press :\r\n" \
 			" 0 display configuration\r\n" \
-			" 1 set configuration to 0x801F000 / 0x801F800 / 0x400 (RB MCU)\r\n" \
-			" 2 set configuration to 0x801F000 / 0x801F800 / 0x800 (ZE/RE MCU)\r\n" \
+			" 1 set configuration to 0x801F000 / 0x801F800 / 0x400 / 2 (RB MCU)\r\n" \
+			" 2 set configuration to 0x801F000 / 0x801F800 / 0x800 / 1 (ZE/RE MCU)\r\n" \
 			" 3 write/read variable\r\n" \
 			" 4 increment address\r\n" \
 			" 5 display pages top/bottom\r\n" \
@@ -40,13 +40,15 @@ void loop()
 			EEPROM.PageBase0 = 0x801F000;
 			EEPROM.PageBase1 = 0x801F800;
 			EEPROM.PageSize  = 0x400;
+			EEPROM.Pages  = 2;
 			DisplayConfig();
 		}
 		else if (cmd == '2')
 		{
 			EEPROM.PageBase0 = 0x801F000;
 			EEPROM.PageBase1 = 0x801F800;
 			EEPROM.PageSize  = 0x800;
+			EEPROM.Pages  = 1;
 			DisplayConfig();
 		}
 		else if (cmd == '3')
@@ -111,6 +113,8 @@ void DisplayConfig(void)
 	Serial.print  (" (");
 	Serial.print  (EEPROM.PageSize, DEC);
 	Serial.println(")");
+	Serial.print  ("EEPROM.Pages     : ");
+	Serial.println(EEPROM.Pages, DEC);
 }
 
 void DisplayHex(uint16 value)
@@ -149,7 +153,7 @@ void DisplayPagesEnd(uint32 endIndex)
 {
 	Serial.println("Page 0     Bottom      Page 1");
 
-	for (uint32 idx = EEPROM.PageSize - endIndex; idx < EEPROM.PageSize; idx += 4)
+	for (uint32 idx = EEPROM.PageSize * EEPROM.Pages - endIndex; idx < EEPROM.PageSize * EEPROM.Pages; idx += 4)
 	{
 		Serial.print  (EEPROM.PageBase0 + idx, HEX);
 		Serial.print  (" : ");

diff --git a/STM32F1/libraries/Ethernet_STM/examples/DhcpAddressPrinter/DhcpAddressPrinter.ino b/STM32F1/libraries/Ethernet_STM/examples/DhcpAddressPrinter/DhcpAddressPrinter.ino
@@ -30,7 +30,7 @@
  */
 
 #include <SPI.h>
-#include <Ethernet.h>
+#include <Ethernet_STM.h>
 
 // Enter a MAC address for your controller below.
 // Newer Ethernet shields have a MAC address printed on a sticker on the shield