Merge branch 'main' into 雨滴

8By8/8By8.ino

@@ -1,6 +1,6 @@
 #include "TimerOne.h"
 
-#define TIME_PER_LAYER_IN_US 700
+#define TIME_PER_LAYER_IN_US 800
 #define BUS_START_PIN 22
 #define CLOCK_START_PIN 30
 #define SW_START_PIN 38
@@ -24,14 +24,16 @@ public:
     brightness_count = (brightness_count + 1) % 3;
 
     for (int i = 0; i < 8; i++) {
-        for (int j = 0; j < 8; j++) {
-            // In LED_status:
-            // 0 = off
-            // 4 = brightest
-            digitalWrite(BUS_START_PIN + j, ((LED_status[layer_count][i] >> (j * 2)) & 3) >= (3 - brightness_count));
-        }
-        digitalWrite(CLOCK_START_PIN + i, HIGH);
-        digitalWrite(CLOCK_START_PIN + i, LOW);
+      for (int j = 0; j < 8; j++) {
+        // In LED_status:
+        // 0 = off
+        // 4 = brightest
+        digitalWrite(BUS_START_PIN + j,
+                     ((LED_status[layer_count][i] >> (j * 2)) & 3) >=
+                         (3 - brightness_count));
+      }
+      digitalWrite(CLOCK_START_PIN + i, HIGH);
+      digitalWrite(CLOCK_START_PIN + i, LOW);
     }
 
     digitalWrite(SW_START_PIN + layer_count, HIGH);
@@ -42,7 +44,20 @@ public:
         return;
     }
     brightness %= 4;
-    LED_status[z][x] = (LED_status[z][x] & (~(3 << (y * 2)))) | (brightness << (y * 2));
+    LED_status[z][x] =
+        (LED_status[z][x] & (~(3 << (y * 2)))) | (brightness << (y * 2));
+  }
+
+  static int get_status(int x, int y, int z) {
+    return LED_status[z][x] >> (y * 2) & 3;
+  }
+
+  static void clear() {
+    for (int i = 0; i < 8; i++) {
+      for (int j = 0; j < 8; j++) {
+        LED_status[i][j] = 0;
+      }
+    }
   }
 };
 
@@ -52,27 +67,46 @@ int Cube::LED_status[8][8] = {0};
 int bright = 3;
 
 void setup() {
-    for (int i = 22; i < 46; i++) {
-        pinMode(i, OUTPUT);
-    }
+  for (int i = 22; i < 46; i++) {
+    pinMode(i, OUTPUT);
+  }
 
-    Timer1.initialize();
-    Timer1.setPeriod(TIME_PER_LAYER_IN_US);
-    Timer1.attachInterrupt(Cube::display);
+  Timer1.initialize();
+  Timer1.setPeriod(TIME_PER_LAYER_IN_US);
+  Timer1.attachInterrupt(Cube::display);
 
-    Serial.begin(115200);
+  Serial.begin(115200);
 
+  randomSeed(analogRead(0));
 }
 
+bool create_new = false;
+
 void loop() {
-    
-    for (int i = 7; i >= 0; i--) {
-        for (int j = 0; j < 8; j++) {
-            for (int k = 0; k < 8; k++) {
-                Cube::set_status(i, j, k, bright);
-                delay(5);
-            }
+  for (int z = 0; z < 7; z++) {
+    for (int x = 0; x < 8; x++) {
+      for (int y = 0; y < 8; y++) {
+        int upper_state = Cube::get_status(x, y, z + 1);
+        if (upper_state > 0) {
+          Cube::set_status(x, y, z, upper_state);
+          Cube::set_status(x, y, z + 1, upper_state - 1);
+        } else {
+          Cube::set_status(x, y, z, 0);
         }
+      }
     }
-    bright = (bright + 1) % 4;
+  }
+
+  if (create_new) {
+    int num = random(64);
+    Cube::set_status(num / 8, num % 8, 7, 3);
+    create_new = false;
+  }
+  else {
+    create_new = true;
+  }
+
+  // num = random(64);
+  // Cube::set_status(num / 8, num % 8, 7, 3);
+  // delay(5);
 }