update bentoflow

Firmware/Bentuino/boards/flowtoyscreator.json → Firmware/BentoFlow/boards/simpleESP32.json

@@ -1,10 +1,10 @@
 {
   "build": {
-    "arduino": {
+    "arduino":{
       "ldscript": "esp32_out.ld"
     },
     "core": "esp32",
-    "extra_flags": "",
+    "extra_flags": "-DARDUINO_SIMPLE_ESP32",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
@@ -25,7 +25,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "Flowtoys Creator",
+  "name": "Simple ESP32",
   "upload": {
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
@@ -35,4 +35,4 @@
   },
   "url": "https://github.com/benkuper/Bento",
   "vendor": "Flowtoys"
-}
+}

Firmware/BentoFlow/boards/tap.json

@@ -0,0 +1,38 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_TAP_DANCE",
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "mcu": "esp32",
+    "variant": "esp32",
+    "partitions":"no_ota.csv"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Flowtoys Creator Superstaff",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://github.com/benkuper/Bento",
+  "vendor": "Flowtoys"
+}

Firmware/BentoFlow/boards/whackbutton.json

@@ -0,0 +1,32 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "eagle.flash.512k64.ld"
+    },
+    "core": "esp8266",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_WHACK_BUTTON",
+    "f_cpu": "80000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "qio",
+    "mcu": "esp8266",
+    "variant": "generic"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "frameworks": [
+    "arduino",
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
+  ],
+  "name": "Espressif Generic ESP8266 ESP-01 512k",
+  "upload": {
+    "maximum_ram_size": 81920,
+    "maximum_size": 524288,
+    "require_upload_port": true,
+    "resetmethod": "ck",
+    "speed": 115200
+  },
+  "url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
+  "vendor": "Espressif"
+}

Firmware/BentoFlow/lib/SD/src/SD.cpp

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifdef ESP32
 #include "vfs_api.h"
 #include "sd_diskio.h"
 #include "ff.h"
@@ -104,3 +105,6 @@ uint64_t SDFS::usedBytes()
 }
 
 SDFS SD = SDFS(FSImplPtr(new VFSImpl()));
+
+
+#endif

Firmware/BentoFlow/lib/SD/src/SD.h

@@ -11,6 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
+#ifdef ESP32
+
 #ifndef _SD_H_
 #define _SD_H_
 
@@ -46,3 +49,5 @@ typedef fs::SDFS        SDFileSystemClass;
 #define SDFileSystem    SD
 
 #endif /* _SD_H_ */
+
+#endif

Firmware/BentoFlow/lib/SD/src/sd_diskio.cpp

@@ -11,6 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
+#ifdef ESP32
+
 #include "sd_diskio.h"
 extern "C" {
     #include "diskio.h"
@@ -822,3 +825,5 @@ sdcard_type_t sdcard_type(uint8_t pdrv)
     }
     return card->type;
 }
+
+#endif

Firmware/BentoFlow/platformio.ini

@@ -8,34 +8,49 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
-[env:bentoflow]
-platform = [email protected]
-platform_packages = [email protected]
-board = creatorclub
+[platformio]
+default_envs = esp8266
+
+[base]
+board = whackbutton
 framework = arduino
-lib_deps = 
+lib_deps =
 	https://github.com/adafruit/Adafruit_BNO055.git#1.4.3
 	Wire
-	adafruit/Adafruit Unified Sensor @ ^1.1.4
-	adafruit/Adafruit BusIO @ ^1.9.8
 	SPI
 	Preferences
-	WiFi
-	bblanchon/ArduinoJson @ ^6.18.5
 	SPIFFS
 	ESPmDNS
 	https://github.com/contrem/arduino-timer
 	wasm3/Wasm3 @ ^0.5.0
 	https://github.com/jshaw/SimplexNoise
 	WebServer
-	madhephaestus/ESP32Servo @ ^0.11.0
-	rstephan/ArtnetWifi @ ^1.4.0
 	fastled/FastLED @ ^3.5.0
-	SD
-	m5stack/M5StickCPlus@^0.0.8
-	kosme/arduinoFFT @ ^1.5.6
 	benkuper/OSC @ ^1.0.0
+	bblanchon/ArduinoJson @ ^6.21.2
 monitor_speed = 115200
+
+
+[esp32]
+platform = [email protected]
 lib_compat_mode = strict
 lib_ldf_mode = deep
 build_flags = -ftemplate-depth=2000000
+platform_packages = [email protected]
+lib_deps = 
+	SD
+	WiFi
+	adafruit/Adafruit Unified Sensor @ ^1.1.4
+	adafruit/Adafruit BusIO @ ^1.9.8
+	madhephaestus/ESP32Servo @ ^0.11.0
+	m5stack/M5StickCPlus@^0.0.8
+	kosme/arduinoFFT @ ^1.5.6
+	rstephan/ArtnetWifi @ ^1.4.0
+
+[env:bentoflow]
+extends = base, esp32
+
+[env:esp8266]
+extends = base
+platform = espressif8266
+board = whackbutton