Add double opening

drawers/src/main.cpp

@@ -43,9 +43,13 @@ unsigned long lockTimer = 0;
 bool unlocked = false;
 
 void openLock(uint8_t indexOn) {
+  digitalWrite(schubladen[indexOn].schlossPin, HIGH);
+  delay(400);
+  digitalWrite(schubladen[indexOn].schlossPin, LOW);
+  delay(400);
+  digitalWrite(schubladen[indexOn].schlossPin, HIGH);
   unlocked = true;
   lockTimer = millis();
-  digitalWrite(schubladen[indexOn].schlossPin, HIGH);
 }
 
 void onI2CReceive(int len) {

terminal/master/src/main.cpp

@@ -71,6 +71,7 @@ ISR(PCINT1_vect)
   lastState = state;
 }
 uint8_t inputPattern = 0;
+uint8_t secretPattern = 0b10101010;
 void handleEncoderMovement()
 {
   long diff = encoderPostion - lastClickPosition;
@@ -88,7 +89,8 @@ void handleEncoderMovement()
       selectedIndex = (selectedIndex + 7) % 8;
       inputPattern = ((inputPattern << 1) | 0) & 0xFF;
     }
-    resetPuzzles(inputPattern == 0b10101010);
+    bool reset = inputPattern == secretPattern;
+    resetPuzzles(reset);
     setDrawerLight(selectedIndex);
     lastClickPosition = encoderPostion;
   }
@@ -144,7 +146,11 @@ void resetPuzzles(bool easy)
     digitalWrite(puzzleResetPins[i], HIGH);
     puzzlesSolved[i] = false;
   }
-  delay(30 * (easy * 10)); //delay 30 or 300ms
+  if (easy)
+    delay(400);
+  else
+    delay(90);
+  
   for (size_t i = 0; i < 3; i++)
   {
     digitalWrite(puzzleResetPins[i], LOW);

terminal/puzzle_colorFade/core/src/main.cpp

@@ -127,6 +127,7 @@ NormalizedRGB updateLeft()
   uint32_t sum = inputR + inputG + inputB;
 
   NormalizedRGB leftRGB;
+  strip.begin();
   if (sum > 0)
   {
     leftRGB.r = (uint32_t)inputR * MAX_SUM / sum;
@@ -138,6 +139,7 @@ NormalizedRGB updateLeft()
   {
     strip.setPixelColor(2, strip.Color(0, 0, 0, 0));
   }
+  strip.show();
   return leftRGB;
 }
 
@@ -149,7 +151,7 @@ NormalizedRGB updateMiddle()
   uint32_t sum = inputR + inputG + inputB;
 
   NormalizedRGB middleRGB;
-
+  strip.begin();
   if (sum > 0)
   {
     middleRGB.r = (uint32_t)inputR * MAX_SUM / sum;
@@ -161,6 +163,7 @@ NormalizedRGB updateMiddle()
   {
     strip.setPixelColor(1, strip.Color(0, 0, 0, 0));
   }
+  strip.show();
   return middleRGB;
 }
 
@@ -172,7 +175,7 @@ NormalizedRGB updateRight()
   uint32_t sum = inputR + inputG + inputB;
 
   NormalizedRGB rightRGB;
-
+  strip.begin();
   if (sum > 0)
   {
     rightRGB.r = (uint32_t)inputR * MAX_SUM / sum;
@@ -184,7 +187,7 @@ NormalizedRGB updateRight()
   {
     strip.setPixelColor(0, strip.Color(0, 0, 0, 0));
   }
-
+  strip.show();
   return rightRGB;
 }
 
@@ -218,40 +221,30 @@ void generateTargetGameBoard(bool easy)
     slavePotiValues[i] = 0;
   }
   digitalWrite(COMPLETED_PIN, LOW);
-  strip.begin();
-  strip.clear();
   GameBoard board;
   if (easy)
   {
-    // left
     board.left   = generateRandomNormalizedRGB(pot3, 2, 3);
-    finishedLeft = false;
-    strip.setPixelColor(3, strip.Color(board.left.r, board.left.g, board.left.b, 0)); // left
-    // middle
     board.middle = generateRandomNormalizedRGB(pot4, 3, 4);
-    finishedMiddle = false;
-    strip.setPixelColor(4, strip.Color(board.middle.r, board.middle.g, board.middle.b, 0)); // middle
-    // right
     board.right  = generateRandomNormalizedRGB(pot5, 4, 5);
-    finishedRight = false;
-    strip.setPixelColor(5, strip.Color(board.right.r, board.right.g, board.right.b, 0)); // left
   }
   else
   {
-    // left
     board.left   = generateRandomNormalizedRGB(pot3, 0, 3);
+    board.middle = generateRandomNormalizedRGB(pot4, 0, 4);
+    board.right  = generateRandomNormalizedRGB(pot5, 1, 5);
+  }
+  strip.begin();
+  strip.clear();
   finishedLeft = false;
   strip.setPixelColor(3, strip.Color(board.left.r, board.left.g, board.left.b, 0)); // left
-    // middle
+
-    board.middle = generateRandomNormalizedRGB(pot4, 0, 4);
   finishedMiddle = false;
   strip.setPixelColor(4, strip.Color(board.middle.r, board.middle.g, board.middle.b, 0)); // middle
-    // right
+
-    board.right = generateRandomNormalizedRGB(pot5, 1, 5);
   finishedRight = false;
-    strip.setPixelColor(5, strip.Color(board.right.r, board.right.g, board.right.b, 0)); // left
+  strip.setPixelColor(5, strip.Color(board.right.r, board.right.g, board.right.b, 0)); // right
-    //------------------
+
-  }
   finishedBoard = board;
   strip.show();
 }
@@ -334,7 +327,6 @@ void loop()
     generateTargetGameBoard(millis() - resetTimer > 150);
   }
 
-  strip.begin();
   readExternalPotiValues();
 
   if (!finishedLeft)
@@ -371,5 +363,4 @@ void loop()
   {
     digitalWrite(COMPLETED_PIN, HIGH);
   }
-  strip.show();
 }

terminal/puzzle_colorFade/potiNano/.gitignore

@@ -0,0 +1,5 @@
+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch

terminal/puzzle_colorFade/potiNano/platformio.ini

@@ -0,0 +1,14 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
+[env:nanoatmega328new]
+platform = atmelavr
+board = nanoatmega328new
+framework = arduino

terminal/puzzle_colorFade/potiNano/src/main.cpp

@@ -0,0 +1,39 @@
+#include <Arduino.h>
+#include <Wire.h>
+
+#define I2C_SLAVE_ADDRESS 0x08
+
+volatile uint16_t bufferA[6];
+volatile uint16_t bufferB[6];
+
+// Pointer to the buffer currently exposed to ISR
+volatile uint16_t* activeBuffer = bufferA;
+
+void onI2CRequest() {
+    // Safe: ISR only reads active buffer
+    Wire.write((uint8_t*)activeBuffer, 6 * sizeof(uint16_t));
+}
+
+void setup() {
+    Wire.begin(I2C_SLAVE_ADDRESS);
+    Wire.onRequest(onI2CRequest);
+    analogReference(DEFAULT);
+}
+
+void loop() {
+    // Choose the inactive buffer
+    volatile uint16_t* writeBuffer =
+        (activeBuffer == bufferA) ? bufferB : bufferA;
+
+    writeBuffer[0] = analogRead(A0);
+    writeBuffer[1] = analogRead(A1);
+    writeBuffer[2] = analogRead(A2);
+    writeBuffer[3] = analogRead(A3);
+    writeBuffer[4] = analogRead(A6);
+    writeBuffer[5] = analogRead(A7);
+
+    // Atomic pointer swap
+    noInterrupts();
+    activeBuffer = writeBuffer;
+    interrupts();
+}

terminal/puzzle_colorRemember/src/main.cpp

@@ -97,16 +97,21 @@ bool readButton(uint8_t i) {
 
 // ------------------ Neues Spiel ------------------
 
-void generateNewGame() {
+void generateNewGame(bool easy) {
 
-  for (uint8_t i = 0; i < 6; i++) solutionOrder[i] = i;
+  for (uint8_t i = 0; i < 6; i++)
+    solutionOrder[i] = i;
 
-  for (int i = 5; i > 0; i--) {
+  if (!easy)
+  {
+    for (int i = 5; i > 0; i--)
+    {
       int j = random(i + 1);
       uint8_t t = solutionOrder[i];
       solutionOrder[i] = solutionOrder[j];
       solutionOrder[j] = t;
     }
+  }
 
   for (uint8_t i = 0; i < 6; i++)
     expectedOrder[i] = solutionOrder[5 - i];
@@ -137,12 +142,16 @@ void generateNewGame() {
   uint8_t idx[18];
   for (uint8_t i = 0; i < 18; i++) idx[i] = i;
 
-  for (int i = 17; i > 0; i--) {
+  if (!easy)
+  {
+    for (int i = 17; i > 0; i--)
+    {
       int j = random(i + 1);
       uint8_t t = idx[i];
       idx[i] = idx[j];
       idx[j] = t;
     }
+  }
 
   for (uint8_t i = 0; i < 6; i++)
     buttonAssignment[idx[i]] = solutionOrder[i];
@@ -244,7 +253,7 @@ void setup() {
 
   if (powerOnState)
   {
-    generateNewGame();
+    generateNewGame(false);
   }
 }
 
@@ -271,7 +280,7 @@ void loop() {
   // Detecting turn-on
   if (!powerOnState && digitalRead(PIN_POWER_ON) == HIGH)
   {
-    generateNewGame();
+    generateNewGame(false);
     powerOnState = true;
   }
   if (!powerOnState)
@@ -279,14 +288,18 @@ void loop() {
     // We are turned-off and stop anything after here
     return;
   }
-  unsigned long now = millis();
 
-  bool trigger = digitalRead(PIN_TRIGGER_SHUFFLE);
+  if (digitalRead(PIN_TRIGGER_SHUFFLE) == HIGH)
-  if (trigger && !lastTriggerState) {
+  {
-    generateNewGame();
+    unsigned long resetTimer = millis();
+    while (digitalRead(PIN_TRIGGER_SHUFFLE) == HIGH)
+    {
+      delay(10);
+    }
+    generateNewGame(millis() - resetTimer > 150);
   }
-  lastTriggerState = trigger;
 
+  unsigned long now = millis();
   for (uint8_t i = 0; i < 18; i++) {
     bool pressed = readButton(i);
 

terminal/puzzle_leftRight/src/main.cpp

@@ -121,7 +121,6 @@ void setup() {
 }
 
 
-bool reset = false;
 void loop() {
   //Detecting turn-off
   if (powerOnState && digitalRead(POWER_PIN) == LOW) {