Merge branches 'main' and 'main' of https://github.com/bmorcelli/Bruce

pr3y · Dec 30, 2024 · d3bc68f · d3bc68f
2 parents 66a04c6 + 57e3d90
commit d3bc68f
Show file tree

Hide file tree

Showing 17 changed files with 71 additions and 80 deletions.
diff --git a/boards/CYD-2432S028.json b/boards/CYD-2432S028.json
@@ -6,7 +6,9 @@
     "core": "esp32",
     "extra_flags": [
       "-DARDUINO_ESP32_DEV",
-      "-DCYD_2432S028"
+      "-DCYD_2432S028",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
@@ -36,5 +38,5 @@
     "speed": 460800
   },
   "url": "https://en.wikipedia.org/wiki/ESP32",
-  "vendor": "Espressif"
+  "vendor": "SJI Co., Ltd"
 }
diff --git a/boards/ESP-General.json b/boards/ESP-General.json
@@ -11,7 +11,7 @@
         "-DARDUINO_USB_MODE=1",
         "-DARDUINO_RUNNING_CORE=1",
         "-DARDUINO_EVENT_RUNNING_CORE=1",
-        "-DARDUINO_USB_CDC_ON_BOOT=1"
+        "-DARDUINO_USB_CDC_ON_BOOT"
       ],
       "f_cpu": "240000000L",
       "f_flash": "80000000L",

diff --git a/boards/_New-Device-Model.json b/boards/_New-Device-Model.json
@@ -6,7 +6,7 @@
       },
       "core": "esp32",
       "extra_flags": [
-        "-DNEW_DEVICE",                   // Device Flag
+        "-DNEW_DEVICE",
         "-DARDUINO_USB_MODE=1",
         "-DARDUINO_RUNNING_CORE=1",
         "-DARDUINO_EVENT_RUNNING_CORE=1"

diff --git a/boards/lilygo-t-embed-cc1101.json b/boards/lilygo-t-embed-cc1101.json
@@ -9,12 +9,10 @@
     "extra_flags": [
       "-DT_EMBED_1101",
       "-DBOARD_HAS_PSRAM",
-      "-mfix-esp32-psram-cache-issue",
-	    "-mfix-esp32-psram-cache-strategy=memw",
-      "-DARDUINO_RUNNING_CORE=0",
-      "-DARDUINO_EVENT_RUNNING_CORE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1",
       "-DARDUINO_USB_MODE=1",
-      "-DARDUINO_USB_CDC_ON_BOOT=1"
+      "-DARDUINO_USB_CDC_ON_BOOT"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/boards/lilygo-t-embed.json b/boards/lilygo-t-embed.json
@@ -8,11 +8,9 @@
     "core": "esp32",
     "extra_flags": [
       "-DT_EMBED",
-      "-mfix-esp32-psram-cache-issue",
-	    "-mfix-esp32-psram-cache-strategy=memw",
       "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_RUNNING_CORE=0",
-      "-DARDUINO_EVENT_RUNNING_CORE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1",
       "-DARDUINO_USB_MODE=1",
       "-DARDUINO_USB_CDC_ON_BOOT=1"
     ],

diff --git a/boards/m5stack-cardputer.json b/boards/m5stack-cardputer.json
@@ -7,7 +7,7 @@
       "core": "esp32",
       "extra_flags": [
         "-DARDUINO_M5STACK_CARDPUTER",
-        "-DARDUINO_USB_CDC_ON_BOOT=1",
+        "-DARDUINO_USB_CDC_ON_BOOT",
         "-DARDUINO_USB_MODE=1",
         "-DARDUINO_RUNNING_CORE=1",
         "-DARDUINO_EVENT_RUNNING_CORE=1"

diff --git a/boards/m5stack-core.json b/boards/m5stack-core.json
@@ -1,34 +1,37 @@
 {
-    "build": {
-      "arduino":{
-        "ldscript": "esp32_out.ld"
-      },
-      "core": "esp32",
-      "extra_flags": ["-DARDUINO_M5STACK_CORE", "-DM5STACK"],
-      "f_cpu": "240000000L",
-      "f_flash": "80000000L",
-      "flash_mode": "qio",
-      "mcu": "esp32",
-      "variant": "pinouts"
+  "build": {
+    "arduino": {
+      "ldscript": "esp32_out.ld"
     },
-    "connectivity": [
-      "wifi",
-      "bluetooth",
-      "ethernet",
-      "can"
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_M5STACK_CORE",
+      "-DM5STACK"
     ],
-    "frameworks": [
-      "arduino",
-      "espidf"
-    ],
-    "name": "M5Stack Core ESP32",
-    "upload": {
-      "flash_size": "4MB",
-      "maximum_ram_size": 327680,
-      "maximum_size": 4194304,
-      "require_upload_port": true,
-      "speed": 460800
-    },
-    "url": "http://www.m5stack.com",
-    "vendor": "M5Stack"
-  }
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "mcu": "esp32",
+    "variant": "pinouts"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "M5Stack Core ESP32",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "http://www.m5stack.com",
+  "vendor": "M5Stack"
+}
diff --git a/boards/m5stack-core2.json b/boards/m5stack-core2.json
@@ -6,11 +6,11 @@
     },
     "core": "esp32",
     "extra_flags": [
-      "-mfix-esp32-psram-cache-issue",
-	    "-mfix-esp32-psram-cache-strategy=memw",
       "-DARDUINO_M5STACK_CORE2",
       "-DM5STACK",
-      "-DBOARD_HAS_PSRAM"
+      "-DBOARD_HAS_PSRAM",
+      "-mfix-esp32-psram-cache-issue",
+	    "-mfix-esp32-psram-cache-strategy=memw"
     ],
     "f_cpu": "240000000L",
     "f_flash": "40000000L",

diff --git a/boards/m5stack-cores3.json b/boards/m5stack-cores3.json
@@ -6,8 +6,6 @@
     },
     "core": "esp32",
     "extra_flags": [
-      "-mfix-esp32-psram-cache-issue",
-	    "-mfix-esp32-psram-cache-strategy=memw",
       "-DARDUINO_M5STACK_CORES3",
       "-DM5STACK",
       "-DBOARD_HAS_PSRAM",

diff --git a/boards/m5stack-cplus2.json b/boards/m5stack-cplus2.json
@@ -7,8 +7,10 @@
     "extra_flags": [
       "-DARDUINO_M5STICK_C_PLUS2",
       "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1",
       "-mfix-esp32-psram-cache-issue",
-	    "-mfix-esp32-psram-cache-strategy=memw"
+      "-mfix-esp32-psram-cache-strategy=memw"
     ],
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
@@ -36,4 +38,4 @@
   },
   "url": "http://www.m5stack.com",
   "vendor": "M5Stack"
-}
+}
diff --git a/boards/pinouts/lilygo-t-embed-cc1101.h b/boards/pinouts/lilygo-t-embed-cc1101.h
@@ -1,13 +1,10 @@
-#ifndef Pins_Arduino_h
-#define Pins_Arduino_h
+#ifndef __T_EMBED_H__
+#define __T_EMBED_H__
 #define T_EMBED
 
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-// Lite Version
-// #define LITE_VERSION 1
-
 // Main I2C Bus
 #define SPI_SS_PIN      8
 #define SPI_MOSI_PIN    9
@@ -126,26 +123,20 @@ static const uint8_t RX = SERIAL_RX;
 #define LED_ON	    HIGH
 #define LED_OFF	    LOW
 
-#define RFID125_RX_PIN	    44
-#define RFID125_TX_PIN  	43
-// FM
-// #define FM_SI4713
-// #define FM_RSTPIN 40
+// RFID 
 
-// RTC
-// #define HAS_RTC
+#define RFID125_RX_PIN	    SERIAL_RX
+#define RFID125_TX_PIN  	SERIAL_TX
 
 // RGB LED
 #define HAS_RGB_LED         1
-#define RGB_LED             21
+#define RGB_LED             14
 #define LED_TYPE            WS2812B
 #define LED_ORDER           GRB
 #define LED_TYPE_IS_RGBW    0
 #define LED_COUNT           8
 
 // BadUSB 
 #define USB_as_HID 1
-// #define BAD_TX=GROVE_SDA
-//#define BAD_RX=GROVE_SCL
 
 #endif /* Pins_Arduino_h */
diff --git a/boards/pinouts/lilygo-t-embed.h b/boards/pinouts/lilygo-t-embed.h
@@ -26,6 +26,7 @@ static const uint8_t SCL = GROVE_SCL;
 // TFT_eSPI display
 #define ST7789_DRIVER   1
 #define USER_SETUP_LOADED
+#define TFT_BACKLIGHT_ON 1
 #define USE_HSPI_PORT
 #define SMOOTH_FONT     1
 #define TFT_WIDTH       170

diff --git a/boards/pinouts/m5stack-cardputer.h b/boards/pinouts/m5stack-cardputer.h
@@ -191,7 +191,7 @@ static const uint8_t _kb_asciimap[128] = {
 };
 
 #define LED_TYPE SK6812
-#define LED_ORDER RGB
+#define LED_ORDER GRB 
 #define LED_TYPE_IS_RGBW 1
 #define LED_COUNT 1
 

diff --git a/boards/smoochiee-board.json b/boards/smoochiee-board.json
@@ -7,12 +7,10 @@
       "core": "esp32",
       "extra_flags": [
         "-DSMOOCHIEE_BOARD",
-        "-DARDUINO_RUNNING_CORE=0",
-        "-DARDUINO_EVENT_RUNNING_CORE=0",
+        "-DARDUINO_RUNNING_CORE=1",
+        "-DARDUINO_EVENT_RUNNING_CORE=1",
         "-DARDUINO_USB_MODE=1",
-        "-DBOARD_HAS_PSRAM",
-        "-mfix-esp32-psram-cache-issue",
-	    "-mfix-esp32-psram-cache-strategy=memw"
+        "-DBOARD_HAS_PSRAM"
       ],
       "f_cpu": "240000000L",
       "f_flash": "80000000L",

diff --git a/src/main.cpp b/src/main.cpp
@@ -68,7 +68,7 @@ uint8_t buff[1024] = {0};
 #endif
 
 
-#include "Wire.h"
+#include <Wire.h>
 #include "core/display.h"
 #include "core/mykeyboard.h"
 #include "core/sd_functions.h"

diff --git a/src/modules/rf/rf.cpp b/src/modules/rf/rf.cpp
@@ -3,7 +3,7 @@
 #include <driver/rmt.h>
 #include <RCSwitch.h>
 #include <ELECHOUSE_CC1101_SRC_DRV.h>
-#include "PCA9554.h"
+//#include "PCA9554.h"
 #include <globals.h>
 #include "core/mykeyboard.h"
 #include "core/display.h"

diff --git a/src/modules/rf/rf.h b/src/modules/rf/rf.h
@@ -1,7 +1,7 @@
 // @IncursioHack - https://github.com/IncursioHack
 #include <Wire.h>
 #include <SD.h>
-#include "PCA9554.h" // Biblioteca para PCA9554
+// #include "PCA9554.h" // Biblioteca para PCA9554
 
 struct RfCodes {
   uint32_t frequency = 0;
@@ -16,14 +16,14 @@ struct RfCodes {
 };
 
 // Define o endereço I2C do PCA9554PW
-const int pca9554pw_address = 0x27;
+//const int pca9554pw_address = 0x27;
 
 // Cria um objeto PCA9554 com o endereço I2C do PCA9554PW
-extern PCA9554 extIo1;
+//extern PCA9554 extIo1;
 
 // Define os pinos para o receptor e transmissor
-const int PCA9554RSX_PIN = 4;
-const int PCA9554TRX_PIN = 0;
+//const int PCA9554RSX_PIN = 4;
+//const int PCA9554TRX_PIN = 0;
 
 void rf_spectrum();
 void rf_SquareWave();