Merge branch 'master' into zephyr

Author: mkellner

…argets/moddable_six_cdc/host/provider.js …32/targets/ethernet_kit/host/provider.jsbuild/devices/esp32/targets/moddable_six_cdc/host/provider.js renamed to build/devices/esp32/targets/ethernet_kit/host/provider.js build/devices/esp32/targets/moddable_six_cdc/host/provider.js renamed to build/devices/esp32/targets/ethernet_kit/host/provider.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2024  Moddable Tech, Inc.
+ * Copyright (c) 2023 Moddable Tech, Inc.
  *
  *   This file is part of the Moddable SDK Runtime.
  *
@@ -27,76 +27,40 @@ 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 Touch from "embedded:sensor/Touch/GT911";
 import PulseWidth from "embedded:io/pulsewidth";
 
 const device = {
 	I2C: {
 		default: {
 			io: I2C,
-			data: 4,
-			clock: 5
+			data: 14,
+			clock: 15
 		}
 	},
 	Serial: {
 		default: {
 			io: Serial,
 			port: 1,
-			receive: 44,
-			transmit: 43
+			receive: 3,
+			transmit: 1
 		}
 	},
 	SPI: {
 		default: {
 			io: SPI,
-			clock: 15,
-			in: 16,
-			out: 17,
+			clock: 4,
+			in: 2,
+			out: 12,
 			port: 1
 		}
 	},
-	io: {Analog, Digital, DigitalBank, I2C, PulseCount, PulseWidth, PWM, Serial, SMBus, SPI},
-	pin: {
-		//@@ button
-		button: 0,
-	},
-	sensor: {
-		Touch: class {
-			constructor(options) {				
-				const address = [0x14, 0x5D].find(address => {
-					let result = 1, i;
-					try {
-						i = new I2C({
-							...device.I2C.default,
-							hz: 200_000,
-							address
-						});
-						result = i.write(new ArrayBuffer);		// SMBus write quick (see linux/drivers/i2c/i2c-core-base.c => i2c_default_probe)
-					}
-					catch {
-					}
-					i?.close();
-					return undefined === result;
-				});
-
-				const result = new Touch({
-					...options,
-					sensor: {
-						...device.I2C.default,
-						io: device.io.I2C,
-						address
-					},
-					interrupt: {
-						io: Digital,
-						mode: Digital.Input,
-						pin: 38
-					}
-				});
-				result.configure({threshold: 20});
-				return result;
-			}
+	Analog: {
+		default: {
+			io: Analog,
+			pin: 39
 		}
-	}
+	},
+	io: {Analog, Digital, DigitalBank, I2C, PulseCount, PulseWidth, PWM, Serial, SMBus, SPI}
 };
 
 export default device;

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

@@ -0,0 +1,35 @@
+{
+	"build": {
+		"SDKCONFIGPATH": "$(MODDABLE)/build/devices/esp32/targets/ethernet_kit/sdkconfig"
+	},
+    "include": [
+        "$(MODDABLE)/modules/io/manifest.json"
+    ],
+	"defines": {
+		"ethernet": {
+            "internal": {
+                "phy": {
+                    "address": 1,
+                    "reset": 5,
+                    "IP101": 1
+                },
+                "mac": {
+                    "MDC": 23,
+                    "MDIO": 18
+                }
+            }
+        }
+	},
+	"creation": {
+		"static": 0,
+		"chunk": {
+			"initial": 78848,
+			"incremental": 0
+		},
+		"heap": {
+			"initial": 4928,
+			"incremental": 0
+		},
+		"stack": 512
+	}
+}

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

@@ -0,0 +1,8 @@
+CONFIG_ETH_ENABLED=y
+CONFIG_ETH_USE_ESP32_EMAC=y
+CONFIG_ETH_PHY_INTERFACE_RMII=y
+CONFIG_ETH_RMII_CLK_INPUT=y
+CONFIG_ETH_RMII_CLK_IN_GPIO=0
+CONFIG_ETH_DMA_BUFFER_SIZE=512
+CONFIG_ETH_DMA_RX_BUFFER_NUM=10
+CONFIG_ETH_DMA_TX_BUFFER_NUM=10

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

@@ -17,6 +17,11 @@ CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_TYPE_AUTO=y
 CONFIG_SPIRAM_USE_CAPS_ALLOC=y
 
-# for ESP32-S3 module P2N8
-# CONFIG_SPIRAM_MODE_OCT=n
-# CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_ESP_CONSOLE_UART_DEFAULT=y
+# CONFIG_ESP_CONSOLE_UART=y
+# CONFIG_ESP_CONSOLE_UART_NUM=0
+# CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+
+# CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=n
+# CONFIG_ESP_COREDUMP_ENABLE_TO_UART=n
+# CONFIG_ESP_COREDUMP_ENABLE=n