From 72cfa9aa64ea6b1bee3dd1622d849e5b59906d64 Mon Sep 17 00:00:00 2001
From: Fisch <interfisch@gmx.net>
Date: Tue, 7 Feb 2023 18:37:23 +0100
Subject: [PATCH] connect two modules

---
 .../driverboardAnnax37623.kicad_sch           |  5 +++++
 flipcontrol_esp32/include/flipdot.h           |  4 ++--
 flipcontrol_esp32/src/flipdot.cpp             | 12 +++++------
 flipcontrol_esp32/src/main.cpp                | 21 +++++++++++--------
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/driverboardAnnax37623/driverboardAnnax37623.kicad_sch b/driverboardAnnax37623/driverboardAnnax37623.kicad_sch
index 664107e..1a40d87 100644
--- a/driverboardAnnax37623/driverboardAnnax37623.kicad_sch
+++ b/driverboardAnnax37623/driverboardAnnax37623.kicad_sch
@@ -3246,6 +3246,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 4b83862e-3ecd-4e46-936d-eb3c75672377)
   )
+  (text "Current: flipping one column to black takes 0.5A @14V"
+    (at 118.745 28.575 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid aedcc90b-4037-4ab7-8ee6-c99244473a5a)
+  )
   (text "Prüfen, ob 1k reicht oder wirklich 500 ohm notwendig für clock"
     (at 274.32 59.055 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
diff --git a/flipcontrol_esp32/include/flipdot.h b/flipcontrol_esp32/include/flipdot.h
index d6ca7d4..780ffdb 100644
--- a/flipcontrol_esp32/include/flipdot.h
+++ b/flipcontrol_esp32/include/flipdot.h
@@ -29,8 +29,8 @@ D3 - _clear
 #define PIN_DRIVE 25 //enables 12v to panels via transistor
 #define PIN_CLEAR 12 //connects CLEAR Pin from Annax board to GND (clears column)
 
-#define NUMPANELS 1
-#define COLUMNBYTES 7 //4 columns per byte. one panel has 25 columns
+//#define NUMPANELS 1
+#define COLUMNBYTES 13 //4 columns per byte. one panel has 25 columns.  (int)((numpanels*25)/4+1)
 
 
 //### Timings ###
diff --git a/flipcontrol_esp32/src/flipdot.cpp b/flipcontrol_esp32/src/flipdot.cpp
index 4d9b7ab..b03915c 100644
--- a/flipcontrol_esp32/src/flipdot.cpp
+++ b/flipcontrol_esp32/src/flipdot.cpp
@@ -67,7 +67,7 @@ bool Flipdot::clearSelectedColumn() {
     if (row!=0) {
         return 0; //error. row is selected (short circuit!)
     }
-    for (uint8_t cc=0;cc<7;cc++) {
+    for (uint8_t cc=0;cc<COLUMNBYTES;cc++) {
         //Serial.print("checking cc="); Serial.println(cc);
         for (uint8_t i=0;i<8;i+=2) {
             if (CHECK_BIT(col[cc],i)) {
@@ -88,7 +88,7 @@ bool Flipdot::clearSelectedColumn() {
 
 bool Flipdot::setSelectedDot() {
     
-    for (uint8_t cc=0;cc<7;cc++) {
+    for (uint8_t cc=0;cc<COLUMNBYTES;cc++) {
         //Serial.print("checking cc="); Serial.println(cc);
         for (uint8_t i=1;i<8;i+=2) {
             if (CHECK_BIT(col[cc],i)) {
@@ -112,7 +112,7 @@ bool Flipdot::setSelectedDot() {
 }
 
 bool Flipdot::HBridgeOK() {
-    for (uint8_t cc=0;cc<7;cc++) {
+    for (uint8_t cc=0;cc<COLUMNBYTES;cc++) {
         //Serial.print("checking cc="); Serial.println(cc);
         for (uint8_t i=0;i<8;i+=2) {
             if (CHECK_BIT(col[cc],i) && CHECK_BIT(col[cc],i+1)) {
@@ -136,13 +136,13 @@ void Flipdot::shiftData() { //send out all data to shift registers
     digitalWrite(PIN_LATCH, LOW);
 
     //Select Columns via Shift registers
-    for (uint8_t i=0;i<7;i++) {
-        shiftOutSlow(PIN_DATA_DRVBRD, PIN_CLK_DRVBRD, LSBFIRST, col[6-i]);
+    for (uint8_t i=0;i<COLUMNBYTES;i++) { //adsf: previously i<7
+        shiftOutSlow(PIN_DATA_DRVBRD, PIN_CLK_DRVBRD, LSBFIRST, col[COLUMNBYTES-1-i]); //asdf previously col·[6-i]
     }
 }
 
 void Flipdot::resetColumns() {
-    for (uint8_t i=0;i<7;i++) {
+    for (uint8_t i=0;i<COLUMNBYTES;i++) {
         col[i]=0;
     }
 }
\ No newline at end of file
diff --git a/flipcontrol_esp32/src/main.cpp b/flipcontrol_esp32/src/main.cpp
index d90ddba..91df1dd 100644
--- a/flipcontrol_esp32/src/main.cpp
+++ b/flipcontrol_esp32/src/main.cpp
@@ -26,21 +26,24 @@ void loop_drawClearTest();
 void loop() {
     loopmillis = millis();
     
-    //loop_drawClearTest();
-    loop_testDots();
+    loop_drawClearTest();
+    //loop_testDots();
 
 
     
 }
 
+#define COLUMNS 50
+#define ROWS 16
+
 void loop_testDots() {
 
     static bool init=false;
     if (!init) {
         flipdot.row=0;
         Serial.println("Clearing Display");
-        for (int l=0;l<25;l++) {
-            flipdot.selectColumnClear(l%25);
+        for (int l=0;l<COLUMNS;l++) {
+            flipdot.selectColumnClear(l%COLUMNS);
 
             flipdot.shiftData();
 
@@ -105,8 +108,8 @@ void loop_drawClearTest() {
     if (!init) {
         flipdot.row=0;
         Serial.println("Clearing Display");
-        for (int l=0;l<25;l++) {
-            flipdot.selectColumnClear(l%25);
+        for (int l=0;l<COLUMNS;l++) {
+            flipdot.selectColumnClear(l%COLUMNS);
 
             flipdot.shiftData();
 
@@ -137,8 +140,8 @@ void loop_drawClearTest() {
 
 
         //cycle testing set dots        
-        flipdot.selectColumnSet(countz/16); //lower column number is on the left
-        flipdot.row=pow(2, (countz)%16);//low significant bits are lower rows (when connector at top)
+        flipdot.selectColumnSet(countz/ROWS); //lower column number is on the left
+        flipdot.row=pow(2, (countz)%ROWS);//low significant bits are lower rows (when connector at top)
     
         
         
@@ -166,7 +169,7 @@ void loop_drawClearTest() {
         last_update=loopmillis;
         countz++;
 
-        if (countz>=16*25) {
+        if (countz>=ROWS*COLUMNS) {
             countz=0;
             init=false;
         }