Slowed down sending data to chips

Architeuthis-Flux · Mar 4, 2024 · f5d4171 · f5d4171
1 parent c0c3cf4
commit f5d4171
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 52 deletions.
diff --git a/JumperlessNano/src/CH446Q.cpp b/JumperlessNano/src/CH446Q.cpp
@@ -28,81 +28,81 @@ void isrFromPio(void)
   {
   case CHIP_A:
   {
-    digitalWriteFast(CS_A, HIGH);
+    digitalWrite(CS_A, HIGH);
     break;
   }
   case CHIP_B:
   {
-    digitalWriteFast(CS_B, HIGH);
+    digitalWrite(CS_B, HIGH);
     break;
   }
   case CHIP_C:
   {
-    digitalWriteFast(CS_C, HIGH);
+    digitalWrite(CS_C, HIGH);
     break;
   }
   case CHIP_D:
   {
-    digitalWriteFast(CS_D, HIGH);
+    digitalWrite(CS_D, HIGH);
     break;
   }
   case CHIP_E:
   {
-    digitalWriteFast(CS_E, HIGH);
+    digitalWrite(CS_E, HIGH);
     break;
   }
   case CHIP_F:
   {
-    digitalWriteFast(CS_F, HIGH);
+    digitalWrite(CS_F, HIGH);
     break;
   }
   case CHIP_G:
   {
-    digitalWriteFast(CS_G, HIGH);
+    digitalWrite(CS_G, HIGH);
     break;
   }
   case CHIP_H:
   {
-    digitalWriteFast(CS_H, HIGH);
+    digitalWrite(CS_H, HIGH);
     break;
   }
   case CHIP_I:
   {
-    digitalWriteFast(CS_I, HIGH);
+    digitalWrite(CS_I, HIGH);
     break;
   }
   case CHIP_J:
   {
-    digitalWriteFast(CS_J, HIGH);
+    digitalWrite(CS_J, HIGH);
     break;
   }
   case CHIP_K:
   {
-    digitalWriteFast(CS_K, HIGH);
+    digitalWrite(CS_K, HIGH);
     break;
   }
   case CHIP_L:
   {
-    digitalWriteFast(CS_L, HIGH);
+    digitalWrite(CS_L, HIGH);
     break;
   }
   }
 
-  delayMicroseconds(2);
-  digitalWriteFast(CS_A, LOW);
-  digitalWriteFast(CS_B, LOW);
-  digitalWriteFast(CS_C, LOW);
-  digitalWriteFast(CS_D, LOW);
-  digitalWriteFast(CS_E, LOW);
-  digitalWriteFast(CS_F, LOW);
-  digitalWriteFast(CS_G, LOW);
-
-  digitalWriteFast(CS_H, LOW);
-  digitalWriteFast(CS_I, LOW);
-  digitalWriteFast(CS_J, LOW);
-  digitalWriteFast(CS_K, LOW);
-  digitalWriteFast(CS_L, LOW);
-  delayMicroseconds(1);
+  delayMicroseconds(6);
+  digitalWrite(CS_A, LOW);
+  digitalWrite(CS_B, LOW);
+  digitalWrite(CS_C, LOW);
+  digitalWrite(CS_D, LOW);
+  digitalWrite(CS_E, LOW);
+  digitalWrite(CS_F, LOW);
+  digitalWrite(CS_G, LOW);
+
+  digitalWrite(CS_H, LOW);
+  digitalWrite(CS_I, LOW);
+  digitalWrite(CS_J, LOW);
+  digitalWrite(CS_K, LOW);
+  digitalWrite(CS_L, LOW);
+  delayMicroseconds(4);
   irq_flags = pio0_hw->irq;
   pio_interrupt_clear(pio, PIO0_IRQ_0);
   hw_clear_bits(&pio0_hw->irq, irq_flags);
@@ -128,26 +128,26 @@ void initCH446Q(void)
   uint offset = pio_add_program(pio, &spi_ch446_multi_cs_program);
   // uint offsetCS = pio_add_program(pio, &spi_ch446_cs_handler_program);
 
-  Serial.print("offset: ");
-  Serial.println(offset);
+  // Serial.print("offset: ");
+  // Serial.println(offset);
 
   pio_spi_ch446_multi_cs_init(pio, sm, offset, 8, 16, 0, 1, clk, dat);
   // pio_spi_ch446_cs_handler_init(pio, smCS, offsetCS, 256, 1, 8, 20, 6);
   // pinMode(CS_A, OUTPUT);
   // digitalWrite(CS_A, HIGH);
 
-  pinMode(CS_A, OUTPUT);
-  pinMode(CS_B, OUTPUT);
-  pinMode(CS_C, OUTPUT);
-  pinMode(CS_D, OUTPUT);
-  pinMode(CS_E, OUTPUT);
-  pinMode(CS_F, OUTPUT);
-  pinMode(CS_G, OUTPUT);
-  pinMode(CS_H, OUTPUT);
-  pinMode(CS_I, OUTPUT);
-  pinMode(CS_J, OUTPUT);
-  pinMode(CS_K, OUTPUT);
-  pinMode(CS_L, OUTPUT);
+  pinMode(CS_A, OUTPUT_8MA);
+  pinMode(CS_B, OUTPUT_8MA);
+  pinMode(CS_C, OUTPUT_8MA);
+  pinMode(CS_D, OUTPUT_8MA);
+  pinMode(CS_E, OUTPUT_8MA);
+  pinMode(CS_F, OUTPUT_8MA);
+  pinMode(CS_G, OUTPUT_8MA);
+  pinMode(CS_H, OUTPUT_8MA);
+  pinMode(CS_I, OUTPUT_8MA);
+  pinMode(CS_J, OUTPUT_8MA);
+  pinMode(CS_K, OUTPUT_8MA);
+  pinMode(CS_L, OUTPUT_8MA);
 
   digitalWrite(CS_A, LOW);
   digitalWrite(CS_B, LOW);
@@ -162,10 +162,10 @@ void initCH446Q(void)
   digitalWrite(CS_K, LOW);
   digitalWrite(CS_L, LOW);
 
-  pinMode(RESETPIN, OUTPUT);
+  pinMode(RESETPIN, OUTPUT_12MA);
 
   digitalWrite(RESETPIN, HIGH);
-  delay(2);
+  delay(3);
   digitalWrite(RESETPIN, LOW);
 }
 
@@ -302,11 +302,11 @@ void sendXYraw(int chip, int x, int y, int setOrClear)
 
   chAddress = chAddress << 24;
 
-  delayMicroseconds(20);
+  delayMicroseconds(50);
 
   pio_sm_put(pio, sm, chAddress);
 
-  delayMicroseconds(40);
+  delayMicroseconds(80);
 }
 
 void createXYarray(void)

diff --git a/JumperlessNano/src/main.cpp b/JumperlessNano/src/main.cpp
@@ -74,9 +74,7 @@ void setup()
 
   USBSer1.begin(115200);
 
-//delay(10);
-  ///// setupAdcUsbStuff(); // I took this out because it was causing a crash on
-//delay(10);
+
 #ifdef EEPROMSTUFF
   EEPROM.begin(256);
   debugFlagInit();
@@ -101,17 +99,21 @@ void setup()
 
   clearAllNTCC();
 
+    delay(20);
+   setupAdcUsbStuff(); // I took this out because it was causing a crash on
+delay(10);
+
   // lastNetConfirm(0);
 }
 
 void setup1()
 {
+delay(4);
 
-#ifdef PIOSTUFF
   initCH446Q();
-#endif
 
-  // delay (4);
+
+   delay (4);
   initLEDs();
   delay(4);
   startupColors();
@@ -120,6 +122,10 @@ void setup1()
 
   delay(4);
   showLEDsCore2 = 1;
+
+
+
+
 }
 
 char connectFromArduino = '\0';
@@ -132,7 +138,7 @@ int baudRate = 115200;
 
 int restoredNodeFile = 0;
 
-const char firmwareVersion[] = "1.3.7"; //// remember to update this
+const char firmwareVersion[] = "1.3.8"; //// remember to update this
 
 void loop()
 {
@@ -347,6 +353,7 @@ void loop()
     bridgesToPaths();
     clearLEDs();
     assignNetColors();
+    delay(1);
     // Serial.print("bridgesToPaths\n\r");
     digitalWrite(RESETPIN, LOW);
     // showNets();