Skip to content

Commit a4ff098

Browse files
committed
devClass -> productId
1 parent 7b7ad2f commit a4ff098

11 files changed

+28
-23
lines changed

boards/esp32.d.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
/// <reference path="../devicescript/runtime/jacdac-c/dcfg/srvcfg.d.ts" />
2-
1+
import { JsonComment, Pin } from "@devicescript/srvcfg"
32
import {
4-
ArchConfig,
53
DeviceConfig,
6-
JsonComment,
7-
Pin,
8-
} from "@devicescript/srvcfg"
4+
ArchConfig,
5+
} from "../devicescript/compiler/src/archconfig"
96

107
interface ESP32DeviceConfig extends DeviceConfig {
118
sd?: SdCardConfig

boards/esp32/esp32_bare.board.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../esp32deviceconfig.schema.json",
33
"devName": "Espressif ESP32 (bare)",
4-
"devClass": "0x3ff6ffeb",
4+
"productId": "0x3ff6ffeb",
55
"$description": "Bare ESP32 without any default functions for pins.",
66
"url": "https://www.espressif.com/en/products/socs/esp32",
77
"pins": {

boards/esp32/esp32_devkit_c.board.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../esp32deviceconfig.schema.json",
33
"devName": "Espressif ESP32-DevKitC",
4-
"devClass": "0x3c507a05",
4+
"productId": "0x3c507a05",
55
"$description": "ESP32-DevKitC is an entry-level development board. It has all the ESP32 pins exposed and is easy to connect and use.",
66
"url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/hw-reference/esp32/get-started-devkitc.html",
77
"jacdac": {

boards/esp32archconfig.schema.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
"$schema": {
1818
"type": "string"
1919
},
20+
"bareUrl": {
21+
"description": "Where to find a UF2 or BIN file with minimal DCFG.\nCan be auto-populated.",
22+
"type": "string"
23+
},
2024
"binFlashOffset": {
2125
"$ref": "#/definitions/HexInt",
2226
"description": "If specified, will be used as part of output file name."
@@ -50,6 +54,10 @@
5054
],
5155
"type": "string"
5256
},
57+
"repoUrl": {
58+
"description": "Source repo, boards are assumed to sit in `boards/<arch-id>/<board-id>.board.json`\nAuto-populated.",
59+
"type": "string"
60+
},
5361
"uf2Align": {
5462
"$ref": "#/definitions/HexInt",
5563
"description": "Force alignment of the last page in the patched UF2 file.\nSet to 4096 on RP2040 because wof RP2040-E14."

boards/esp32c3/adafruit_qt_py_c3.board.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../esp32deviceconfig.schema.json",
33
"devName": "Adafruit QT Py ESP32-C3 WiFi",
4-
"devClass": "0x3693d40b",
4+
"productId": "0x3693d40b",
55
"$description": "A tiny ESP32-C3 board.",
66
"url": "https://www.adafruit.com/product/5405",
77
"jacdac": {

boards/esp32c3/esp32c3_bare.board.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../esp32deviceconfig.schema.json",
33
"devName": "Espressif ESP32-C3 (bare)",
4-
"devClass": "0x3a1d89be",
4+
"productId": "0x3a1d89be",
55
"$description": "A bare ESP32-C3 board without any pin functions.",
66
"url": "https://www.espressif.com/en/products/socs/esp32-c3",
77
"pins": {}

boards/esp32deviceconfig.schema.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,13 +1377,6 @@
13771377
],
13781378
"type": "string"
13791379
},
1380-
"devClass": {
1381-
"$ref": "#/definitions/HexInt",
1382-
"description": "Device class code, typically given as a hex number starting with 0x3.",
1383-
"examples": [
1384-
"0x379ea214"
1385-
]
1386-
},
13871380
"devName": {
13881381
"description": "Name of the device.",
13891382
"examples": [
@@ -1414,6 +1407,13 @@
14141407
"pins": {
14151408
"$ref": "#/definitions/PinLabels"
14161409
},
1410+
"productId": {
1411+
"$ref": "#/definitions/HexInt",
1412+
"description": "Identifier for a particular firmware running on a particular device, typically given as a hex number starting with 0x3.",
1413+
"examples": [
1414+
"0x379ea214"
1415+
]
1416+
},
14171417
"sd": {
14181418
"$ref": "#/definitions/SdCardConfig"
14191419
},
@@ -1423,8 +1423,8 @@
14231423
}
14241424
},
14251425
"required": [
1426-
"devClass",
1427-
"devName"
1426+
"devName",
1427+
"productId"
14281428
],
14291429
"type": "object"
14301430
}

boards/esp32s2/esp32s2_bare.board.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../esp32deviceconfig.schema.json",
33
"devName": "Espressif ESP32-S2 (bare)",
4-
"devClass": "0x3f140dcc",
4+
"productId": "0x3f140dcc",
55
"$description": "A bare ESP32-S2 board without any pin functions.",
66
"url": "https://www.espressif.com/en/products/socs/esp32-s2",
77
"pins": {}

boards/esp32s2/msr207_v42.board.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../esp32deviceconfig.schema.json",
33
"devName": "MSR JM Brain S2-mini 207 v4.2",
4-
"devClass": "0x322e0e64",
4+
"productId": "0x322e0e64",
55
"jacdac": {
66
"$connector": "Jacdac",
77
"pin": 17

boards/esp32s2/msr48.board.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../esp32deviceconfig.schema.json",
33
"devName": "MSR JacdacIoT 48 v0.2",
4-
"devClass": "0x3de1398b",
4+
"productId": "0x3de1398b",
55
"jacdac": {
66
"$connector": "Jacdac",
77
"pin": 17

0 commit comments

Comments
 (0)