Release 7.0.1

rei-vilo · Nov 17, 2023 · 317b6d3 · 317b6d3
1 parent 795631f
commit 317b6d3
Show file tree

Hide file tree

Showing 30 changed files with 740 additions and 430 deletions.
diff --git a/examples/Common_Colours/Common_Colours.ino b/examples/Common_Colours/Common_Colours.ino
@@ -16,18 +16,18 @@
 /// @n
 ///
 
-// SDK
-#if defined(ENERGIA) // LaunchPad specific
-#include "Energia.h"
-#else // Arduino general
-#include "Arduino.h"
-#endif // SDK
+// Screen
+#include "PDLS_EXT3_Basic.h"
 
-// Set parameters
+// SDK
+// #include <Arduino.h>
+#include "hV_HAL_Peripherals.h"
 
 // Include application, user and local libraries
-#include "SPI.h"
-#include "PDLS_EXT3_Basic.h"
+// #include <SPI.h>
+
+// Configuration
+#include "hV_Configuration.h"
 
 // Define structures and classes
 
@@ -169,10 +169,6 @@ void setup()
 
     Serial.println("=== ");
     Serial.println();
-
-#if defined(ARDUINO_ARCH_PIDUINO)
-    exit(0);
-#endif
 }
 
 // Add loop code

diff --git a/examples/Common_Fonts/Common_Fonts.ino b/examples/Common_Fonts/Common_Fonts.ino
@@ -16,18 +16,20 @@
 /// @n
 ///
 
-// SDK
-#if defined(ENERGIA) // LaunchPad specific
-#include "Energia.h"
-#else // Arduino general
-#include "Arduino.h"
-#endif // SDK
+// Screen
+#include "PDLS_EXT3_Basic.h"
 
-// Set parameters
+// SDK
+// #include <Arduino.h>
+#include "hV_HAL_Peripherals.h"
 
 // Include application, user and local libraries
-#include "SPI.h"
-#include "PDLS_EXT3_Basic.h"
+// #include <SPI.h>
+
+// Configuration
+#include "hV_Configuration.h"
+
+// Set parameters
 
 // Define structures and classes
 
@@ -140,10 +142,6 @@ void setup()
 
     Serial.println("=== ");
     Serial.println();
-
-#if defined(ARDUINO_ARCH_PIDUINO)
-    exit(0);
-#endif
 }
 
 // Add loop code

diff --git a/examples/Common_Forms/Common_Forms.ino b/examples/Common_Forms/Common_Forms.ino
@@ -16,18 +16,18 @@
 /// @n
 ///
 
-// SDK
-#if defined(ENERGIA) // LaunchPad specific
-#include "Energia.h"
-#else // Arduino general
-#include "Arduino.h"
-#endif // SDK
+// Screen
+#include "PDLS_EXT3_Basic.h"
 
-// Set parameters
+// SDK
+// #include <Arduino.h>
+#include "hV_HAL_Peripherals.h"
 
 // Include application, user and local libraries
-#include "SPI.h"
-#include "PDLS_EXT3_Basic.h"
+// #include <SPI.h>
+
+// Configuration
+#include "hV_Configuration.h"
 
 // Define structures and classes
 
@@ -120,10 +120,6 @@ void setup()
 
     Serial.println("=== ");
     Serial.println();
-
-#if defined(ARDUINO_ARCH_PIDUINO)
-    exit(0);
-#endif
 }
 
 // Add loop code

diff --git a/examples/Common_Orientation/Common_Orientation.ino b/examples/Common_Orientation/Common_Orientation.ino
@@ -16,18 +16,18 @@
 /// @n
 ///
 
-// SDK
-#if defined(ENERGIA) // LaunchPad specific
-#include "Energia.h"
-#else // Arduino general
-#include "Arduino.h"
-#endif // SDK
+// Screen
+#include "PDLS_EXT3_Basic.h"
 
-// Set parameters
+// SDK
+// #include <Arduino.h>
+#include "hV_HAL_Peripherals.h"
 
 // Include application, user and local libraries
-#include "SPI.h"
-#include "PDLS_EXT3_Basic.h"
+// #include <SPI.h>
+
+// Configuration
+#include "hV_Configuration.h"
 
 // Define structures and classes
 
@@ -112,10 +112,6 @@ void setup()
 
     Serial.println("=== ");
     Serial.println();
-
-#if defined(ARDUINO_ARCH_PIDUINO)
-    exit(0);
-#endif
 }
 
 // Add loop code

diff --git a/examples/Common_Text/Common_Text.ino b/examples/Common_Text/Common_Text.ino
@@ -16,18 +16,18 @@
 /// @n
 ///
 
-// SDK
-#if defined(ENERGIA) // LaunchPad specific
-#include "Energia.h"
-#else // Arduino general
-#include "Arduino.h"
-#endif // SDK
+// Screen
+#include "PDLS_EXT3_Basic.h"
 
-// Set parameters
+// SDK
+// #include <Arduino.h>
+#include "hV_HAL_Peripherals.h"
 
 // Include application, user and local libraries
-#include "SPI.h"
-#include "PDLS_EXT3_Basic.h"
+// #include <SPI.h>
+
+// Configuration
+#include "hV_Configuration.h"
 
 // Define structures and classes
 
@@ -143,10 +143,6 @@ void setup()
 
     Serial.println("=== ");
     Serial.println();
-
-#if defined(ARDUINO_ARCH_PIDUINO)
-    exit(0);
-#endif
 }
 
 // Add loop code

diff --git a/examples/Common_WhoAmI/Common_WhoAmI.ino b/examples/Common_WhoAmI/Common_WhoAmI.ino
@@ -16,18 +16,18 @@
 /// @n
 ///
 
-// SDK
-#if defined(ENERGIA) // LaunchPad specific
-#include "Energia.h"
-#else // Arduino general
-#include "Arduino.h"
-#endif // SDK
+// Screen
+#include "PDLS_EXT3_Basic.h"
 
-// Set parameters
+// SDK
+// #include <Arduino.h>
+#include "hV_HAL_Peripherals.h"
 
 // Include application, user and local libraries
-#include "SPI.h"
-#include "PDLS_EXT3_Basic.h"
+// #include <SPI.h>
+
+// Configuration
+#include "hV_Configuration.h"
 
 // Define structures and classes
 
@@ -107,10 +107,6 @@ void setup()
 
     Serial.println("=== ");
     Serial.println();
-
-#if defined(ARDUINO_ARCH_PIDUINO)
-    exit(0);
-#endif
 }
 
 // Add loop code

diff --git a/examples/Example_Global_Speed/Example_Global_Speed.ino b/examples/Example_Global_Speed/Example_Global_Speed.ino
@@ -19,24 +19,26 @@
 /// Release 604: Global and fast variants
 ///
 
-// SDK
-#if defined(ENERGIA)  // LaunchPad specific
-#include "Energia.h"
-#else  // Arduino general
-#include "Arduino.h"
-#endif  // SDK
+// Screen
+#include "PDLS_EXT3_Basic.h"
+// #include "PDLS_EXT3_Basic_Fast.h"
 
-// Set parameters
+// SDK
+// #include <Arduino.h>
+#include "hV_HAL_Peripherals.h"
 
 // Include application, user and local libraries
-#include "SPI.h"
+// #include <SPI.h>
+
+// Configuration
+#include "hV_Configuration.h"
 
 // Define structures and classes
-#include "PDLS_EXT3_Basic.h"
+
+// Define constants and variables
 // Screen_EPD_EXT3 myScreen(eScreen_EPD_EXT3_271, boardRaspberryPiPico_RP2040);
 Screen_EPD_EXT3 myScreen(eScreen_EPD_EXT3_370, boardRaspberryPiPico_RP2040);
 
-// #include "PDLS_EXT3_Basic_Fast.h"
 // Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_271_09_Fast, boardRaspberryPiPico_RP2040);
 // Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_370_0C_Fast, boardRaspberryPiPico_RP2040);
 
@@ -93,6 +95,7 @@ void performTest()
     // 1
     dy += dz;
     text = formatString("Global update= %i ms", chrono);
+    // text = formatString("Fast update= %i ms", chrono);
     Serial.println(text);
     dx = (x - myScreen.stringSizeX(text)) / 2;
     myScreen.gText(dx, dy, text);
@@ -131,10 +134,6 @@ void setup()
 
     Serial.println("=== ");
     Serial.println();
-
-#if defined(ARDUINO_ARCH_PIDUINO)
-    exit(0);
-#endif
 }
 
 // Add loop code

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=PDLS_EXT3_Basic
-version=7.0.0
+version=7.0.1
 author=Rei Vilo for Pervasive Displays
 maintainer=Rei Vilo
 sentence=Library for Pervasive Displays iTC monochrome and colour screens with EXT3-1 board

diff --git a/src/PDLS_EXT3_Basic.h b/src/PDLS_EXT3_Basic.h
@@ -23,11 +23,7 @@
 ///
 
 // SDK
-#if defined(ENERGIA) // LaunchPad specific
-#include "Energia.h"
-#else // Arduino general
-#include "Arduino.h"
-#endif // end SDK
+#include <Arduino.h>
 
 #ifndef PDLS_EXT3_BASIC_RELEASE
 ///