Merge pull request #26 from eried/next

Updating firmware

docs/webinstaller/index.html

@@ -61,6 +61,9 @@ <h1>Mayhem for Flipper Zero -installer</h1>
 
 <div class="changelog-box">
 Changelog<br><br>
+v0.13.5 r1 2023-12-14<br>
+* Enabled bluetooth functionality for Marauder<br>
+<br>
 v0.13.5 2023-12-04<br>
 * Updated Marauder to latest version<br>
 * Updated Marauder companion to v0.6.5<br>

esp32cam_marauder/QRCodeReader.ino

@@ -5,7 +5,7 @@ struct QRCodeData
 {
   bool valid;
   int dataType;
-  uint8_t payload[1024];
+  uint8_t payload[256];
   int payloadLen;
 };
 

esp32cam_marauder/configs.h

@@ -22,7 +22,7 @@
   //#define XIAO_ESP32_S3
   //// END BOARD TARGETS
 
-  #define MARAUDER_VERSION "v0.13.5"
+  #define MARAUDER_VERSION "v0.13.5 r1"
 
   //// HARDWARE NAMES
   #ifdef MARAUDER_M5STICKC
@@ -139,7 +139,7 @@
   #ifdef MARAUDER_FLIPPER
     //#define FLIPPER_ZERO_HAT
     //#define HAS_BATTERY
-    //#define HAS_BT
+    #define HAS_BT
     //#define HAS_BUTTONS
     //#define HAS_NEOPIXEL_LED
     //#define HAS_PWR_MGMT

esp32cam_marauder/libraries/plerup-espsoftwareserial- Implementation of the Arduino software serial for ESP8266.url

@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=https://github.com/plerup/espsoftwareserial

esp32cam_marauder/libraries/quirc_lib/Read Me.txt

@@ -0,0 +1 @@
+I got this library from : https://github.com/fustyles/Arduino/tree/master/ESP32-CAM_QRCode_Recognition/ESP32QRCodeReader_Page

esp32cam_marauder/libraries/quirc_lib/collections.c

@@ -0,0 +1,85 @@
+/* This file is part of the OpenMV project.
+ * Copyright (c) 2013-2017 Ibrahim Abdelkader <iabdalkader@openmv.io> & Kwabena W. Agyeman <kwagyeman@openmv.io>
+ * This work is licensed under the MIT license, see the file LICENSE for details.
+ */
+
+#include "collections.h"
+#define CHAR_BITS (sizeof(char) * 8)
+#define CHAR_MASK (CHAR_BITS - 1)
+#define CHAR_SHIFT IM_LOG2(CHAR_MASK)
+
+//////////
+// lifo //
+//////////
+
+void lifo_alloc(lifo_t *ptr, size_t size, size_t data_len)
+{
+  ptr->len = 0;
+  ptr->size = size;
+  ptr->data_len = data_len;
+  ptr->data = (char *)ps_malloc(size * data_len);
+}
+
+void lifo_alloc_all(lifo_t *ptr, size_t *size, size_t data_len)
+{
+  ptr->data = (char *)ps_malloc(255);
+  ptr->data_len = data_len;
+  ptr->size = 255 / data_len;
+  ptr->len = 0;
+  *size = ptr->size;
+}
+
+void lifo_free(lifo_t *ptr)
+{
+  if (ptr->data)
+  {
+    free(ptr->data);
+  }
+}
+
+void lifo_clear(lifo_t *ptr)
+{
+  ptr->len = 0;
+}
+
+size_t lifo_size(lifo_t *ptr)
+{
+  return ptr->len;
+}
+
+bool lifo_is_not_empty(lifo_t *ptr)
+{
+  return ptr->len;
+}
+
+bool lifo_is_not_full(lifo_t *ptr)
+{
+  return ptr->len != ptr->size;
+}
+
+void lifo_enqueue(lifo_t *ptr, void *data)
+{
+  memcpy(ptr->data + (ptr->len * ptr->data_len), data, ptr->data_len);
+
+  ptr->len += 1;
+}
+
+void lifo_dequeue(lifo_t *ptr, void *data)
+{
+  if (data)
+  {
+    memcpy(data, ptr->data + ((ptr->len - 1) * ptr->data_len), ptr->data_len);
+  }
+
+  ptr->len -= 1;
+}
+
+void lifo_poke(lifo_t *ptr, void *data)
+{
+  memcpy(ptr->data + (ptr->len * ptr->data_len), data, ptr->data_len);
+}
+
+void lifo_peek(lifo_t *ptr, void *data)
+{
+  memcpy(data, ptr->data + ((ptr->len - 1) * ptr->data_len), ptr->data_len);
+}

esp32cam_marauder/libraries/quirc_lib/collections.h

@@ -0,0 +1,33 @@
+/* This file is part of the OpenMV project.
+ * Copyright (c) 2013-2017 Ibrahim Abdelkader <iabdalkader@openmv.io> & Kwabena W. Agyeman <kwagyeman@openmv.io>
+ * This work is licensed under the MIT license, see the file LICENSE for details.
+ */
+
+#ifndef __COLLECTIONS_H__
+#define __COLLECTIONS_H__
+#include <stdbool.h>
+#include <stddef.h>
+//////////
+// lifo //
+//////////
+
+typedef struct lifo
+{
+  size_t len, size, data_len;
+  char *data;
+}
+__attribute__((aligned(8))) lifo_t;
+
+void lifo_alloc(lifo_t *ptr, size_t size, size_t data_len);
+void lifo_alloc_all(lifo_t *ptr, size_t *size, size_t data_len);
+void lifo_free(lifo_t *ptr);
+void lifo_clear(lifo_t *ptr);
+size_t lifo_size(lifo_t *ptr);
+bool lifo_is_not_empty(lifo_t *ptr);
+bool lifo_is_not_full(lifo_t *ptr);
+void lifo_enqueue(lifo_t *ptr, void *data);
+void lifo_dequeue(lifo_t *ptr, void *data);
+void lifo_poke(lifo_t *ptr, void *data);
+void lifo_peek(lifo_t *ptr, void *data);
+
+#endif /* __COLLECTIONS_H__ */