Compare commits

..

2 Commits

Author SHA1 Message Date
1974376134 Use double buffer 2026-01-20 10:41:27 +01:00
8c0f98b7a7 Add easy mode without shuffling 2026-01-20 10:33:32 +01:00
2 changed files with 53 additions and 30 deletions

View File

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

View File

@ -97,15 +97,20 @@ bool readButton(uint8_t i) {
// ------------------ Neues Spiel ------------------ // ------------------ 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)
int j = random(i + 1); {
uint8_t t = solutionOrder[i]; for (int i = 5; i > 0; i--)
solutionOrder[i] = solutionOrder[j]; {
solutionOrder[j] = t; 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++) for (uint8_t i = 0; i < 6; i++)
@ -137,11 +142,15 @@ void generateNewGame() {
uint8_t idx[18]; uint8_t idx[18];
for (uint8_t i = 0; i < 18; i++) idx[i] = i; for (uint8_t i = 0; i < 18; i++) idx[i] = i;
for (int i = 17; i > 0; i--) { if (!easy)
int j = random(i + 1); {
uint8_t t = idx[i]; for (int i = 17; i > 0; i--)
idx[i] = idx[j]; {
idx[j] = t; 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++) for (uint8_t i = 0; i < 6; i++)
@ -244,7 +253,7 @@ void setup() {
if (powerOnState) if (powerOnState)
{ {
generateNewGame(); generateNewGame(false);
} }
} }
@ -271,7 +280,7 @@ void loop() {
// Detecting turn-on // Detecting turn-on
if (!powerOnState && digitalRead(PIN_POWER_ON) == HIGH) if (!powerOnState && digitalRead(PIN_POWER_ON) == HIGH)
{ {
generateNewGame(); generateNewGame(false);
powerOnState = true; powerOnState = true;
} }
if (!powerOnState) if (!powerOnState)
@ -279,14 +288,18 @@ void loop() {
// We are turned-off and stop anything after here // We are turned-off and stop anything after here
return; 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++) { for (uint8_t i = 0; i < 18; i++) {
bool pressed = readButton(i); bool pressed = readButton(i);