From 54d67d77c4b01f22fa4910b841d13f61da8163af Mon Sep 17 00:00:00 2001
From: Testato <Testato@users.noreply.github.com>
Date: Sat, 17 Dec 2016 12:41:23 +0100
Subject: [PATCH 1/2] Update boards.txt

PR for issue https://github.com/rogerclarkmelbourne/Arduino_STM32/issues/200

- replaced `upload.flash.maximum_size` and `upload.ram.maximum_size` by the new arduino standard `upload.maximum_size` and `upload.maximum_data_size`
- corrected Flash and Ram value
- Tested by builded every MCU on every Variant
---
 STM32F4/boards.txt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/STM32F4/boards.txt b/STM32F4/boards.txt
index 7577d19..daa1a04 100644
--- a/STM32F4/boards.txt
+++ b/STM32F4/boards.txt
@@ -8,9 +8,8 @@ discovery_f407.upload.protocol=stlink
 
 #discovery_f407.upload.use_1200bps_touch=false
 discovery_f407.upload.file_type=bin
-discovery_f407.upload.ram.maximum_size=17000
-discovery_f407.upload.flash.maximum_size=1048576
 discovery_f407.upload.maximum_size=1048576
+discovery_f407.upload.maximum_data_size=196608
 
 #discovery_f407.upload.usbID=1EAF:0003
 #discovery_f407.upload.altID=1
@@ -37,9 +36,8 @@ stm32f4stamp.upload.protocol=maple_dfu
 
 #stm32f4stamp.upload.use_1200bps_touch=false
 stm32f4stamp.upload.file_type=bin
-stm32f4stamp.upload.ram.maximum_size=196608
-stm32f4stamp.upload.flash.maximum_size=1048576
 stm32f4stamp.upload.maximum_size=1048576
+stm32f4stamp.upload.maximum_data_size=196608
 
 stm32f4stamp.upload.usbID=0483:df11
 stm32f4stamp.upload.altID=0
@@ -67,9 +65,8 @@ netduino2plus.upload.protocol=maple_dfu
 
 #netduino2plus.upload.use_1200bps_touch=false
 netduino2plus.upload.file_type=bin
-netduino2plus.upload.ram.maximum_size=196608
-netduino2plus.upload.flash.maximum_size=1048576
 netduino2plus.upload.maximum_size=1048576
+netduino2plus.upload.maximum_data_size=196608
 
 netduino2plus.upload.usbID=0483:df11
 netduino2plus.upload.altID=0

From 1d29d139677eb2b843deee4bea9183dad4c330b6 Mon Sep 17 00:00:00 2001
From: lacklustrlabs <lacklustrlabs@gmail.com>
Date: Thu, 27 Apr 2017 18:22:18 +0200
Subject: [PATCH 2/2] The ssd1306_128x64_i2c_STM32 example would not build
 because of a missing swap() macro.

---
 STM32F1/libraries/Adafruit_SSD1306/Adafruit_SSD1306_STM32.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/STM32F1/libraries/Adafruit_SSD1306/Adafruit_SSD1306_STM32.cpp b/STM32F1/libraries/Adafruit_SSD1306/Adafruit_SSD1306_STM32.cpp
index c0c24a0..3492039 100644
--- a/STM32F1/libraries/Adafruit_SSD1306/Adafruit_SSD1306_STM32.cpp
+++ b/STM32F1/libraries/Adafruit_SSD1306/Adafruit_SSD1306_STM32.cpp
@@ -29,6 +29,10 @@ HardWire HWIRE(2,I2C_FAST_MODE); // I2c2
 #include "Adafruit_GFX.h"
 #include "Adafruit_SSD1306_STM32.h"
 
+#ifndef swap
+#define swap(a, b) { int16_t t = a; a = b; b = t; }
+#endif
+
 // the memory buffer for the LCD
 
 static uint8_t buffer[SSD1306_LCDHEIGHT * SSD1306_LCDWIDTH / 8] = {