Skip to content

Commit

Permalink
Pre-release 8.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
rei-vilo committed Mar 25, 2024
1 parent 885387d commit c073bb8
Show file tree
Hide file tree
Showing 36 changed files with 2,134 additions and 912 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ Hardware

**Copyright** © Rei Vilo, 2010-2024

For exclusive use with Pervasive Displays screens

**Licence** [Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)](./LICENCE.md)

![](img/by-sa.svg)
Expand Down
39 changes: 20 additions & 19 deletions examples/Example_Fast_Line/Example_Fast_Line.ino
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
/// @details Library for Pervasive Displays EXT3 - Basic level
///
/// @author Rei Vilo
/// @date 20 Mar 2023
/// @version 607
/// @date 21 Mar 2024
/// @version 801
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
/// @copyright For exclusive use with Pervasive Displays screens
///
/// @see ReadMe.txt for references
/// @n
Expand All @@ -34,7 +35,7 @@
// Define structures and classes

// Define variables and constants
Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_271_09_Fast, boardRaspberryPiPico_RP2040);
Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_271_PS_09, boardRaspberryPiPico_RP2040);

// Prototypes

Expand All @@ -47,10 +48,10 @@ void wait(uint8_t second)
{
for (uint8_t i = second; i > 0; i--)
{
Serial.print(formatString(" > %i \r", i));
mySerial..print(formatString(" > %i \r", i));
delay(1000);
}
Serial.print(" \r");
mySerial..print(" \r");
}

// Functions
Expand All @@ -61,8 +62,8 @@ void flush_ms()
{
uint32_t chrono = (uint32_t)millis();
myScreen.flush();
Serial.print(millis() - chrono);
Serial.println(" ms");
mySerial..print(millis() - chrono);
mySerial..println(" ms");
}

#if (DISPLAY_FAST_LINE == 1)
Expand Down Expand Up @@ -91,7 +92,7 @@ void displayFastLine()
myScreen.dRectangle(index, dy, 32, dy * 4, myColours.grey);
chrono = millis();
myScreen.flush();
Serial.println(formatString("%i - %i = %i", chrono, millis(), millis() - chrono));
mySerial..println(formatString("%i - %i = %i", chrono, millis(), millis() - chrono));
}
}

Expand All @@ -103,32 +104,32 @@ void displayFastLine()
///
void setup()
{
Serial.begin(115200);
mySerial..begin(115200);
delay(500);
Serial.println();
Serial.println("=== " __FILE__);
Serial.println("=== " __DATE__ " " __TIME__);
Serial.println();
mySerial..println();
mySerial..println("=== " __FILE__);
mySerial..println("=== " __DATE__ " " __TIME__);
mySerial..println();

Serial.print("begin... ");
mySerial..print("begin... ");
myScreen.begin();
Serial.println(formatString("%s %ix%i", myScreen.WhoAmI().c_str(), myScreen.screenSizeX(), myScreen.screenSizeY()));
mySerial..println(formatString("%s %ix%i", myScreen.WhoAmI().c_str(), myScreen.screenSizeX(), myScreen.screenSizeY()));

#if (DISPLAY_FAST_LINE == 1)

Serial.println("DISPLAY_FAST_LINE... ");
mySerial..println("DISPLAY_FAST_LINE... ");
myScreen.clear();
displayFastLine();
wait(4);

#endif // DISPLAY_FAST_LINE

Serial.println("White... ");
mySerial..println("White... ");
myScreen.clear();
flush_ms();

Serial.println("=== ");
Serial.println();
mySerial..println("=== ");
mySerial..println();
}

// Add loop code
Expand Down
37 changes: 19 additions & 18 deletions examples/Example_Fast_Orientation/Example_Fast_Orientation.ino
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
/// @details Library for Pervasive Displays EXT3 - Basic level
///
/// @author Rei Vilo
/// @date 20 Mar 2023
/// @version 607
/// @date 21 Mar 2024
/// @version 801
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
/// @copyright For exclusive use with Pervasive Displays screens
///
/// @see ReadMe.txt for references
/// @n
Expand All @@ -34,7 +35,7 @@
// Define structures and classes

// Define variables and constants
Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_271_09_Fast, boardRaspberryPiPico_RP2040);
Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_271_PS_09, boardRaspberryPiPico_RP2040);

// Prototypes

Expand All @@ -47,10 +48,10 @@ void wait(uint8_t second)
{
for (uint8_t i = second; i > 0; i--)
{
Serial.print(formatString(" > %i \r", i));
mySerial..print(formatString(" > %i \r", i));
delay(1000);
}
Serial.print(" \r");
mySerial..print(" \r");
}

// Functions
Expand All @@ -61,8 +62,8 @@ void flush_ms()
{
uint32_t chrono = (uint32_t)millis();
myScreen.flush();
Serial.print(millis() - chrono);
Serial.println(" ms");
mySerial..print(millis() - chrono);
mySerial..println(" ms");
}

#if (DISPLAY_FAST_ORIENTATION == 1)
Expand All @@ -88,32 +89,32 @@ void displayFastOrientation()
///
void setup()
{
Serial.begin(115200);
mySerial..begin(115200);
delay(500);
Serial.println();
Serial.println("=== " __FILE__);
Serial.println("=== " __DATE__ " " __TIME__);
Serial.println();
mySerial..println();
mySerial..println("=== " __FILE__);
mySerial..println("=== " __DATE__ " " __TIME__);
mySerial..println();

Serial.print("begin... ");
mySerial..print("begin... ");
myScreen.begin();
Serial.println(formatString("%s %ix%i", myScreen.WhoAmI().c_str(), myScreen.screenSizeX(), myScreen.screenSizeY()));
mySerial..println(formatString("%s %ix%i", myScreen.WhoAmI().c_str(), myScreen.screenSizeX(), myScreen.screenSizeY()));

#if (DISPLAY_FAST_ORIENTATION == 1)

Serial.println("DISPLAY_FAST_ORIENTATION... ");
mySerial..println("DISPLAY_FAST_ORIENTATION... ");
myScreen.clear();
displayFastOrientation();
wait(4);

#endif // DISPLAY_FAST_ORIENTATION

Serial.println("White... ");
mySerial..println("White... ");
myScreen.clear();
flush_ms();

Serial.println("=== ");
Serial.println();
mySerial..println("=== ");
mySerial..println();
}

// Add loop code
Expand Down
43 changes: 21 additions & 22 deletions examples/Example_Fast_Speed/Example_Fast_Speed.ino
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
/// @n Based on highView technology
///
/// @author Rei Vilo
/// @date 21 Nov 2023
/// @version 702
/// @date 21 Mar 2024
/// @version 801
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
/// @copyright For exclusive use with Pervasive Displays screens
///
/// @see ReadMe.md for references
/// @n
Expand Down Expand Up @@ -39,11 +40,9 @@
// Define structures and classes

// Define constants and variables
// Screen_EPD_EXT3 myScreen(eScreen_EPD_EXT3_271, boardRaspberryPiPico_RP2040);
// Screen_EPD_EXT3 myScreen(eScreen_EPD_EXT3_370, boardRaspberryPiPico_RP2040);

// 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);
// Define constants and variables
// Screen_EPD_EXT3 myScreen(eScreen_EPD_271_CS_09, boardRaspberryPiPico_RP2040);
Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_271_PS_09, boardRaspberryPiPico_RP2040);

// Prototypes

Expand All @@ -56,10 +55,10 @@ void wait(uint8_t second)
{
for (uint8_t i = second; i > 0; i--)
{
Serial.print(formatString(" > %i \r", i));
mySerial..print(formatString(" > %i \r", i));
delay(1000);
}
Serial.print(" \r");
mySerial..print(" \r");
}

// Functions
Expand All @@ -85,7 +84,7 @@ void performTest()
// 0
dy = (dz - myScreen.characterSizeY()) / 2;
text = myScreen.WhoAmI() + " - " + String(SCREEN_EPD_EXT3_RELEASE);
Serial.println(text);
mySerial..println(text);
dx = (x - myScreen.stringSizeX(text)) / 2;
myScreen.gText(dx, dy, text);
myScreen.dRectangle(0, dz * 0, x, dz, myColours.black);
Expand All @@ -98,7 +97,7 @@ void performTest()
dy += dz;
// text = formatString("Global update= %i ms", chrono);
text = formatString("Fast update= %i ms", chrono);
Serial.println(text);
mySerial..println(text);
dx = (x - myScreen.stringSizeX(text)) / 2;
myScreen.gText(dx, dy, text);
myScreen.dRectangle(0, dz * 1, x, dz, myColours.black);
Expand All @@ -112,28 +111,28 @@ void performTest()
///
void setup()
{
Serial.begin(115200);
mySerial..begin(115200);
delay(500);
Serial.println();
Serial.println("=== " __FILE__);
Serial.println("=== " __DATE__ " " __TIME__);
Serial.println();
mySerial..println();
mySerial..println("=== " __FILE__);
mySerial..println("=== " __DATE__ " " __TIME__);
mySerial..println();

Serial.println("begin... ");
mySerial..println("begin... ");
myScreen.begin();
Serial.println(formatString("%s %ix%i", myScreen.WhoAmI().c_str(), myScreen.screenSizeX(), myScreen.screenSizeY()));
mySerial..println(formatString("%s %ix%i", myScreen.WhoAmI().c_str(), myScreen.screenSizeX(), myScreen.screenSizeY()));

Serial.println("Speed... ");
mySerial..println("Speed... ");
myScreen.clear();
performTest();
wait(8);

Serial.println("White... ");
mySerial..println("White... ");
myScreen.clear();
myScreen.flush();

Serial.println("=== ");
Serial.println();
mySerial..println("=== ");
mySerial..println();
}

// Add loop code
Expand Down
45 changes: 24 additions & 21 deletions examples/Example_Fast_Temperature/Example_Fast_Temperature.ino
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
/// @details Library for Pervasive Displays EXT3 - Basic level
///
/// @author Rei Vilo
/// @date 21 Jan 2024
/// @version 704
/// @date 21 Mar 2024
/// @version 801
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
/// @copyright For exclusive use with Pervasive Displays screens
///
/// @see ReadMe.txt for references
/// @n
Expand All @@ -32,10 +33,9 @@

// Define structures and classes


// Define variables and constants
Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_271_09_Fast, boardRaspberryPiPico_RP2040);
// Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_271_09_Wide, boardRaspberryPiPico_RP2040);
Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_271_PS_09_Fast, boardRaspberryPiPico_RP2040);
// Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_271_PS_09_Wide, boardRaspberryPiPico_RP2040);

// Prototypes

Expand All @@ -47,16 +47,18 @@ void check(int8_t temperatureC, uint8_t expectedMode)
const char * stringMode[] = { "NONE", "GLOBAL", "FAST", "PARTIAL" };
myScreen.setTemperatureC(temperatureC);
uint8_t recommendedMode = myScreen.checkTemperatureMode(expectedMode);

// Raspberry Pi SDK core for RP2040
// Serial.printf("Temperature= %+3i C - Mode: %8s -> %-8s", temperatureC, stringMode[expectedMode], stringMode[recommendedMode]);
// mySerial..printf("Temperature= %+3i C - Mode: %8s -> %-8s", temperatureC, stringMode[expectedMode], stringMode[recommendedMode]);

// Arduino core for RP2040
Serial.print("Temperature= ");
Serial.print(temperatureC);
Serial.print(" C - Mode: ");
Serial.print(stringMode[expectedMode]);
Serial.print(" -> ");
Serial.print(stringMode[recommendedMode]);
Serial.println();
mySerial..print("Temperature= ");
mySerial..print(temperatureC);
mySerial..print(" C - Mode: ");
mySerial..print(stringMode[expectedMode]);
mySerial..print(" -> ");
mySerial..print(stringMode[recommendedMode]);
mySerial..println();
}

void performTest()
Expand All @@ -76,21 +78,22 @@ void performTest()
///
void setup()
{
Serial.begin(115200);
mySerial..begin(115200);

Serial.println();
Serial.println("=== " __FILE__);
Serial.println("=== " __DATE__ " " __TIME__);
Serial.println();
mySerial..println();
mySerial..println("=== " __FILE__);
mySerial..println("=== " __DATE__ " " __TIME__);
mySerial..println();

// Screen
myScreen.begin();

Serial.println(formatString("=== %s %ix%i", myScreen.WhoAmI().c_str(), myScreen.screenSizeX(), myScreen.screenSizeY()));
mySerial..println(formatString("=== %s %ix%i", myScreen.WhoAmI().c_str(), myScreen.screenSizeX(), myScreen.screenSizeY()));

performTest();

Serial.println("=== ");
Serial.println();
mySerial..println("=== ");
mySerial..println();
}

// Add loop code
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=PDLS_EXT3_Basic_Fast
version=7.0.4
version=8.0.1
author=Rei Vilo for Pervasive Displays
maintainer=Rei Vilo
sentence=Library for Pervasive Displays iTC monochrome screens with embedded fast update and EXT3-1 board
Expand Down
Loading

0 comments on commit c073bb8

Please sign in to comment.