Skip to content

Commit 072f809

Browse files
tyethtyeth
committed
fix(magtag): Add LDO outputs + boot button
1 parent f6d8d58 commit 072f809

File tree

2 files changed

+128
-101
lines changed

2 files changed

+128
-101
lines changed

‎boards/magtag/definition.json‎

Lines changed: 118 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -20,106 +20,126 @@
2020
"0x0": "wippersnapper.magtag.fatfs.VERSION.combined.bin"
2121
}
2222
},
23-
"components":{
24-
"digitalPins":[
25-
{
26-
"name":"D1",
27-
"displayName":"D1 (NeoPixel)",
28-
"dataType":"bool"
29-
},
30-
{
31-
"name":"D15",
32-
"displayName":"Button A",
33-
"dataType":"bool"
34-
},
35-
{
36-
"name":"D14",
37-
"displayName":"Button B",
38-
"dataType":"bool"
39-
},
40-
{
41-
"name":"D12",
42-
"displayName":"Button C",
43-
"dataType":"bool"
44-
},
45-
{
46-
"name":"D11",
47-
"displayName":"Button D",
48-
"dataType":"bool"
49-
},
50-
{
51-
"name":"D10",
52-
"displayName":"D10",
53-
"dataType":"bool",
54-
"hasPWM":true,
55-
"hasServo":true
56-
},
57-
{
58-
"name":"D18",
59-
"displayName":"D18 (A1)",
60-
"dataType":"bool",
61-
"hasPWM":true,
62-
"hasServo":true
63-
},
64-
{
65-
"name":"D13",
66-
"displayName":"Built-in LED",
67-
"dataType":"bool",
68-
"hasPWM":true
69-
},
70-
{
71-
"name":"D43",
72-
"displayName":"D43 (UART TX)",
73-
"dataType":"bool",
74-
"hasPWM":false,
75-
"uartTx":true
76-
},
77-
{
78-
"name":"D44",
79-
"displayName":"D44 (UART RX)",
80-
"dataType":"bool",
81-
"hasPWM":false,
82-
"uartRx":true
23+
"components": {
24+
"digitalPins": [
25+
{
26+
"name": "D0",
27+
"displayName": "D0 (Boot Button)",
28+
"dataType": "bool",
29+
"direction": "INPUT"
30+
},
31+
{
32+
"name": "D1",
33+
"displayName": "D1 (NeoPixel)",
34+
"dataType": "bool"
35+
},
36+
{
37+
"name": "D15",
38+
"displayName": "Button A",
39+
"dataType": "bool"
40+
},
41+
{
42+
"name": "D14",
43+
"displayName": "Button B",
44+
"dataType": "bool"
45+
},
46+
{
47+
"name": "D12",
48+
"displayName": "Button C",
49+
"dataType": "bool"
50+
},
51+
{
52+
"name": "D11",
53+
"displayName": "Button D",
54+
"dataType": "bool"
55+
},
56+
{
57+
"name": "D10",
58+
"displayName": "D10",
59+
"dataType": "bool",
60+
"hasPWM": true,
61+
"hasServo": true
62+
},
63+
{
64+
"name": "D18",
65+
"displayName": "D18 (A1)",
66+
"dataType": "bool",
67+
"hasPWM": true,
68+
"hasServo": true
69+
},
70+
{
71+
"name": "D13",
72+
"displayName": "Built-in LED",
73+
"dataType": "bool",
74+
"hasPWM": true
75+
},
76+
{
77+
"name": "D43",
78+
"displayName": "D43 (UART TX)",
79+
"dataType": "bool",
80+
"hasPWM": false,
81+
"uartTx": true
82+
},
83+
{
84+
"name": "D44",
85+
"displayName": "D44 (UART RX)",
86+
"dataType": "bool",
87+
"hasPWM": false,
88+
"uartRx": true
89+
},
90+
{
91+
"name": "D21",
92+
"displayName": "Disable NeoPixel/Light sensor",
93+
"dataType": "bool",
94+
"hasPWM": false,
95+
"direction": "OUTPUT"
96+
},
97+
{
98+
"name": "D16",
99+
"displayName": "Enable Speaker",
100+
"dataType": "bool",
101+
"hasPWM": false,
102+
"direction": "OUTPUT"
83103
}
84-
],
85-
"analogPins":[
86-
{
87-
"name":"A17",
88-
"displayName":"Piezo Speaker (A0)",
89-
"hasPWM":true,
90-
"dataType":"int16"
91-
},
92-
{
93-
"name":"A10",
94-
"displayName":"D10",
95-
"dataType":"int16",
96-
"hasPWM":true,
97-
"hasServo":true
98-
},
99-
{
100-
"name":"A18",
101-
"displayName":"A1 (D18)",
102-
"dataType":"int16",
103-
"hasPWM":true,
104-
"hasServo":true
105-
},
106-
{
107-
"name":"A3",
108-
"displayName":"Light Sensor (A3)",
109-
"dataType":"int16"
110-
},
111-
{
112-
"name":"A4",
113-
"displayName":"Voltage Monitor (A4)",
114-
"dataType":"int16"
115-
}
116-
],
117-
"i2cPorts": [
118-
{
104+
],
105+
"analogPins": [
106+
{
107+
"name": "A17",
108+
"displayName": "Piezo Speaker (A0)",
109+
"hasPWM": true,
110+
"dataType": "int16"
111+
},
112+
{
113+
"name": "A10",
114+
"displayName": "D10",
115+
"dataType": "int16",
116+
"hasPWM": true,
117+
"hasServo": true
118+
},
119+
{
120+
"name": "A18",
121+
"displayName": "A1 (D18)",
122+
"dataType": "int16",
123+
"hasPWM": true,
124+
"hasServo": true
125+
},
126+
{
127+
"name": "A3",
128+
"displayName": "Light Sensor (A3)",
129+
"dataType": "int16"
130+
},
131+
{
132+
"name": "A4",
133+
"displayName": "Voltage Monitor (A4)",
134+
"dataType": "int16"
135+
}
136+
],
137+
"i2cPorts": [
138+
{
119139
"i2cPortId": 0,
120140
"SDA": 33,
121141
"SCL": 34
122-
}
142+
}
123143
]
124-
}
125-
}
144+
}
145+
}

‎boards/magtag/magic.json‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,22 @@
6565
"resolution": 12,
6666
"pinName": "D13",
6767
"isPWM": true,
68+
"isServo": false,
6869
"selected": false
6970
},
7071
{
71-
"name": "Enable NeoPixel + Light Sensor",
72+
"name": "Disable NeoPixel + Light Sensor",
7273
"pinName": "D21",
7374
"type": "mosfet_driver",
7475
"mode": "DIGITAL",
7576
"direction": "OUTPUT",
76-
"isPin": true
77+
"isPin": true,
78+
"visualization": {
79+
"offLabel": "Enabled",
80+
"onLabel": "Disabled",
81+
"offIcon": "fa6:regular:plug-circle-bolt",
82+
"onIcon": "fa6:solid:plug-circle-xmark"
83+
}
7784
},
7885
{
7986
"name": "NeoPixel",
@@ -113,4 +120,4 @@
113120
"isPWM": true
114121
}
115122
]
116-
}
123+
}

0 commit comments

Comments
 (0)