feat: add Json config (unfinished)

FW/leo_muziekdoos_esp32/data/tagconfig.json

@@ -0,0 +1,14 @@
+{
+  "tags": [{
+    "TagUID" : "63 7E 1B 16",
+    "audiofile" : "Billy-Jean.mp3"
+  },
+  {
+    "TagUID" : "63 7E 1B 17",
+    "audiofile" : "Let_it_be.mp3"
+  },
+  {
+    "TagUID" : "63 7E 1B 18",
+    "audiofile" : "ringoffire.mp3"
+  }]
+}

FW/leo_muziekdoos_esp32/platformio.ini

@@ -12,9 +12,7 @@
 platform = espressif32
 board = m5stack-atom
 framework = arduino
-lib_deps = 
+lib_deps = bblanchon/ArduinoJson@^6.18.5
-	;using git submodules
 monitor_speed = 115200
 lib_ldf_mode = deep+
-
+extra_scripts = ./littlefsbuilder.py
-extra_scripts = ./littlefsbuilder.py

FW/leo_muziekdoos_esp32/src/config.cpp

@@ -0,0 +1,37 @@
+#include "config.h"
+#include <vector>
+#include "FS.h"
+#include "LITTLEFS.h"
+#include "ArduinoJson.h"
+
+const char *tagConfigfile = "/tagconfig.json";
+
+struct tagConfig {
+  char filename[64];
+  char tagID[64];
+};
+
+std::vector<tagConfig> tags;
+
+void loadConfig(const char *fname)
+{
+  File file = LITTLEFS.open(fname);
+  StaticJsonDocument<512> doc;
+  DeserializationError error = deserializeJson(doc, file);
+  if (error)
+    Serial.println(F("Failed to read file, using default configuration"));
+  JsonArray array = doc.as<JsonArray>();
+  for(JsonVariant v : array) {
+    Serial.println(v.as<String>());
+  }
+}
+
+void initConfig(void)
+{
+  loadConfig(tagConfigfile);
+}
+
+void handleConfig(void)
+{
+
+}

FW/leo_muziekdoos_esp32/src/config.h

@@ -0,0 +1,6 @@
+#pragma once
+
+
+
+void initConfig(void);
+void handleConfig(void);

FW/leo_muziekdoos_esp32/src/game.cpp

@@ -0,0 +1,12 @@
+#include "game.h"
+
+void initGame(void)
+{
+
+}
+
+
+void handleGame(void)
+{
+  
+}

FW/leo_muziekdoos_esp32/src/game.h

@@ -0,0 +1,4 @@
+#pragma once
+
+void initGame(void);
+void handleGame(void);

FW/leo_muziekdoos_esp32/src/main.cpp

@@ -4,6 +4,7 @@
 #include "storage.h"
 #include "audio.h"
 #include "rfid.h"
+#include "game.h"
 
 
 void setup()
@@ -14,10 +15,12 @@ void setup()
   initStorage();
   initAudio();
   initRfid();
+  initGame();
 }
 
 void loop()
 {
   handleAudio();
   handleRfid();
+  handleGame();
 }

FW/leo_muziekdoos_esp32/src/rfid.cpp

@@ -18,7 +18,9 @@ void handleRfid()
   if (nfc.tagPresent())
   {
     NfcTag tag = nfc.read();
-    tag.print();
+    String uid = tag.getUidString();
+    Serial.println(uid);
   }
 }
 //*****************************************************************************************//
+

FW/leo_muziekdoos_esp32/src/rfid.h

@@ -7,5 +7,7 @@
 #include "PN532.h"
 #include "NfcAdapter.h"
 
+#define NDEF_SUPPORT_MIFARE_CLASSIC
+
 void initRfid(void);
 void handleRfid(void);

FW/leo_muziekdoos_esp32/src/storage.cpp

@@ -9,10 +9,6 @@
 #include <time.h>
 #endif
 
-/* You only need to format LITTLEFS the first time you run a
-   test or else use the LITTLEFS plugin to create a partition
-   https://github.com/lorol/arduino-esp32littlefs-plugin */
-
 #define FORMAT_LITTLEFS_IF_FAILED false
 
 void listDir(fs::FS &fs, const char *dirname, uint8_t levels)
@@ -71,31 +67,6 @@ void listDir(fs::FS &fs, const char *dirname, uint8_t levels)
   }
 }
 
-void createDir(fs::FS &fs, const char *path)
-{
-  Serial.printf("Creating Dir: %s\n", path);
-  if (fs.mkdir(path))
-  {
-    Serial.println("Dir created");
-  }
-  else
-  {
-    Serial.println("mkdir failed");
-  }
-}
-
-void removeDir(fs::FS &fs, const char *path)
-{
-  Serial.printf("Removing Dir: %s\n", path);
-  if (fs.rmdir(path))
-  {
-    Serial.println("Dir removed");
-  }
-  else
-  {
-    Serial.println("rmdir failed");
-  }
-}
 
 void readFile(fs::FS &fs, const char *path)
 {
@@ -116,212 +87,6 @@ void readFile(fs::FS &fs, const char *path)
   file.close();
 }
 
-void writeFile(fs::FS &fs, const char *path, const char *message)
-{
-  Serial.printf("Writing file: %s\r\n", path);
-
-  File file = fs.open(path, FILE_WRITE);
-  if (!file)
-  {
-    Serial.println("- failed to open file for writing");
-    return;
-  }
-  if (file.print(message))
-  {
-    Serial.println("- file written");
-  }
-  else
-  {
-    Serial.println("- write failed");
-  }
-  file.close();
-}
-
-void appendFile(fs::FS &fs, const char *path, const char *message)
-{
-  Serial.printf("Appending to file: %s\r\n", path);
-
-  File file = fs.open(path, FILE_APPEND);
-  if (!file)
-  {
-    Serial.println("- failed to open file for appending");
-    return;
-  }
-  if (file.print(message))
-  {
-    Serial.println("- message appended");
-  }
-  else
-  {
-    Serial.println("- append failed");
-  }
-  file.close();
-}
-
-void renameFile(fs::FS &fs, const char *path1, const char *path2)
-{
-  Serial.printf("Renaming file %s to %s\r\n", path1, path2);
-  if (fs.rename(path1, path2))
-  {
-    Serial.println("- file renamed");
-  }
-  else
-  {
-    Serial.println("- rename failed");
-  }
-}
-
-void deleteFile(fs::FS &fs, const char *path)
-{
-  Serial.printf("Deleting file: %s\r\n", path);
-  if (fs.remove(path))
-  {
-    Serial.println("- file deleted");
-  }
-  else
-  {
-    Serial.println("- delete failed");
-  }
-}
-
-// SPIFFS-like write and delete file, better use #define CONFIG_LITTLEFS_SPIFFS_COMPAT 1
-
-void writeFile2(fs::FS &fs, const char *path, const char *message)
-{
-  if (!fs.exists(path))
-  {
-    if (strchr(path, '/'))
-    {
-      Serial.printf("Create missing folders of: %s\r\n", path);
-      char *pathStr = strdup(path);
-      if (pathStr)
-      {
-        char *ptr = strchr(pathStr, '/');
-        while (ptr)
-        {
-          *ptr = 0;
-          fs.mkdir(pathStr);
-          *ptr = '/';
-          ptr = strchr(ptr + 1, '/');
-        }
-      }
-      free(pathStr);
-    }
-  }
-
-  Serial.printf("Writing file to: %s\r\n", path);
-  File file = fs.open(path, FILE_WRITE);
-  if (!file)
-  {
-    Serial.println("- failed to open file for writing");
-    return;
-  }
-  if (file.print(message))
-  {
-    Serial.println("- file written");
-  }
-  else
-  {
-    Serial.println("- write failed");
-  }
-  file.close();
-}
-
-void deleteFile2(fs::FS &fs, const char *path)
-{
-  Serial.printf("Deleting file and empty folders on path: %s\r\n", path);
-
-  if (fs.remove(path))
-  {
-    Serial.println("- file deleted");
-  }
-  else
-  {
-    Serial.println("- delete failed");
-  }
-
-  char *pathStr = strdup(path);
-  if (pathStr)
-  {
-    char *ptr = strrchr(pathStr, '/');
-    if (ptr)
-    {
-      Serial.printf("Removing all empty folders on path: %s\r\n", path);
-    }
-    while (ptr)
-    {
-      *ptr = 0;
-      fs.rmdir(pathStr);
-      ptr = strrchr(pathStr, '/');
-    }
-    free(pathStr);
-  }
-}
-
-void testFileIO(fs::FS &fs, const char *path)
-{
-  Serial.printf("Testing file I/O with %s\r\n", path);
-
-  static uint8_t buf[512];
-  size_t len = 0;
-  File file = fs.open(path, FILE_WRITE);
-  if (!file)
-  {
-    Serial.println("- failed to open file for writing");
-    return;
-  }
-
-  size_t i;
-  Serial.print("- writing");
-  uint32_t start = millis();
-  for (i = 0; i < 2048; i++)
-  {
-    if ((i & 0x001F) == 0x001F)
-    {
-      Serial.print(".");
-    }
-    file.write(buf, 512);
-  }
-  Serial.println("");
-  uint32_t end = millis() - start;
-  Serial.printf(" - %u bytes written in %u ms\r\n", 2048 * 512, end);
-  file.close();
-
-  file = fs.open(path);
-  start = millis();
-  end = start;
-  i = 0;
-  if (file && !file.isDirectory())
-  {
-    len = file.size();
-    size_t flen = len;
-    start = millis();
-    Serial.print("- reading");
-    while (len)
-    {
-      size_t toRead = len;
-      if (toRead > 512)
-      {
-        toRead = 512;
-      }
-      file.read(buf, toRead);
-      if ((i++ & 0x001F) == 0x001F)
-      {
-        Serial.print(".");
-      }
-      len -= toRead;
-    }
-    Serial.println("");
-    end = millis() - start;
-    Serial.printf("- %u bytes read in %u ms\r\n", flen, end);
-    file.close();
-  }
-  else
-  {
-    Serial.println("- failed to open file for reading");
-  }
-}
-
 void initStorage()
 {
   if (!LITTLEFS.begin(FORMAT_LITTLEFS_IF_FAILED))