chore: Update to upstream 3.8.7

build/devices/esp32/modules/ota/manifest.json

@@ -0,0 +1,20 @@
+{
+	"modules": {
+		"ota": "./ota"
+	},
+	"preload": [
+		"ota"
+	],
+    "platforms": {
+		"esp32": {
+			"defines": {
+				"ota": {
+					"autosplit": 1
+				}
+			}
+		},
+		"...": {
+			"error": "ESP32 OTA is not supported on this platform"
+		}
+	}
+}

build/devices/esp32/targets/m5atom_matrix/host/provider.js

@@ -27,6 +27,7 @@ import PWM from "embedded:io/pwm";
 import Serial from "embedded:io/serial";
 import SMBus from "embedded:io/smbus";
 import SPI from "embedded:io/spi";
+import PulseWidth from "embedded:io/pulsewidth";
 
 const device = {
 	I2C: {
@@ -55,7 +56,7 @@ const device = {
 			pin: 33
 		}
 	},
-	io: {Analog, Digital, DigitalBank, I2C, PulseCount, PWM, Serial, SMBus, SPI},
+	io: {Analog, Digital, DigitalBank, I2C, PulseCount, PulseWidth, PWM, Serial, SMBus, SPI},
 	pin: {
 		button: 39
 	}

build/devices/esp32/targets/m5atom_s3/sdkconfig/sdkconfig.defaults

@@ -0,0 +1,36 @@
+CONFIG_TINYUSB=y
+CONFIG_TINYUSB_CDC_ENABLED=y
+
+#
+# Descriptor configuration
+#
+CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
+CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
+CONFIG_TINYUSB_DESC_CUSTOM_VID=0xbeef
+CONFIG_TINYUSB_DESC_CUSTOM_PID=0x1cee
+CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Moddable"
+CONFIG_TINYUSB_DESC_PRODUCT_STRING="Moddable"
+CONFIG_TINYUSB_DESC_SERIAL_STRING="123456"
+CONFIG_TINYUSB_DESC_CDC_STRING="xsbug"
+# end of Descriptor configuration
+
+CONFIG_CONSOLE_UART_DEFAULT=y
+CONFIG_CONSOLE_UART=y
+CONFIG_CONSOLE_UART_NUM=0
+CONFIG_CONSOLE_UART_BAUDRATE=115200
+
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
+
+#CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
+
+CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=n
+CONFIG_ESP_COREDUMP_ENABLE_TO_UART=n
+CONFIG_ESP_COREDUMP_ENABLE=n
+
+#CONFIG_FLASHMODE_QIO=y
+CONFIG_FLASHMODE_DIO=y

build/devices/esp32/targets/m5atom_s3_lite/host/provider.js

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2023  Moddable Tech, Inc.
+ *
+ *   This file is part of the Moddable SDK Runtime.
+ *
+ *   The Moddable SDK Runtime is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Lesser General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   The Moddable SDK Runtime is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public License
+ *   along with the Moddable SDK Runtime.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import Analog from "embedded:io/analog";
+import Digital from "embedded:io/digital";
+import DigitalBank from "embedded:io/digitalbank";
+import I2C from "embedded:io/i2c";
+import PulseCount from "embedded:io/pulsecount";
+import PulseWidth from "embedded:io/pulsewidth";
+import PWM from "embedded:io/pwm";
+import Serial from "embedded:io/serial";
+import SMBus from "embedded:io/smbus";
+import SPI from "embedded:io/spi";
+
+const device = {
+	I2C: {
+		default: {
+			io: I2C,
+			data: 2,
+			clock: 1
+		},
+		internal: {
+			io: I2C,
+			data: 38,
+			clock: 39
+		}
+	},
+	SPI: {
+		default: {
+			io: SPI,
+			port: 3,
+			clock: 17,
+			out: 21
+		}
+	},
+	Analog: {
+		default: {
+			io: Analog,
+			pin: 8
+		}
+	},
+	io: {Analog, Digital, DigitalBank, I2C, PulseCount, PulseWidth, PWM, Serial, SMBus, SPI},
+	pin: {
+		button: 41,
+	}
+};
+
+export default device;
+

build/devices/esp32/targets/m5atom_s3_lite/manifest.json

@@ -0,0 +1,39 @@
+{
+	"build":{
+		"ESP32_SUBCLASS": "esp32s3",
+		"USE_USB": "1",
+		"SDKCONFIGPATH": "$(MODDABLE)/build/devices/esp32/targets/atoms3_lite/sdkconfig"
+	},
+	"include": [
+		"$(MODULES)/pins/smbus/manifest.json",
+		"$(MODULES)/pins/digital/manifest.json",
+		"$(MODULES)/pins/digital/monitor/manifest.json",
+		"$(MODULES)/drivers/button/manifest.json"
+	],
+	"modules": {
+		"*": [
+			"$(MODULES)/drivers/neopixel/*",
+			"$(MODULES)/drivers/neopixel/esp32/*",
+			"../m5stack_fire/m5button"
+		],
+		"setup/target": "./setup-target"
+	},
+	"preload": [
+		"setup/target",
+		"neopixel",
+		"m5button"
+	],
+	"defines": {
+		"i2c": {
+			"sda_pin": 38,
+			"scl_pin": 39
+		},
+		"neopixel": {
+			"length": 1,
+			"pin": 35,
+			"order": "#GRB",
+			"rmt_channel": "RMT_CHANNEL_0"
+		}
+	}
+}
+

build/devices/esp32/targets/atoms3/sdkconfig/sdkconfig.defaults → build/devices/esp32/targets/m5atom_s3_lite/sdkconfig/sdkconfig.defaults

@@ -28,3 +28,4 @@ CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
 CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=n
 CONFIG_ESP_COREDUMP_ENABLE_TO_UART=n
 CONFIG_ESP_COREDUMP_ENABLE=n
+

build/devices/esp32/targets/m5atom_s3_lite/setup-target.js

@@ -0,0 +1,36 @@
+import Digital from "pins/digital";
+//import Monitor from "monitor";
+import M5Button from "m5button";
+import config from "mc/config";
+import Timer from "timer";
+import Button from "button";
+import I2C from "pins/i2c";
+import NeoPixel from "neopixel";
+
+class Flash {
+	constructor(options) {
+		return new Button({
+			...options,
+			pin: 0,
+			invert: true
+		});
+	}
+}
+
+globalThis.Host = Object.freeze({
+	Button: {
+		Default: Flash,
+		Flash
+	}
+}, true);
+
+export default function (done) {
+	globalThis.button = {
+		a: new M5Button(41)
+	};
+
+	globalThis.lights = new NeoPixel({});
+
+	done();
+}
+

build/devices/esp32/targets/m5stack/host/provider.js

@@ -27,6 +27,7 @@ import PWM from "embedded:io/pwm";
 import Serial from "embedded:io/serial";
 import SMBus from "embedded:io/smbus";
 import SPI from "embedded:io/spi";
+import PulseWidth from "embedded:io/pulsewidth";
 
 const device = {
 	I2C: {
@@ -59,7 +60,7 @@ const device = {
 			pin: 35
 		}
 	},
-	io: {Analog, Digital, DigitalBank, I2C, PulseCount, PWM, Serial, SMBus, SPI},
+	io: {Analog, Digital, DigitalBank, I2C, PulseCount,PulseWidth, PWM, Serial, SMBus, SPI},
 	pin: {
 		button: 38,
 		led: 2,

build/devices/esp32/targets/m5stack_core2/host/provider.js

@@ -27,6 +27,7 @@ import PWM from "embedded:io/pwm";
 import Serial from "embedded:io/serial";
 import SMBus from "embedded:io/smbus";
 import SPI from "embedded:io/spi";
+import PulseWidth from "embedded:io/pulsewidth";
 
 const device = {
 	I2C: {
@@ -64,7 +65,7 @@ const device = {
 			pin: 35
 		}
 	},
-	io: {Analog, Digital, DigitalBank, I2C, PulseCount, PWM, Serial, SMBus, SPI},
+	io: {Analog, Digital, DigitalBank, I2C, PulseCount, PulseWidth, PWM, Serial, SMBus, SPI},
 	pin: {
 		displayDC: 15,
 		displaySelect: 5

build/devices/esp32/targets/m5stack_core2/manifest.json

@@ -1,7 +1,9 @@
 {
 	"build": {
 		"UPLOAD_SPEED": "1500000",
-		"DEBUGGER_SPEED": "921600"
+		"DEBUGGER_SPEED": "1500000",
+		"SDKCONFIGPATH": "./sdkconfig",
+		"PARTITIONS_FILE": "./sdkconfig/partitions.csv"
 	},
 	"include": [
 		"$(MODDABLE)/modules/drivers/ili9341/manifest.json",
@@ -67,8 +69,7 @@
 			"sampleRate": 11025,
 			"volume_divider": 1,
 			"i2s": {
-				"DAC_CHANNEL": 1,
-				"bitsPerSample": 16,
+				"bitsPerSample": 32,
 				"bck_pin": 12,
 				"lr_pin": 0,
 				"dataout_pin": 2

build/devices/esp32/targets/m5stack_core2/sdkconfig/partitions.csv

@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2016-2023  Moddable Tech, Inc.
+#
+#   This file is part of the Moddable SDK Tools.
+# 
+#   The Moddable SDK Tools is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+# 
+#   The Moddable SDK Tools is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+# 
+#   You should have received a copy of the GNU General Public License
+#   along with the Moddable SDK Tools.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Name,   Type, SubType, Offset,  Size, Flags
+# Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild,,,,
+nvs,      data, nvs,     0x9000,  0x006000,
+phy_init, data, phy,     0xf000,  0x001000,
+factory,  app,  factory, 0x10000, 0xFF0000,

build/devices/esp32/targets/m5stack_core2/sdkconfig/sdkconfig.defaults

@@ -0,0 +1,8 @@
+CONFIG_ESP_INT_WDT=y
+
+CONFIG_ESPTOOLPY_FLASHSIZE_1MB=n
+CONFIG_ESPTOOLPY_FLASHSIZE_2MB=n
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=n
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=n
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="16MB"

build/devices/esp32/targets/m5stick_cplus/host/provider.js

@@ -27,6 +27,7 @@ import PWM from "embedded:io/pwm";
 import Serial from "embedded:io/serial";
 import SMBus from "embedded:io/smbus";
 import SPI from "embedded:io/spi";
+import PulseWidth from "embedded:io/pulsewidth";
 
 const device = {
 	I2C: {
@@ -68,7 +69,7 @@ const device = {
 			pin: 36
 		}
 	},
-	io: {Analog, Digital, DigitalBank, I2C, PulseCount, PWM, Serial, SMBus, SPI},
+	io: {Analog, Digital, DigitalBank, I2C, PulseCount, PulseWidth, PWM, Serial, SMBus, SPI},
 	pin: {
 		button: 37,
 		led: 10,

build/devices/esp32/xsProj-esp32/partitions.csv

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016-2017  Moddable Tech, Inc.
+# Copyright (c) 2016-2023  Moddable Tech, Inc.
 #
 #   This file is part of the Moddable SDK Tools.
 # 
@@ -21,7 +21,4 @@
 # Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild,,,,
 nvs,      data, nvs,     0x9000,  0x006000,
 phy_init, data, phy,     0xf000,  0x001000,
-factory,  app,  factory, 0x10000, 0x390000,
-xs,       0x40, 1,       0x3A0000, 0x040000,
-settings, data, 1,       0x3E0000, 0x010000,
-storage,  data, spiffs,  0x3F0000, 0x010000,
+factory,  app,  factory, 0x10000, 0x3F0000,

build/devices/esp32/xsProj-esp32/sdkconfig.defaults

@@ -385,7 +385,7 @@ CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
-CONFIG_FREERTOS_USE_TRACE_FACILITY=n
+CONFIG_FREERTOS_USE_TRACE_FACILITY=y
 CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=n
 CONFIG_FREERTOS_DEBUG_INTERNALS=n
 

build/devices/esp32/xsProj-esp32c3/partitions.csv

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016-2017  Moddable Tech, Inc.
+# Copyright (c) 2016-2023  Moddable Tech, Inc.
 #
 #   This file is part of the Moddable SDK Tools.
 # 
@@ -21,7 +21,4 @@
 # Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild,,,,
 nvs,      data, nvs,     0x9000,  0x006000,
 phy_init, data, phy,     0xf000,  0x001000,
-factory,  app,  factory, 0x10000, 0x390000,
-xs,       0x40, 1,       0x3A0000, 0x040000,
-settings, data, 1,       0x3E0000, 0x010000,
-storage,  data, spiffs,  0x3F0000, 0x010000,
+factory,  app,  factory, 0x10000, 0x3F0000,

build/devices/esp32/xsProj-esp32c3/sdkconfig.defaults

@@ -669,7 +669,7 @@ CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
-# CONFIG_FREERTOS_USE_TRACE_FACILITY is not set
+CONFIG_FREERTOS_USE_TRACE_FACILITY=y
 # CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set
 CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
 CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y

build/devices/esp32/xsProj-esp32s2/main/CMakeLists.txt

@@ -36,6 +36,6 @@ if (INSTRUMENT EQUAL "1")
 endif()
 
 add_prebuilt_library(xsesp32 ${CMAKE_BINARY_DIR}/xs_${ESP32_SUBCLASS}.a
-             PRIV_REQUIRES driver nvs_flash esp_adc_cal vfs spiffs fatfs)
+             PRIV_REQUIRES driver nvs_flash esp_adc_cal vfs spiffs fatfs esp_lcd)
 
 target_link_libraries(${COMPONENT_LIB} PRIVATE xsesp32)