Changing to use octal SPI transmit so that we can display all the segments. Also refactored to clean up some code.

1 files changed, 10 insertions, 32 deletions

diff --git a/main/main.cpp b/main/main.cpp
index 7555410..22982fd 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -8,17 +8,19 @@
 #include "esp_log.h"
 
 
-#define CHAR_HEIGHT          8
-#define CHAR_WIDTH           8
 #define BLACK                0x0000
 #define RED                  0xF800
 #define GREEN                0x07E0
 #define ORANGE               0xFFE0
 
-#define PIN_NUM_MISO         12
-#define PIN_NUM_MOSI         13
+
+#define PIN_NUM_R0           12   // MISO
+#define PIN_NUM_G0           13   // MOSI
+#define PIN_NUM_R1           2    // QUADWP
+#define PIN_NUM_G1           4    // QUADHD
+#define PIN_NUM_R2           22   // data4
+#define PIN_NUM_G2           21   // data5
 #define PIN_NUM_CLK          14
-#define PIN_NUM_CS           15
 #define PIN_NUM_R_LATCH      16
 #define PIN_NUM_R_CLK        17
 #define PIN_NUM_R_ADDR_0     5
@@ -29,33 +31,14 @@
 #define STACK_SIZE           2000
 
 
-/* extern "C" void drawCharAtPosition(char character, int x_start, int y_start, uint16_t color) { */
-/*     uint8_t cur_char_row; */
-/*     for(int y = y_start; (y - y_start) < CHAR_HEIGHT && y < NUM_ROW; y++) { */
-/*         cur_char_row = atascii_font[(uint8_t) character][y - y_start]; */
-/*         for(int x = x_start; (x - x_start) < CHAR_WIDTH && x < NUM_COL; x++) { */
-/*             if(x >= 0) { */
-/*                 if((0b10000000 >> (x - x_start)) & cur_char_row) { */
-/*                     setPixel(x, y, color); */
-/*                 } */
-/*                 else { */
-/*                     setPixel(x, y, 0); */
-/*                 } */
-/*             } */
-/*         } */
-/*     } */
-/* } */
-
-
 extern "C" void runDisplayTask(void* taskParams) {
     InovaLedDisplay* display = (InovaLedDisplay*) taskParams;
     display->runDisplay();
 }
 
 
-extern "C" void app_main(void)
-{
-    InovaLedDisplay display = InovaLedDisplay(PIN_NUM_MISO, PIN_NUM_MOSI, PIN_NUM_CLK, PIN_NUM_CS, PIN_NUM_R_LATCH, PIN_NUM_R_CLK, PIN_NUM_R_ADDR_0, PIN_NUM_R_ADDR_1, PIN_NUM_R_ADDR_2);
+extern "C" void app_main(void) {
+    InovaLedDisplay display = InovaLedDisplay(PIN_NUM_R0, PIN_NUM_G0, PIN_NUM_R1, PIN_NUM_G1, PIN_NUM_R2, PIN_NUM_G2, PIN_NUM_CLK, PIN_NUM_R_LATCH, PIN_NUM_R_CLK, PIN_NUM_R_ADDR_0, PIN_NUM_R_ADDR_1, PIN_NUM_R_ADDR_2);
 
     display.fillScreen(0);
 
@@ -65,13 +48,8 @@ extern "C" void app_main(void)
     display.print("Adafruit GFX 0123456789");
 
     TaskHandle_t taskHandle;
-    xTaskCreate(runDisplayTask, "updateDisplay", STACK_SIZE, &display, tskIDLE_PRIORITY, &taskHandle);
-
-    //runDisplayTask(&display);
+    xTaskCreate(runDisplayTask, "updateDisplay", STACK_SIZE, &display, tskIDLE_PRIORITY + 1, &taskHandle);
 
-    //while(true) {
-    //    vTaskDelay(100 / portTICK_PERIOD_MS);
-    //}
     int j = display.width();
     int color = 1;
     String hello = "Hello World!! 0123456789";