fix egalite in solo

2025-06-18 01:09:06 +02:00
parent c5caf7c6e1
commit 71892abf22
12 changed files with 1162 additions and 1735 deletions
@@ -1,58 +1,62 @@
-#include "pin.h"
-#include "logo.h"
-#include "menu.h"
-#include "web.h"
-#include "localMode.h"
-
-#include <SPI.h>
-#include <Wire.h>
-#include "Adafruit_MPR121.h"
-#include <Adafruit_NeoPixel.h>
-
-// --- Capteur capacitif ---
-Adafruit_MPR121 cap = Adafruit_MPR121();
-uint16_t lasttouched = 0;
-uint16_t currtouched = 0;
-
-
-
-void setup() {
-  Serial.begin(115200);
-  randomSeed(analogRead(0));
-  pinMode(A2, INPUT);
-
-  if (!cap.begin(0x5B)) {
-    Serial.println("MPR121 not found, check wiring?");
-    while (1);
-  }
-  Serial.println("MPR121 found!");
-
-  setupMenu();
-}
-
-void loop() {
-  readButton();
-  if (!isPlay) {
-    menu();
-  } else {
-    if (!local) {
-      if(!isWebSet){
-        setupWeb();
-        isWebSet = true;
-      }else{
-        loopWeb();
-      }
-    } else {
-      if(!isBtnSet){
-        setBtn(cap, lasttouched, currtouched);
-      } else{
-        if(solo) {
-          localModeSolo(cap, lasttouched, currtouched);
-        }
-        else {
-          localModeDuo(cap, lasttouched, currtouched);
-        }
-        }
-      }
-  }
-}
+#include "pin.h"
+#include "logo.h"
+#include "menu.h"
+#include "web.h"
+#include "localMode.h"
+
+#include <SPI.h>
+#include <Wire.h>
+#include "Adafruit_MPR121.h"
+#include <Adafruit_NeoPixel.h>
+
+// --- Capteur capacitif ---
+Adafruit_MPR121 cap = Adafruit_MPR121();
+uint16_t lasttouched = 0;
+uint16_t currtouched = 0;
+
+
+
+void setup() {
+  Serial.begin(115200);
+  randomSeed(analogRead(0));
+  pinMode(A2, INPUT);
+
+  if (!cap.begin(0x5B)) {
+    Serial.println("MPR121 not found, check wiring?");
+    while (1);
+  }
+  Serial.println("MPR121 found!");
+
+  setupMenu();
+}
+
+void loop() {
+  readButton();
+  if (!isPlay) {
+    menu();
+  } else {
+    if (!local) {
+      if(!isWebSet){
+        setupWeb();
+        isWebSet = true;
+      }else{
+        loopWeb();
+      }
+    } else {
+      if(!isBtnSet){
+        setBtn(cap, lasttouched, currtouched);
+      } else{
+        if(solo) {
+          if(difficulty == 1){
+            localModeSolo(cap, lasttouched, currtouched);
+          }else if(difficulty == 2){
+            localModeSoloExpert(cap, lasttouched, currtouched);
+          }
+        }
+        else {
+          localModeDuo(cap, lasttouched, currtouched);
+        }
+        }
+      }
+  }
+}