Skip to content
This repository has been archived by the owner on Feb 12, 2025. It is now read-only.

Commit

Permalink
Release 6.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@rei-vilo
rei-vilo committed Aug 31, 2023
1 parent ee33c3e commit b0b49d5
Show file tree
Hide file tree
Showing 9 changed files with 207 additions and 192 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Hardware

Software

* Wiring-Arduino SDK
* Arduino SDK
* SPI library

Hardware
Expand All @@ -55,8 +55,8 @@ Hardware

## Licence

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

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

![](img/by-sa.svg)
172 changes: 28 additions & 144 deletions examples/BWRY_Colours/BWRY_Colours.ino
View file
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 Jun 2023
/// @version 611
/// @date 31 Aug 2023
/// @version 614
///
/// @copyright (c) Rei Vilo, 2010-2023
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Expand All @@ -24,8 +24,9 @@
#endif // SDK

// Set parameters
#define DISPLAY_PALETTE_BWRY 0
#define DISPLAY_COLOURS_BWRY 1
#define DISPLAY_CONTRASTS_BWRY 0
#define DISPLAY_PALETTE_BWRY 0

// Include application, user and local libraries
#include "SPI.h"
Expand Down Expand Up @@ -56,155 +57,39 @@ void wait(uint8_t second)
}

// Functions
#if (DISPLAY_PALETTE_BWRY == 1)
#if (DISPLAY_COLOURS_BWRY == 1)

void displayPaletteBWRY()
void displayColoursBWRY()
{
// Grid = 5
// . . . Y Y
// . . R O R
// . W lR lY W
// B G dR dY B
// B W R Y

// Grid = 4
// . . . Y
// . . R O
// . W lR lY
// B G dR dY

const uint8_t grid = 4; // 4 or 5

myScreen.setOrientation(ORIENTATION_PORTRAIT);
myScreen.setPenSolid(false);
myScreen.selectFont(Font_Terminal8x12);

uint16_t x0, y0, dx, dy, dz;
uint16_t x, y, dx, dy;

const uint8_t grid = 4; // 4 or 5

dz = min(myScreen.screenSizeX(), myScreen.screenSizeY()) / grid;
x0 = (myScreen.screenSizeX() - dz * grid) / 2;
y0 = (myScreen.screenSizeY() - dz * grid) / 2;
x = myScreen.screenSizeX();
y = myScreen.screenSizeY();
dx = x / 1;
dy = y / 4;

myScreen.setPenSolid(true);
if (grid > 4)
{
myScreen.dRectangle(x0 + dz * 0, y0 + dz * 4, dz, dz, myColours.black);
myScreen.dRectangle(x0 + dz * 1, y0 + dz * 4, dz, dz, myColours.white);
myScreen.dRectangle(x0 + dz * 2, y0 + dz * 4, dz, dz, myColours.red);
myScreen.dRectangle(x0 + dz * 3, y0 + dz * 4, dz, dz, myColours.yellow);
}
myScreen.dRectangle(x0 + dz * 0, y0 + dz * 3, dz, dz, myColours.black);
myScreen.dRectangle(x0 + dz * 1, y0 + dz * 3, dz, dz, myColours.grey);
myScreen.dRectangle(x0 + dz * 2, y0 + dz * 3, dz, dz, myColours.darkRed);
myScreen.dRectangle(x0 + dz * 3, y0 + dz * 3, dz, dz, myColours.darkYellow);
if (grid > 4)
{
myScreen.dRectangle(x0 + dz * 4, y0 + dz * 3, dz, dz, myColours.black);
}

myScreen.dRectangle(x0 + dz * 1, y0 + dz * 2, dz, dz, myColours.white);
myScreen.dRectangle(x0 + dz * 2, y0 + dz * 2, dz, dz, myColours.lightRed);
myScreen.dRectangle(x0 + dz * 3, y0 + dz * 2, dz, dz, myColours.lightYellow);
if (grid > 4)
{
myScreen.dRectangle(x0 + dz * 4, y0 + dz * 2, dz, dz, myColours.white);
}

myScreen.dRectangle(x0 + dz * 2, y0 + dz * 1, dz, dz, myColours.red);
myScreen.dRectangle(x0 + dz * 3, y0 + dz * 1, dz, dz, myColours.orange);
if (grid > 4)
{
myScreen.dRectangle(x0 + dz * 4, y0 + dz * 1, dz, dz, myColours.red);
}

myScreen.dRectangle(x0 + dz * 3, y0 + dz * 0, dz, dz, myColours.yellow);
if (grid > 4)
{
myScreen.dRectangle(x0 + dz * 4, y0 + dz * 0, dz, dz, myColours.yellow);
}

myScreen.setPenSolid(false);
if (grid > 4)
{
myScreen.dRectangle(x0 + dz * 0 + 2, y0 + dz * 4 + 2, dz - 4, dz - 4, myColours.white);
myScreen.dRectangle(x0 + dz * 1 + 2, y0 + dz * 4 + 2, dz - 4, dz - 4, myColours.black);
myScreen.dRectangle(x0 + dz * 2 + 2, y0 + dz * 4 + 2, dz - 4, dz - 4, myColours.white);
myScreen.dRectangle(x0 + dz * 3 + 2, y0 + dz * 4 + 2, dz - 4, dz - 4, myColours.black);
}
myScreen.dRectangle(x0 + dz * 0 + 2, y0 + dz * 3 + 2, dz - 4, dz - 4, myColours.white);
myScreen.dRectangle(x0 + dz * 1 + 2, y0 + dz * 3 + 2, dz - 4, dz - 4, myColours.white);
myScreen.dRectangle(x0 + dz * 2 + 2, y0 + dz * 3 + 2, dz - 4, dz - 4, myColours.white);
myScreen.dRectangle(x0 + dz * 3 + 2, y0 + dz * 3 + 2, dz - 4, dz - 4, myColours.white);
if (grid > 4)
{
myScreen.dRectangle(x0 + dz * 4 + 2, y0 + dz * 3 + 2, dz - 4, dz - 4, myColours.white);
}

myScreen.dRectangle(x0 + dz * 1 + 2, y0 + dz * 2 + 2, dz - 4, dz - 4, myColours.black);
myScreen.dRectangle(x0 + dz * 2 + 2, y0 + dz * 2 + 2, dz - 4, dz - 4, myColours.black);
myScreen.dRectangle(x0 + dz * 3 + 2, y0 + dz * 2 + 2, dz - 4, dz - 4, myColours.black);
if (grid > 4)
{
myScreen.dRectangle(x0 + dz * 4 + 2, y0 + dz * 2 + 2, dz - 4, dz - 4, myColours.black);
}

myScreen.dRectangle(x0 + dz * 2 + 2, y0 + dz * 1 + 2, dz - 4, dz - 4, myColours.white);
myScreen.dRectangle(x0 + dz * 3 + 2, y0 + dz * 1 + 2, dz - 4, dz - 4, myColours.white);
if (grid > 4)
{
myScreen.dRectangle(x0 + dz * 4 + 2, y0 + dz * 1 + 2, dz - 4, dz - 4, myColours.white);
}

myScreen.dRectangle(x0 + dz * 3 + 2, y0 + dz * 0 + 2, dz - 4, dz - 4, myColours.black);
if (grid > 4)
{
myScreen.dRectangle(x0 + dz * 4 + 2, y0 + dz * 0 + 2, dz - 4, dz - 4, myColours.black);
}
myScreen.dRectangle(dx * 0, dy * 0, dx, dy, myColours.black);
myScreen.dRectangle(dx * 0, dy * 1, dx, dy, myColours.white);
myScreen.dRectangle(dx * 0, dy * 2, dx, dy, myColours.red);
myScreen.dRectangle(dx * 0, dy * 3, dx, dy, myColours.yellow);

myScreen.setFontSolid(false);
myScreen.selectFont(Font_Terminal8x12);

if (grid > 4)
{
myScreen.gText(x0 + dz * 0 + 4, y0 + dz * 4 + 4, "B", myColours.white);
myScreen.gText(x0 + dz * 1 + 4, y0 + dz * 4 + 4, "W", myColours.black);
myScreen.gText(x0 + dz * 2 + 4, y0 + dz * 4 + 4, "R", myColours.white);
myScreen.gText(x0 + dz * 3 + 4, y0 + dz * 4 + 4, "Y", myColours.black);
}
myScreen.gText(x0 + dz * 0 + 4, y0 + dz * 3 + 4, "B", myColours.white);
myScreen.gText(x0 + dz * 1 + 4, y0 + dz * 3 + 4, "G", myColours.white);
myScreen.gText(x0 + dz * 2 + 4, y0 + dz * 3 + 4, "dR", myColours.white);
myScreen.gText(x0 + dz * 3 + 4, y0 + dz * 3 + 4, "dY", myColours.white);
if (grid > 4)
{
myScreen.gText(x0 + dz * 4 + 4, y0 + dz * 3 + 4, "B", myColours.white);
}

myScreen.gText(x0 + dz * 1 + 4, y0 + dz * 2 + 4, "W", myColours.black);
myScreen.gText(x0 + dz * 2 + 4, y0 + dz * 2 + 4, "lR", myColours.black);
myScreen.gText(x0 + dz * 3 + 4, y0 + dz * 2 + 4, "lY", myColours.black);
if (grid > 4)
{
myScreen.gText(x0 + dz * 4 + 4, y0 + dz * 2 + 4, "W", myColours.black);
}

myScreen.gText(x0 + dz * 2 + 4, y0 + dz * 1 + 4, "R", myColours.white);
myScreen.gText(x0 + dz * 3 + 4, y0 + dz * 1 + 4, "O", myColours.white);
if (grid > 4)
{
myScreen.gText(x0 + dz * 4 + 4, y0 + dz * 1 + 4, "R", myColours.white);
}

myScreen.gText(x0 + dz * 3 + 4, y0 + dz * 0 + 4, "Y", myColours.black);
if (grid > 4)
{
myScreen.gText(x0 + dz * 4 + 4, y0 + dz * 0 + 4, "Y", myColours.black);
}
myScreen.gText(dx * 0 + 4, dy * 0 + 4, "Black", myColours.white);
myScreen.gText(dx * 0 + 4, dy * 1 + 4, "White", myColours.black);
myScreen.gText(dx * 0 + 4, dy * 2 + 4, "Red", myColours.white);
myScreen.gText(dx * 0 + 4, dy * 3 + 4, "Yellow", myColours.black);

myScreen.flush();
}

#endif // DISPLAY_PALETTE_BWRY
#endif // DISPLAY_COLOURS_BWRY

// Add setup code
void setup()
Expand All @@ -222,13 +107,15 @@ void setup()

#if (DISPLAY_COLOURS_BWRY == 1)

Serial.print("Palette BWRY... ");
Serial.print("DISPLAY_COLOURS_BWRY... ");
myScreen.clear();
displayPaletteBWRY();
Serial.println("done");
displayColoursBWRY();

wait(8);

#endif // DISPLAY_PALETTE_BWRY
Serial.println("done");

#endif // DISPLAY_COLOURS_BWRY

Serial.print("White... ");
myScreen.clear();
Expand All @@ -243,9 +130,6 @@ void setup()
}

// Add loop code
///
/// @brief Loop, empty
///
void loop()
{
delay(1000);
Expand Down
15 changes: 12 additions & 3 deletions examples/BWRY_Contrast/BWRY_Contrast.ino
View file
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 Jun 2023
/// @version 611
/// @date 31 Aug 2023
/// @version 614
///
/// @copyright (c) Rei Vilo, 2010-2023
/// @copyright Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Expand All @@ -24,6 +24,9 @@
#endif // SDK

// Set parameters
#define DISPLAY_COLOURS_BWRY 0
#define DISPLAY_CONTRASTS_BWRY 1
#define DISPLAY_PALETTE_BWRY 0

// Include application, user and local libraries
#include "SPI.h"
Expand Down Expand Up @@ -54,6 +57,7 @@ void wait(uint8_t second)
}

// Functions
#if (DISPLAY_CONTRASTS_BWRY == 1)
///
/// @brief Palette test screen
///
Expand Down Expand Up @@ -89,6 +93,7 @@ void displayContrastBWRY()

myScreen.flush();
}
#endif // DISPLAY_CONTRASTS_BWRY

// Add setup code
///
Expand All @@ -107,11 +112,15 @@ void setup()
myScreen.begin();
Serial.println(formatString("%s %ix%i", myScreen.WhoAmI().c_str(), myScreen.screenSizeX(), myScreen.screenSizeY()));

Serial.print("Contrasts BWRY... ");
#if (DISPLAY_CONTRASTS_BWRY == 1)

Serial.print("DISPLAY_CONTRASTS_BWRY... ");
myScreen.clear();
displayContrastBWRY();
wait(8);

#endif // DISPLAY_CONTRASTS_BWRY

Serial.print("White... ");
myScreen.clear();
myScreen.flush();
Expand Down
Loading

0 comments on commit b0b49d5

Please sign in to comment.