Merge branch 'master' into master

2017-07-04 19:46:19 +02:00 · 2017-07-04 19:46:19 +02:00 · dc22c7e7dd
parent 597f77ac1d 1189a3569c
commit dc22c7e7dd
2 changed files with 5 additions and 2 deletions
--- 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] = { 
--- a/STM32F4/boards.txt
+++ b/STM32F4/boards.txt
@ -115,9 +115,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