v1.5.0

README.adoc

@@ -14,7 +14,7 @@ http://git.framasoft.org/locoduino.org/DIO2/wikis/home for both french and engli
 
 Copyright (c) Jan Dolinay, All right reserved.
 Copyright (c) 2016 Locoduino.org. All right reserved.
-Copyright (c) 2016 Thierry Paris. All right reserved.
+Copyright (c) 2016-2019 Thierry Paris. All right reserved.
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

library.properties

@@ -1,9 +1,9 @@
 name=DIO2
-version=1.4.1
+version=1.5.0
 author=Thierry Paris - Locoduino
 maintainer=Thierry Paris - Locoduino
 sentence=Fast digital input/output functions.
 paragraph=From a work of Jan Dolinay
 category=Device Control
 url=https://github.com/Locoduino.org/DIO2
-architectures=avr,sam,esp32
+architectures=avr,sam,esp32,STM32F1

readme.txt

@@ -7,6 +7,9 @@ Works also for Nano R3, Leonardo and Due (only for compatibility).
 
 Revision History
 ----------------
+December 2018 - Version 1.5.0
+Add support for non AVR architectures.
+
 July 2018 - Version 1.4.1
 Fix Keywords.txt format.
 

src/DIO2.h

@@ -24,44 +24,7 @@
 #ifndef ARDUINO2_H_
 #define ARDUINO2_H_
 
-#if defined(ARDUINO_ARCH_SAM) || defined(ARDUINO_ARCH_ESP32)
-
-// DUE version
-// The due is probably fast enough to access ports very efficiency (and i dont know how to make better !) .
-// So the functions are dummies, and conduct to original Arduino functions...
-
-typedef int GPIO_pin_t;
-#define pinMode2(P, M)			pinMode(P, M)
-#define digitalWrite2(P, V)		digitalWrite(P, V)
-#define digitalRead2(P)			digitalRead(P)
-
-#define pinMode2f(P, M)			pinMode(P, M)
-#define digitalWrite2f(P, V)	digitalWrite(P, V)
-#define digitalRead2f(P)		digitalRead(P)
-
-#define Arduino_to_GPIO_pin(P)	(P)
-#define GPIO_to_Arduino_pin(P)	(P)
-
-#define DP_INVALID	0xFFFF
-#define DP0	0
-#define DP1	1
-#define DP2	2
-#define DP3	3
-#define DP4	4
-#define DP5	5
-#define DP6	6
-#define DP7	7
-
-#include "Arduino.h"
-
-#ifdef F
-#undef F
-#endif
-
-#define F(str)	str
-#define __FlashStringHelper		char
-
-#else
+#if defined(ARDUINO_ARCH_AVR)
 
 // Standard headers for AVR
 #include <avr/pgmspace.h>
@@ -427,5 +390,43 @@ int GPIO_to_Arduino_pin(GPIO_pin_t inPin);
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
+#else
+
+// ARM / ESP / STM versions
+// These procs are probably fast enough to access ports very efficiency (and i dont know how to make better !) .
+// So the functions are dummies, and conduct to original wiring functions...
+
+typedef int GPIO_pin_t;
+#define pinMode2(P, M)			pinMode(P, M)
+#define digitalWrite2(P, V)		digitalWrite(P, V)
+#define digitalRead2(P)			digitalRead(P)
+
+#define pinMode2f(P, M)			pinMode(P, M)
+#define digitalWrite2f(P, V)	digitalWrite(P, V)
+#define digitalRead2f(P)		digitalRead(P)
+
+#define Arduino_to_GPIO_pin(P)	(P)
+#define GPIO_to_Arduino_pin(P)	(P)
+
+#define DP_INVALID	0xFFFF
+#define DP0	0
+#define DP1	1
+#define DP2	2
+#define DP3	3
+#define DP4	4
+#define DP5	5
+#define DP6	6
+#define DP7	7
+
+#include "Arduino.h"
+
+#ifdef F
+#undef F
+#endif
+
+#define F(str)	str
+#define __FlashStringHelper		char
+
 #endif
 #endif /* DIO2_H_ */

src/digital2.c

@@ -23,9 +23,9 @@
  *
  */
 
-#include "Arduino.h"
+#if defined(ARDUINO_ARCH_AVR)
 
-#if !defined(_LIB_SAM_) && !defined(ARDUINO_ARCH_ESP32)
+#include "Arduino.h"
 
 // Standard headers for AVR
 #include <avr/pgmspace.h>