UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/post_and_hardware_tests] Clean code

Browse Source
This commit is contained in:
Léa Saviot
2019-04-30 17:14:47 +02:00
parent c388d9bb4c
commit 7c9747da64
2 changed files with 29 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
apps/shared/post_and_hardware_tests.cpp
View File

@@ -1,7 +1,6 @@
#include "post_and_hardware_tests.h"
#include <ion/backlight.h>
#include <ion/battery.h>
#include <ion/display.h>
#include <ion/timing.h>
namespace Shared {
@@ -58,51 +57,32 @@ void POSTAndHardwareTests::ColorPixelBuffer(KDColor * pixels, int numberOfPixels
}
bool POSTAndHardwareTests::TestDisplayColorTiling(KDColor c) {
constexpr int stampHeight = 10;
constexpr int stampWidth = 10;
static_assert(Ion::Display::Width % stampWidth == 0, "Stamps must tesselate the display");
static_assert(Ion::Display::Height % stampHeight == 0, "Stamps must tesselate the display");
static_assert(stampHeight % 2 == 0 || stampWidth % 2 == 0, "Even number of XOR needed.");
KDColor stamp[stampWidth*stampHeight];
KDColor stamp[k_stampWidth*k_stampHeight];
// Tiling test with pushRect
ColorPixelBuffer(stamp, stampWidth * stampHeight, c);
for (int i = 0; i < Ion::Display::Width / stampWidth; i++) {
for (int j = 0; j < Ion::Display::Height / stampHeight; j++) {
Ion::Display::pushRect(KDRect(i * stampWidth, j * stampHeight, stampWidth, stampHeight), stamp);
ColorPixelBuffer(stamp, k_stampWidth * k_stampHeight, c);
for (int i = 0; i < Ion::Display::Width / k_stampWidth; i++) {
for (int j = 0; j < Ion::Display::Height / k_stampHeight; j++) {
Ion::Display::pushRect(KDRect(i * k_stampWidth, j * k_stampHeight, k_stampWidth, k_stampHeight), stamp);
}
}
return NumberOfNonColoredPixels(c) <= k_invalidPixelsLimit;
}
bool POSTAndHardwareTests::TestDisplayColorUniform(KDColor c) {
constexpr int stampHeight = 10;
constexpr int stampWidth = 10;
static_assert(Ion::Display::Width % stampWidth == 0, "Stamps must tesselate the display");
static_assert(Ion::Display::Height % stampHeight == 0, "Stamps must tesselate the display");
static_assert(stampHeight % 2 == 0 || stampWidth % 2 == 0, "Even number of XOR needed.");
// Test with pushRectUniform
Ion::Display::pushRectUniform(KDRect(KDPointZero, Ion::Display::Width, Ion::Display::Height), c);
return NumberOfNonColoredPixels(c) < k_invalidPixelsLimit;
}
int POSTAndHardwareTests::NumberOfNonColoredPixels(KDColor wantedColor) {
constexpr int stampHeight = 10;
constexpr int stampWidth = 10;
static_assert(Ion::Display::Width % stampWidth == 0, "Stamps must tesselate the display");
static_assert(Ion::Display::Height % stampHeight == 0, "Stamps must tesselate the display");
static_assert(stampHeight % 2 == 0 || stampWidth % 2 == 0, "Even number of XOR needed.");
KDColor stamp[stampWidth*stampHeight];
KDColor stamp[k_stampWidth*k_stampHeight];
int numberOfInvalidPixels = 0;
for (int i = 0; i < Ion::Display::Width / stampWidth; i++) {
for (int j = 0; j < Ion::Display::Height / stampHeight; j++) {
ColorPixelBuffer(stamp, stampWidth * stampHeight, wantedColor == KDColorBlack ? KDColorRed : KDColorBlack);
Ion::Display::pullRect(KDRect(i * stampWidth, j * stampHeight, stampWidth, stampHeight), stamp);
for (int k = 0; k < stampWidth * stampHeight; k++) {
for (int i = 0; i < Ion::Display::Width / k_stampWidth; i++) {
for (int j = 0; j < Ion::Display::Height / k_stampHeight; j++) {
ColorPixelBuffer(stamp, k_stampWidth * k_stampHeight, wantedColor == KDColorBlack ? KDColorRed : KDColorBlack);
Ion::Display::pullRect(KDRect(i * k_stampWidth, j * k_stampHeight, k_stampWidth, k_stampHeight), stamp);
for (int k = 0; k < k_stampWidth * k_stampHeight; k++) {
if (stamp[k] != wantedColor) {
numberOfInvalidPixels++;
}
@@ -114,17 +94,12 @@ int POSTAndHardwareTests::NumberOfNonColoredPixels(KDColor wantedColor) {
bool POSTAndHardwareTests::TestDisplayBlackWhite() {
Ion::Display::POSTPushBlackWhite();
constexpr int stampHeight = Ion::Display::Height;
constexpr int stampWidth = 2;
static_assert(Ion::Display::Width % stampWidth == 0, "Stamps must tesselate the display");
static_assert(Ion::Display::Height % stampHeight == 0, "Stamps must tesselate the display");
static_assert(stampHeight % 2 == 0 || stampWidth % 2 == 0, "Even number of XOR needed.");
KDColor stamp[stampWidth*stampHeight];
KDColor stamp[k_stampWidth*k_stampHeight];
int numberOfInvalidPixels = 0;
for (int i = 0; i < Ion::Display::Width/stampWidth; i++) {
ColorPixelBuffer(stamp, stampWidth * stampHeight, KDColorRed);
Ion::Display::pullRect(KDRect(i*stampWidth, 0, stampWidth, stampHeight), stamp);
for (int k = 0; k < stampWidth * stampHeight; k++) {
for (int i = 0; i < Ion::Display::Width/k_stampWidth; i++) {
ColorPixelBuffer(stamp, k_stampWidth * k_stampHeight, KDColorRed);
Ion::Display::pullRect(KDRect(i*k_stampWidth, 0, k_stampWidth, k_stampHeight), stamp);
for (int k = 0; k < k_stampWidth * k_stampHeight; k++) {
if (stamp[k] != ((k%2 == 0) ? KDColorWhite : KDColorBlack)) {
numberOfInvalidPixels++;
}
@@ -142,31 +117,24 @@ KDColor colorSequence(bool reset) {
}
bool POSTAndHardwareTests::TestDisplayMulticolor() {
constexpr int stampHeight = 10;
constexpr int stampWidth = 10;
static_assert(Ion::Display::Width % stampWidth == 0, "Stamps must tesselate the display");
static_assert(Ion::Display::Height % stampHeight == 0, "Stamps must tesselate the display");
static_assert(stampHeight % 2 == 0 || stampWidth % 2 == 0, "Even number of XOR needed.");
constexpr int numberOfPixels = stampWidth*stampHeight;
constexpr int numberOfPixels = k_stampWidth*k_stampHeight;
KDColor stamp[numberOfPixels];
colorSequence(true);
// Multi-colouring of the display
for (int i = 0; i < Ion::Display::Width / stampWidth; i++) {
for (int j = 0; j < Ion::Display::Height / stampHeight; j++) {
for (int i = 0; i < Ion::Display::Width / k_stampWidth; i++) {
for (int j = 0; j < Ion::Display::Height / k_stampHeight; j++) {
for (int k = 0; k < numberOfPixels; k++) {
stamp[k] = colorSequence(false);
}
Ion::Display::pushRect(KDRect(i * stampWidth, j * stampHeight, stampWidth, stampHeight), stamp);
Ion::Display::pushRect(KDRect(i * k_stampWidth, j * k_stampHeight, k_stampWidth, k_stampHeight), stamp);
}
}
// Check the data is ok
colorSequence(true);
int numberOfInvalidPixels = 0;
for (int i = 0; i < Ion::Display::Width / stampWidth; i++) {
for (int j = 0; j < Ion::Display::Height / stampHeight; j++) {
Ion::Display::pullRect(KDRect(i * stampWidth, j * stampHeight, stampWidth, stampHeight), stamp);
for (int i = 0; i < Ion::Display::Width / k_stampWidth; i++) {
for (int j = 0; j < Ion::Display::Height / k_stampHeight; j++) {
Ion::Display::pullRect(KDRect(i * k_stampWidth, j * k_stampHeight, k_stampWidth, k_stampHeight), stamp);
for (int k = 0; k < numberOfPixels; k++) {
if (stamp[k] != colorSequence(false)) {
numberOfInvalidPixels++;

6
apps/shared/post_and_hardware_tests.h
View File

@@ -2,6 +2,7 @@
#define SHARED_POST_AND_HARDWARE_TESTS_H
#include <kandinsky/color.h>
#include <ion/display.h>
namespace Shared {
@@ -12,7 +13,12 @@ public:
static bool FastLCDDataOK();
static bool LCDDataOK();
private:
constexpr static int k_stampHeight = 10;
constexpr static int k_stampWidth = 10;
constexpr static int k_invalidPixelsLimit = 2;
static_assert(Ion::Display::Width % k_stampWidth == 0, "Stamps must tesselate the display");
static_assert(Ion::Display::Height % k_stampHeight == 0, "Stamps must tesselate the display");
static_assert(k_stampHeight % 2 == 0 || k_stampWidth % 2 == 0, "Even number of XOR needed.");
static void ColorPixelBuffer(KDColor * pixels, int numberOfPixels, KDColor c);
static bool TestDisplayColorTiling(KDColor c);
static bool TestDisplayColorUniform(KDColor c);