Skip to content

Commit

Permalink
Release 8.1.0 step 1.1.2
Browse files Browse the repository at this point in the history
Including patch for issue  SiliconLabs/arduino#99
  • Loading branch information
rei-vilo committed Nov 14, 2024
1 parent 7a619e1 commit 8d229a7
Show file tree
Hide file tree
Showing 39 changed files with 262 additions and 208 deletions.
10 changes: 5 additions & 5 deletions examples/Common/Common_Colours/Common_Colours.ino
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
/// @n Based on highView technology
///
/// @author Rei Vilo
/// @date 21 Aug 2024
/// @version 805
/// @date 21 Nov 2024
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Expand All @@ -20,8 +20,8 @@
// Screen
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand Down Expand Up @@ -74,7 +74,7 @@ void displayPalette(bool flag = true)
myScreen.setOrientation(ORIENTATION_LANDSCAPE);

uint16_t x0, y0, dx, dy, maxSize, colour;
maxSize = min((myScreen.screenSizeX() * 10 / 50), (myScreen.screenSizeY() * 10 / 35));
maxSize = hV_HAL_min((myScreen.screenSizeX() * 10 / 50), (myScreen.screenSizeY() * 10 / 35));
dx = (myScreen.screenSizeX() - maxSize * 50 / 10) / 2;
dy = (myScreen.screenSizeY() - maxSize * 35 / 10) / 2;

Expand Down
8 changes: 4 additions & 4 deletions examples/Common/Common_Fonts/Common_Fonts.ino
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
/// @n Based on highView technology
///
/// @author Rei Vilo
/// @date 21 Aug 2024
/// @version 805
/// @date 21 Nov 2024
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Expand All @@ -20,8 +20,8 @@
// Screen
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand Down
10 changes: 5 additions & 5 deletions examples/Common/Common_Forms/Common_Forms.ino
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
/// @n Based on highView technology
///
/// @author Rei Vilo
/// @date 21 Aug 2024
/// @version 805
/// @date 21 Nov 2024
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Expand All @@ -20,8 +20,8 @@
// Screen
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand Down Expand Up @@ -75,7 +75,7 @@ void displayForms(bool flag = true)

uint16_t x = myScreen.screenSizeX();
uint16_t y = myScreen.screenSizeY();
uint16_t z = min(x, y);
uint16_t z = hV_HAL_min(x, y);

myScreen.setPenSolid(false);
myScreen.dRectangle(0, 0, x, y, myColours.black);
Expand Down
8 changes: 4 additions & 4 deletions examples/Common/Common_Orientation/Common_Orientation.ino
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
/// @n Based on highView technology
///
/// @author Rei Vilo
/// @date 21 Aug 2024
/// @version 805
/// @date 21 Nov 2024
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Expand All @@ -20,8 +20,8 @@
// Screen
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand Down
4 changes: 2 additions & 2 deletions examples/Common/Common_Persistent/Common_Persistent.ino
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
// Screen
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand Down
8 changes: 4 additions & 4 deletions examples/Common/Common_Text/Common_Text.ino
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
/// @n Based on highView technology
///
/// @author Rei Vilo
/// @date 21 Aug 2024
/// @version 805
/// @date 21 Nov 2024
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Expand All @@ -20,8 +20,8 @@
// Screen
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand Down
8 changes: 4 additions & 4 deletions examples/Common/Common_WhoAmI/Common_WhoAmI.ino
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
/// @n Based on highView technology
///
/// @author Rei Vilo
/// @date 21 Aug 2024
/// @version 805
/// @date 21 Nov 2024
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Expand All @@ -29,8 +29,8 @@
// Screen
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand Down
10 changes: 5 additions & 5 deletions examples/EXT4/EXT4_Accelerometer/EXT4_Accelerometer.ino
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
/// @n Based on highView technology
///
/// @author Rei Vilo
/// @date 21 Aug 2024
/// @version 108
/// @date 21 Nov 2024
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Expand All @@ -20,8 +20,8 @@
// PDLS
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand Down Expand Up @@ -182,7 +182,7 @@ void loop()
uint16_t y = myScreen.screenSizeY();
uint16_t dx = x / 2;
uint16_t dy = y / 2;
uint16_t dz = min(dx, dy) / 3;
uint16_t dz = hV_HAL_min(dx, dy) / 3;

myScreen.setPenSolid(true);
myScreen.triangle(dx, dy - dz, dx + dz, dy, dx - dz, dy, myColours.black);
Expand Down
8 changes: 4 additions & 4 deletions examples/EXT4/EXT4_LargeFont/EXT4_LargeFont.ino
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
/// @n Based on highView technology
///
/// @author Rei Vilo
/// @date 21 Aug 2024
/// @version 108
/// @date 21 Nov 2024
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Expand All @@ -28,8 +28,8 @@
// Screen
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand Down
2 changes: 1 addition & 1 deletion examples/EXT4/EXT4_WS2813C/EXT4_WS2813C.ino
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
///
/// @author Rei Vilo
/// @date 21 Nov 2024
/// @version 110
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Expand Down
12 changes: 6 additions & 6 deletions examples/EXT4/EXT4_Weather/EXT4_Weather.ino
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
/// @n Based on highView technology
///
/// @author Rei Vilo
/// @date 21 Aug 2024
/// @version 109
/// @date 21 Nov 2024
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// * 2024-06-06 Rei Vilo (Pervasive Displays)
Expand All @@ -25,8 +25,8 @@
// PDLS
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand Down Expand Up @@ -95,8 +95,8 @@ bool displayValue(uint8_t slot, String name, measure_s * value, String unit)
(*value).value = ((int32_t)(10 * (*value).value + 5)) / 10.0;
bool result = ((*value).value != (*value).oldValue);
(*value).oldValue = (*value).value;
(*value).maximum = max((*value).maximum, (*value).value);
(*value).minimum = min((*value).minimum, (*value).value);
(*value).maximum = hV_HAL_max((*value).maximum, (*value).value);
(*value).minimum = hV_HAL_min((*value).minimum, (*value).value);

myScreen.setPenSolid(true);
myScreen.setFontSolid(true);
Expand Down
8 changes: 4 additions & 4 deletions examples/EXT4/EXT4_WhoAmI/EXT4_WhoAmI.ino
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
/// @n Based on highView technology
///
/// @author Rei Vilo
/// @date 21 Aug 2024
/// @version 108
/// @date 21 Nov 2024
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Expand All @@ -20,8 +20,8 @@
// Screen
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand Down
12 changes: 6 additions & 6 deletions examples/EXT4_Matter/EXT4_Matter_RGB/EXT4_Matter_RGB.ino
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
/// @author Tamas Jozsi (Silicon Labs)
///
/// @author Rei Vilo
/// @date 21 Aug 2024
/// @version 110
/// @date 21 Nov 2024
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// * 2024-06-06 Rei Vilo (Pervasive Displays)
Expand Down Expand Up @@ -50,8 +50,8 @@ MatterColorLightbulb myMatterRGB;
// PDLS
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand All @@ -76,7 +76,7 @@ pins_t myBoard = boardArduinoNanoMatter;
Screen_EPD_EXT4_Fast myScreen(eScreen_EPD_290_KS_0F, myBoard);

#define MATTER_EXAMPLE_NAME "Matter RGB"
#define MATTER_EXAMPLE_RELEASE 109
#define MATTER_EXAMPLE_RELEASE 810

// WS2813
ezWS2812gpio myRGB(1, myBoard.ledData);
Expand Down Expand Up @@ -178,7 +178,7 @@ void displayQR(const char * code)
uint16_t x = myScreen.screenSizeX();
uint16_t y = myScreen.screenSizeY();
uint8_t k = qrcode.size;
uint16_t dxy = min(x, y);
uint16_t dxy = hV_HAL_min(x, y);
uint16_t dz = dxy / k;
uint16_t dxy0 = (dxy - k * dz) / 2;
uint16_t dx0 = x - dxy + dxy0;
Expand Down
16 changes: 8 additions & 8 deletions examples/EXT4_Matter/EXT4_Matter_Weather/EXT4_Matter_Weather.ino
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
/// @author Tamas Jozsi (Silicon Labs)
///
/// @author Rei Vilo
/// @date 21 Aug 2024
/// @version 109
/// @date 21 Nov 2024
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// * 2024-06-06 Rei Vilo (Pervasive Displays)
Expand Down Expand Up @@ -53,8 +53,8 @@ MatterHumidity myMatterHumidity;
// PDLS
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand All @@ -79,7 +79,7 @@ pins_t myBoard = boardArduinoNanoMatter;
Screen_EPD_EXT4_Fast myScreen(eScreen_EPD_290_KS_0F, myBoard);

#define MATTER_EXAMPLE_NAME "Matter Weather"
#define MATTER_EXAMPLE_RELEASE 109
#define MATTER_EXAMPLE_RELEASE 810

// HDC2080

Expand Down Expand Up @@ -194,7 +194,7 @@ void displayQR(const char * code)
uint16_t x = myScreen.screenSizeX();
uint16_t y = myScreen.screenSizeY();
uint8_t k = qrcode.size;
uint16_t dxy = min(x, y);
uint16_t dxy = hV_HAL_min(x, y);
uint16_t dz = dxy / k;
uint16_t dxy0 = (dxy - k * dz) / 2;
uint16_t dx0 = x - dxy + dxy0;
Expand Down Expand Up @@ -230,8 +230,8 @@ bool displayValue(uint8_t slot, String name, measure_s * value, String unit)
(*value).value = ((int32_t)(10 * (*value).value + 5)) / 10.0;
bool result = ((*value).value != (*value).oldValue);
(*value).oldValue = (*value).value;
(*value).maximum = max((*value).maximum, (*value).value);
(*value).minimum = min((*value).minimum, (*value).value);
(*value).maximum = hV_HAL_max((*value).maximum, (*value).value);
(*value).minimum = hV_HAL_min((*value).minimum, (*value).value);

myScreen.setPenSolid(true);
myScreen.setFontSolid(true);
Expand Down
8 changes: 4 additions & 4 deletions examples/Fast/Fast_Line/Fast_Line.ino
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
/// @details Library for Pervasive Displays EXT3 - Basic level
///
/// @author Rei Vilo
/// @date 21 Aug 2024
/// @version 805
/// @date 21 Nov 2024
/// @version 810
///
/// @copyright (c) Rei Vilo, 2010-2024
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Expand All @@ -19,8 +19,8 @@
// Screen
#include "PDLS_EXT4_Basic_Matter.h"

#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 805)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 805
#if (PDLS_EXT4_BASIC_MATTER_RELEASE < 810)
#error Required PDLS_EXT4_BASIC_MATTER_RELEASE 810
#endif // PDLS_EXT4_BASIC_MATTER_RELEASE

// SDK
Expand Down
Loading

0 comments on commit 8d229a7

Please sign in to comment.