Merge pull request #2639 from ladyada/main

remove test code and add more display options

Author: makermelissa

Factory_Tests/Qualia_ESP32S3_RGB666_FactoryTest/Qualia_ESP32S3_RGB666_FactoryTest.ino

@@ -22,9 +22,33 @@ Arduino_ESP32RGBPanel *rgbpanel = new Arduino_ESP32RGBPanel(
     );
 
 Arduino_RGB_Display *gfx = new Arduino_RGB_Display(
+// 2.1" 480x480 round display
     480 /* width */, 480 /* height */, rgbpanel, 0 /* rotation */, true /* auto_flush */,
     expander, GFX_NOT_DEFINED /* RST */, TL021WVC02_init_operations, sizeof(TL021WVC02_init_operations));
 
+// 2.8" 480x480 round display
+//    480 /* width */, 480 /* height */, rgbpanel, 0 /* rotation */, true /* auto_flush */,
+//    expander, GFX_NOT_DEFINED /* RST */, TL028WVC01_init_operations, sizeof(TL028WVC01_init_operations));
+
+// 3.4" 480x480 square display
+//    480 /* width */, 480 /* height */, rgbpanel, 0 /* rotation */, true /* auto_flush */,
+//    expander, GFX_NOT_DEFINED /* RST */, tl034wvs05_b1477a_init_operations, sizeof(tl034wvs05_b1477a_init_operations));
+
+// 3.2" 320x820 rectangle bar display
+//    320 /* width */, 820 /* height */, rgbpanel, 0 /* rotation */, true /* auto_flush */,
+//    expander, GFX_NOT_DEFINED /* RST */, tl032fwv01_init_operations, sizeof(tl032fwv01_init_operations));
+
+// 4.0" 720x720 square display
+//    720 /* width */, 720 /* height */, rgbpanel, 0 /* rotation */, true /* auto_flush */,
+//    expander, GFX_NOT_DEFINED /* RST */, NULL, 0);
+
+// 4.0" 720x720 round display
+//    720 /* width */, 720 /* height */, rgbpanel, 0 /* rotation */, true /* auto_flush */,
+//    expander, GFX_NOT_DEFINED /* RST */, hd40015c40_init_operations, sizeof(hd40015c40_init_operations));
+// needs also the rgbpanel to have these pulse/sync values:
+//    1 /* hync_polarity */, 46 /* hsync_front_porch */, 2 /* hsync_pulse_width */, 44 /* hsync_back_porch */,
+//    1 /* vsync_polarity */, 50 /* vsync_front_porch */, 16 /* vsync_pulse_width */, 16 /* vsync_back_porch */
+
 uint16_t *colorWheel;
 
 void setup(void)
@@ -52,72 +76,43 @@ void setup(void)
   expander->digitalWrite(PCA_TFT_BACKLIGHT, HIGH);
 
   TB.begin();
-  colorWheel = (uint16_t *) ps_malloc(480 * 480 * sizeof(uint16_t));
+  colorWheel = (uint16_t *) ps_malloc(gfx->width() * gfx->height() * sizeof(uint16_t));
   if (colorWheel) generateColorWheel(colorWheel);
 }
 
 
 uint8_t allpins[] = {SS, SCK, MOSI, MISO, A1, A0};
 
-bool test = false;
 void loop()
 {  
-  if (!test) {
-    gfx->draw16bitRGBBitmap(0, 0, colorWheel, 480, 480);
-    delay(100);
-    return;
-  }
-  Serial.println("** Test Display!");
-  gfx->fillScreen(BLACK);
-  gfx->setTextSize(5);
-  gfx->setTextColor(WHITE);
-  gfx->setTextWrap(false);
-  gfx->setCursor(100, gfx->height() / 2 - 175);
-  gfx->println("Display OK!");
-
-  if (! TB.testpins(MOSI, A1, allpins, sizeof(allpins))) return;
-  if (! TB.testpins(MISO, SS, allpins, sizeof(allpins))) return;
-  if (! TB.testpins(SCK, A0, allpins, sizeof(allpins))) return;
-  gfx->setCursor(100, gfx->height() / 2 - 125);
-  gfx->println("GPIO OK!");
-
-  gfx->setCursor(100, gfx->height() / 2 - 75);
-  gfx->println("I2C OK!");
-  
-  gfx->setCursor(100, gfx->height() / 2 - 25);
-  gfx->setTextColor(RED);
-  gfx->println("RED");
-
-  gfx->setCursor(100, gfx->height() / 2 + 25);
-  gfx->setTextColor(GREEN);
-  gfx->println("GREEN");
-
-  gfx->setCursor(100, gfx->height() / 2 + 75);
-  gfx->setTextColor(BLUE);
-  gfx->println("BLUE");
-
-  Serial.println("** TEST OK!");
-  test = false;
+  gfx->draw16bitRGBBitmap(0, 0, colorWheel, gfx->width(), gfx->height());
+  delay(1000);
+  return;
 }
 
 // https://chat.openai.com/share/8edee522-7875-444f-9fea-ae93a8dfa4ec
 void generateColorWheel(uint16_t *colorWheel) {
+  int width = gfx->width();
+  int height = gfx->height();
+  int half_width = width / 2;
+  int half_height = height / 2;
   float angle;
   uint8_t r, g, b;
-  int scaled_index;
+  int index, scaled_index;
 
-  for(int y = 0; y < 240; y++) {
-    for(int x = 0; x < 240; x++) {
-      angle = atan2(y - 120, x - 120);
+  for(int y = 0; y < half_height; y++) {
+    for(int x = 0; x < half_width; x++) {
+      index = y * half_width + x;
+      angle = atan2(y - half_height / 2, x - half_width / 2);
       r = uint8_t(127.5 * (cos(angle) + 1));
       g = uint8_t(127.5 * (sin(angle) + 1));
       b = uint8_t(255 - (r + g) / 2);
       uint16_t color = RGB565(r, g, b);
 
-      // Scale this pixel into 4 pixels in the 480x480 buffer
+      // Scale this pixel into 4 pixels in the full buffer
       for(int dy = 0; dy < 2; dy++) {
         for(int dx = 0; dx < 2; dx++) {
-          scaled_index = (y * 2 + dy) * 480 + (x * 2 + dx);
+          scaled_index = (y * 2 + dy) * width + (x * 2 + dx);
           colorWheel[scaled_index] = color;
         }
       }