Skip to content

Commit

Permalink
v1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
CDeenen committed Dec 13, 2023
1 parent 160dfea commit fe6a957
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 376 deletions.
222 changes: 0 additions & 222 deletions boards.txt
Original file line number Diff line number Diff line change
Expand Up @@ -249,228 +249,6 @@ materialPlane_Sensor.menu.EraseFlash.all.upload.erase_cmd=-e

##############################################################

materialPlane_sensor_debug.name=Material Plane Sensor (Production Debug)
materialPlane_sensor_debug.vid.0=0x16D0
materialPlane_sensor_debug.pid.0=0x11CE

materialPlane_sensor_debug.bootloader.tool=esptool_py
materialPlane_sensor_debug.bootloader.tool.default=esptool_py

materialPlane_sensor_debug.upload.tool=esptool_py
materialPlane_sensor_debug.upload.tool.default=esptool_py
materialPlane_sensor_debug.upload.tool.network=esp_ota

materialPlane_sensor_debug.upload.maximum_size=1310720
materialPlane_sensor_debug.upload.maximum_data_size=327680
materialPlane_sensor_debug.upload.flags=
materialPlane_sensor_debug.upload.extra_flags=
materialPlane_sensor_debug.upload.use_1200bps_touch=false
materialPlane_sensor_debug.upload.wait_for_upload_port=false

materialPlane_sensor_debug.serial.disableDTR=false
materialPlane_sensor_debug.serial.disableRTS=false

materialPlane_sensor_debug.build.tarch=xtensa
materialPlane_sensor_debug.build.bootloader_addr=0x0
materialPlane_sensor_debug.build.target=esp32s3
materialPlane_sensor_debug.build.mcu=esp32s3
materialPlane_sensor_debug.build.core=esp32
materialPlane_sensor_debug.build.variant=materialPlane_sensor_debug
materialPlane_sensor_debug.build.board=ESP32S3_DEV

materialPlane_sensor_debug.build.usb_mode=0
materialPlane_sensor_debug.build.cdc_on_boot=1
materialPlane_sensor_debug.build.msc_on_boot=0
materialPlane_sensor_debug.build.dfu_on_boot=0
materialPlane_sensor_debug.build.f_cpu=240000000L
materialPlane_sensor_debug.build.flash_size=4MB
materialPlane_sensor_debug.build.flash_freq=80m
materialPlane_sensor_debug.build.flash_mode=dio
materialPlane_sensor_debug.build.boot=qio
materialPlane_sensor_debug.build.boot_freq=80m
materialPlane_sensor_debug.build.partitions=default
materialPlane_sensor_debug.build.defines=
materialPlane_sensor_debug.build.loop_core=
materialPlane_sensor_debug.build.event_core=
materialPlane_sensor_debug.build.psram_type=qspi
materialPlane_sensor_debug.build.memory_type={build.boot}_{build.psram_type}

## IDE 2.0 Seems to not update the value
materialPlane_sensor_debug.menu.JTAGAdapter.default=Disabled
materialPlane_sensor_debug.menu.JTAGAdapter.default.build.copy_jtag_files=0
materialPlane_sensor_debug.menu.JTAGAdapter.builtin=Integrated USB JTAG
materialPlane_sensor_debug.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg
materialPlane_sensor_debug.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
materialPlane_sensor_debug.menu.JTAGAdapter.external=FTDI Adapter
materialPlane_sensor_debug.menu.JTAGAdapter.external.build.openocdscript=esp32s3-ftdi.cfg
materialPlane_sensor_debug.menu.JTAGAdapter.external.build.copy_jtag_files=1
materialPlane_sensor_debug.menu.JTAGAdapter.bridge=ESP USB Bridge
materialPlane_sensor_debug.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
materialPlane_sensor_debug.menu.JTAGAdapter.bridge.build.copy_jtag_files=1

#materialPlane_sensor_debug.menu.PSRAM.disabled=Disabled
#materialPlane_sensor_debug.menu.PSRAM.disabled.build.defines=
#materialPlane_sensor_debug.menu.PSRAM.disabled.build.psram_type=qspi
#materialPlane_sensor_debug.menu.PSRAM.enabled=QSPI PSRAM
#materialPlane_sensor_debug.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
#materialPlane_sensor_debug.menu.PSRAM.enabled.build.psram_type=qspi
#materialPlane_sensor_debug.menu.PSRAM.opi=OPI PSRAM
#materialPlane_sensor_debug.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
#materialPlane_sensor_debug.menu.PSRAM.opi.build.psram_type=opi

#materialPlane_sensor_debug.menu.FlashMode.qio=QIO 80MHz
#materialPlane_sensor_debug.menu.FlashMode.qio.build.flash_mode=dio
#materialPlane_sensor_debug.menu.FlashMode.qio.build.boot=qio
#materialPlane_sensor_debug.menu.FlashMode.qio.build.boot_freq=80m
#materialPlane_sensor_debug.menu.FlashMode.qio.build.flash_freq=80m
#materialPlane_sensor_debug.menu.FlashMode.qio120=QIO 120MHz
#materialPlane_sensor_debug.menu.FlashMode.qio120.build.flash_mode=dio
#materialPlane_sensor_debug.menu.FlashMode.qio120.build.boot=qio
#materialPlane_sensor_debug.menu.FlashMode.qio120.build.boot_freq=120m
#materialPlane_sensor_debug.menu.FlashMode.qio120.build.flash_freq=80m
#materialPlane_sensor_debug.menu.FlashMode.dio=DIO 80MHz
#materialPlane_sensor_debug.menu.FlashMode.dio.build.flash_mode=dio
#materialPlane_sensor_debug.menu.FlashMode.dio.build.boot=dio
#materialPlane_sensor_debug.menu.FlashMode.dio.build.boot_freq=80m
#materialPlane_sensor_debug.menu.FlashMode.dio.build.flash_freq=80m
#materialPlane_sensor_debug.menu.FlashMode.opi=OPI 80MHz
#materialPlane_sensor_debug.menu.FlashMode.opi.build.flash_mode=dout
#materialPlane_sensor_debug.menu.FlashMode.opi.build.boot=opi
#materialPlane_sensor_debug.menu.FlashMode.opi.build.boot_freq=80m
#materialPlane_sensor_debug.menu.FlashMode.opi.build.flash_freq=80m

#materialPlane_sensor_debug.menu.FlashSize.4M=4MB (32Mb)
#materialPlane_sensor_debug.menu.FlashSize.4M.build.flash_size=4MB
#materialPlane_sensor_debug.menu.FlashSize.8M=8MB (64Mb)
#materialPlane_sensor_debug.menu.FlashSize.8M.build.flash_size=8MB
#materialPlane_sensor_debug.menu.FlashSize.8M.build.partitions=default_8MB
#materialPlane_sensor_debug.menu.FlashSize.16M=16MB (128Mb)
#materialPlane_sensor_debug.menu.FlashSize.16M.build.flash_size=16MB
#materialPlane_sensor_debug.menu.FlashSize.32M=32MB (256Mb)
#materialPlane_sensor_debug.menu.FlashSize.32M.build.flash_size=32MB

#materialPlane_sensor_debug.menu.LoopCore.1=Core 1
#materialPlane_sensor_debug.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
#materialPlane_sensor_debug.menu.LoopCore.0=Core 0
#materialPlane_sensor_debug.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0

#materialPlane_sensor_debug.menu.EventsCore.1=Core 1
#materialPlane_sensor_debug.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
#materialPlane_sensor_debug.menu.EventsCore.0=Core 0
#materialPlane_sensor_debug.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0

#materialPlane_sensor_debug.menu.USBMode.hwcdc=Hardware CDC and JTAG
#materialPlane_sensor_debug.menu.USBMode.hwcdc.build.usb_mode=1
#materialPlane_sensor_debug.menu.USBMode.default=USB-OTG (TinyUSB)
#materialPlane_sensor_debug.menu.USBMode.default.build.usb_mode=0

#materialPlane_sensor_debug.menu.CDCOnBoot.default=Disabled
#materialPlane_sensor_debug.menu.CDCOnBoot.default.build.cdc_on_boot=0
#materialPlane_sensor_debug.menu.CDCOnBoot.cdc=Enabled
#materialPlane_sensor_debug.menu.CDCOnBoot.cdc.build.cdc_on_boot=1

#materialPlane_sensor_debug.menu.MSCOnBoot.default=Disabled
#materialPlane_sensor_debug.menu.MSCOnBoot.default.build.msc_on_boot=0
#materialPlane_sensor_debug.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
#materialPlane_sensor_debug.menu.MSCOnBoot.msc.build.msc_on_boot=1

#materialPlane_sensor_debug.menu.DFUOnBoot.default=Disabled
#materialPlane_sensor_debug.menu.DFUOnBoot.default.build.dfu_on_boot=0
#materialPlane_sensor_debug.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
#materialPlane_sensor_debug.menu.DFUOnBoot.dfu.build.dfu_on_boot=1

#materialPlane_sensor_debug.menu.UploadMode.default=UART0 / Hardware CDC
#materialPlane_sensor_debug.menu.UploadMode.default.upload.use_1200bps_touch=false
#materialPlane_sensor_debug.menu.UploadMode.default.upload.wait_for_upload_port=false
#materialPlane_sensor_debug.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
#materialPlane_sensor_debug.menu.UploadMode.cdc.upload.use_1200bps_touch=true
#materialPlane_sensor_debug.menu.UploadMode.cdc.upload.wait_for_upload_port=true

#materialPlane_sensor_debug.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
#materialPlane_sensor_debug.menu.PartitionScheme.default.build.partitions=default
#materialPlane_sensor_debug.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
#materialPlane_sensor_debug.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
#materialPlane_sensor_debug.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
#materialPlane_sensor_debug.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
#materialPlane_sensor_debug.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
#materialPlane_sensor_debug.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
#materialPlane_sensor_debug.menu.PartitionScheme.minimal.build.partitions=minimal
#materialPlane_sensor_debug.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
#materialPlane_sensor_debug.menu.PartitionScheme.no_ota.build.partitions=no_ota
#materialPlane_sensor_debug.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
#materialPlane_sensor_debug.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
#materialPlane_sensor_debug.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
#materialPlane_sensor_debug.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
#materialPlane_sensor_debug.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
#materialPlane_sensor_debug.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
#materialPlane_sensor_debug.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
#materialPlane_sensor_debug.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
#materialPlane_sensor_debug.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
#materialPlane_sensor_debug.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
#materialPlane_sensor_debug.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
#materialPlane_sensor_debug.menu.PartitionScheme.huge_app.build.partitions=huge_app
#materialPlane_sensor_debug.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
#materialPlane_sensor_debug.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
#materialPlane_sensor_debug.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
#materialPlane_sensor_debug.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
#materialPlane_sensor_debug.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
#materialPlane_sensor_debug.menu.PartitionScheme.fatflash.build.partitions=ffat
#materialPlane_sensor_debug.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
#materialPlane_sensor_debug.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
#materialPlane_sensor_debug.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
#materialPlane_sensor_debug.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
#materialPlane_sensor_debug.menu.PartitionScheme.rainmaker=RainMaker
#materialPlane_sensor_debug.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
#materialPlane_sensor_debug.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728

#materialPlane_sensor_debug.menu.CPUFreq.240=240MHz (WiFi)
#materialPlane_sensor_debug.menu.CPUFreq.240.build.f_cpu=240000000L
#materialPlane_sensor_debug.menu.CPUFreq.160=160MHz (WiFi)
#materialPlane_sensor_debug.menu.CPUFreq.160.build.f_cpu=160000000L
#materialPlane_sensor_debug.menu.CPUFreq.80=80MHz (WiFi)
#materialPlane_sensor_debug.menu.CPUFreq.80.build.f_cpu=80000000L
#materialPlane_sensor_debug.menu.CPUFreq.40=40MHz
#materialPlane_sensor_debug.menu.CPUFreq.40.build.f_cpu=40000000L
#materialPlane_sensor_debug.menu.CPUFreq.20=20MHz
#materialPlane_sensor_debug.menu.CPUFreq.20.build.f_cpu=20000000L
#materialPlane_sensor_debug.menu.CPUFreq.10=10MHz
#materialPlane_sensor_debug.menu.CPUFreq.10.build.f_cpu=10000000L

materialPlane_sensor_debug.menu.UploadSpeed.921600=921600
materialPlane_sensor_debug.menu.UploadSpeed.921600.upload.speed=921600
materialPlane_sensor_debug.menu.UploadSpeed.115200=115200
materialPlane_sensor_debug.menu.UploadSpeed.115200.upload.speed=115200
materialPlane_sensor_debug.menu.UploadSpeed.256000.windows=256000
materialPlane_sensor_debug.menu.UploadSpeed.256000.upload.speed=256000
materialPlane_sensor_debug.menu.UploadSpeed.230400.windows.upload.speed=256000
materialPlane_sensor_debug.menu.UploadSpeed.230400=230400
materialPlane_sensor_debug.menu.UploadSpeed.230400.upload.speed=230400
materialPlane_sensor_debug.menu.UploadSpeed.460800.linux=460800
materialPlane_sensor_debug.menu.UploadSpeed.460800.macosx=460800
materialPlane_sensor_debug.menu.UploadSpeed.460800.upload.speed=460800
materialPlane_sensor_debug.menu.UploadSpeed.512000.windows=512000
materialPlane_sensor_debug.menu.UploadSpeed.512000.upload.speed=512000

materialPlane_sensor_debug.menu.DebugLevel.none=None
materialPlane_sensor_debug.menu.DebugLevel.none.build.code_debug=0
materialPlane_sensor_debug.menu.DebugLevel.error=Error
materialPlane_sensor_debug.menu.DebugLevel.error.build.code_debug=1
materialPlane_sensor_debug.menu.DebugLevel.warn=Warn
materialPlane_sensor_debug.menu.DebugLevel.warn.build.code_debug=2
materialPlane_sensor_debug.menu.DebugLevel.info=Info
materialPlane_sensor_debug.menu.DebugLevel.info.build.code_debug=3
materialPlane_sensor_debug.menu.DebugLevel.debug=Debug
materialPlane_sensor_debug.menu.DebugLevel.debug.build.code_debug=4
materialPlane_sensor_debug.menu.DebugLevel.verbose=Verbose
materialPlane_sensor_debug.menu.DebugLevel.verbose.build.code_debug=5

materialPlane_sensor_debug.menu.EraseFlash.none=Disabled
materialPlane_sensor_debug.menu.EraseFlash.none.upload.erase_cmd=
materialPlane_sensor_debug.menu.EraseFlash.all=Enabled
materialPlane_sensor_debug.menu.EraseFlash.all.upload.erase_cmd=-e

##############################################################

materialPlane_sensor_diy_full.name=Material Plane Sensor (DIY Full)

materialPlane_sensor_diy_full.bootloader.tool=esptool_py
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "materialFoundryArduino",
"version": "1.0.1",
"version": "1.0.2",
"description": "Arduino Framework for the Material Foundry hardware",
"keywords": [
"framework",
Expand Down
2 changes: 1 addition & 1 deletion platform.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Material Foundry
version=1.0.0
version=1.0.2

tools.xtensa-esp32-elf-gcc.path={runtime.tools.xtensa-esp32-elf-gcc.path}
tools.xtensa-esp32s2-elf-gcc.path={runtime.tools.xtensa-esp32s2-elf-gcc.path}
Expand Down
6 changes: 3 additions & 3 deletions variants/materialPlane_sensor/pins_arduino.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ static const uint8_t T13 = 13;
static const uint8_t T14 = 14;

/* Material Plane Sensor specific definitions */

#define PRODUCTION_HW
#define HARDWARE_VARIANT "Production"
#define HARDWARE_VERSION "1.0"
#define NATIVE_USB
Expand Down Expand Up @@ -103,10 +103,10 @@ static const uint8_t MAX17260_SCL_PIN = 40; //SCL pin
static const uint8_t MAX17260_ALERT_PIN = 42; //Alert pin for MAX17260

//MCP73871 pins
static const uint8_t MCP73871_USB_SEL_PIN = 39; //input, select between USB (low) or AC-DC (high)
static const uint8_t MCP73871_USB_SEL_PIN = 38; //input, select between USB (low) or AC-DC (high)
static const uint8_t MCP73871_PROG2_PIN = 37; //input, USB current select, 100mA (low) or 500mA (high) => ext pullup
static const uint8_t MCP73871_TE_PIN = 47; //input, safety time enable (en == low)
static const uint8_t MCP73871_CE_PIN = 38; //input, charge enable (en == high) => ext pullup
static const uint8_t MCP73871_CE_PIN = 39; //input, charge enable (en == high) => ext pullup
static const uint8_t MCP73871_PG_PIN = 36; //output, power good (open-drain)
static const uint8_t MCP73871_STAT1_PIN = 48; //output, stat1 (open-drain)
static const uint8_t MCP73871_STAT2_PIN = 35; //output, stat2 (open-drain)
Expand Down
132 changes: 0 additions & 132 deletions variants/materialPlane_sensor_debug/pins_arduino.h

This file was deleted.

Loading

0 comments on commit fe6a957

Please sign in to comment.