From f5a7a445460e87b240fd98d396e8da1c8679d5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Wed, 7 Aug 2019 10:51:52 +0200
Subject: [PATCH] [apps/ion] Factorize code and TODO

---
 apps/shared/post_and_hardware_tests.cpp   | 7 ++++---
 ion/include/ion/display.h                 | 2 +-
 ion/src/device/shared/drivers/display.cpp | 8 +++-----
 ion/src/shared/dummy/display.cpp          | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/apps/shared/post_and_hardware_tests.cpp b/apps/shared/post_and_hardware_tests.cpp
index a906998ee..bac803a24 100644
--- a/apps/shared/post_and_hardware_tests.cpp
+++ b/apps/shared/post_and_hardware_tests.cpp
@@ -25,11 +25,12 @@ int POSTAndHardwareTests::LCDDataGlyphFailures() {
 
 int POSTAndHardwareTests::LCDTimingGlyphFailures() {
   int numberOfFailures = 0;
+  const int rootNumberTiles = 3; //TODO 1 ?
   for (int i = 0; i < 100; i++) {
-    Ion::Display::POSTPushMulticolor(k_stampSize);
+    Ion::Display::POSTPushMulticolor(rootNumberTiles, k_stampSize);
     KDColor stamp[k_stampSize*k_stampSize];
-    for (int i = 0; i < 3; i++) { // TODO LEA 1?
-      for (int j = 0; j < 3; j++) {
+    for (int i = 0; i < rootNumberTiles; i++) {
+      for (int j = 0; j < rootNumberTiles; j++) {
         Ion::Display::pullRect(KDRect(i * k_stampSize, j * k_stampSize, k_stampSize, k_stampSize), stamp);
         int shift = (i+j) % 16;
         uint16_t color = (uint16_t)(1 << shift);
diff --git a/ion/include/ion/display.h b/ion/include/ion/display.h
index af98239a3..1b7f32508 100644
--- a/ion/include/ion/display.h
+++ b/ion/include/ion/display.h
@@ -31,7 +31,7 @@ constexpr int HeightInTenthOfMillimeter = 432;
 // For Power On Self tests
 int displayUniformTilingSize10(KDColor c);
 int displayColoredTilingSize10();
-void POSTPushMulticolor(int tileSize);
+void POSTPushMulticolor(int rootNumberTiles, int tileSize);
 
 }
 }
diff --git a/ion/src/device/shared/drivers/display.cpp b/ion/src/device/shared/drivers/display.cpp
index 9be12f4d6..fd3589d80 100644
--- a/ion/src/device/shared/drivers/display.cpp
+++ b/ion/src/device/shared/drivers/display.cpp
@@ -86,11 +86,9 @@ bool waitForVBlank() {
   return false;
 }
 
-void POSTPushMulticolor(int tileSize) {
-  const int maxI = 3; // TODO 1 ?
-  const int maxJ = 3;
-  for (int i = 0; i < maxI; i++) {
-    for (int j = 0; j < maxJ; j++) {
+void POSTPushMulticolor(int rootNumberTiles, int tileSize) {
+  for (int i = 0; i < rootNumberTiles; i++) {
+    for (int j = 0; j < rootNumberTiles; j++) {
       uint16_t k = (i+j) % 16;
       uint16_t color = 1 << k;
       setDrawingArea(KDRect(i*tileSize,j*tileSize,tileSize, tileSize), Orientation::Landscape);
diff --git a/ion/src/shared/dummy/display.cpp b/ion/src/shared/dummy/display.cpp
index 0b97ea83e..cd1096b78 100644
--- a/ion/src/shared/dummy/display.cpp
+++ b/ion/src/shared/dummy/display.cpp
@@ -1,6 +1,6 @@
 #include <ion/display.h>
 
-void Ion::Display::POSTPushMulticolor(int tileSize) {
+void Ion::Display::POSTPushMulticolor(int rootNumberTiles, int tileSize) {
 }
 
 int displayUniformTilingSize10(KDColor c) {