Skip to content

Commit 6d98e2a

Browse files
committed
language overhaul round two
biggest change: removed connections as a top-level property. instead, baseBlocks now have a children property with an array of connections where they are the addBlock. rename baseBlocks to be parent, addBlocks to be child. also rename attributes.driveMechanism to be attributes.driveType .
1 parent 937acd8 commit 6d98e2a

File tree

1 file changed

+61
-59
lines changed

1 file changed

+61
-59
lines changed

new_prusa.json

Lines changed: 61 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@
2626
"x": 35,
2727
"y": 25.1,
2828
"z": -100
29-
}
29+
},
30+
"children": [
31+
{
32+
"child": "y leadscrews",
33+
"parentPoint": "-y.center",
34+
"childPoint": "+y.+z"
35+
}
36+
]
3037
},
3138
{
3239
"name": "leadscrew motor b",
@@ -40,7 +47,14 @@
4047
"x": 35,
4148
"y": 25.1,
4249
"z": 100
43-
}
50+
},
51+
"children": [
52+
{
53+
"child": "y leadscrews",
54+
"parentPoint": "-y.center",
55+
"childPoint": "+y.-z"
56+
}
57+
]
4458
},
4559
{
4660
"name": "platform belt motor",
@@ -93,9 +107,21 @@
93107
"z": 0
94108
},
95109
"attributes": {
96-
"driveMechanism": "timingBelt",
110+
"driveType": "timingBelt",
97111
"stepDisplacementRatio": 0.7
98-
}
112+
},
113+
"children": [
114+
{
115+
"child": "y leadscrews",
116+
"parentPoint": "+x.center",
117+
"childPoint": "-x.center"
118+
},
119+
{
120+
"child": "build plate",
121+
"parentPoint": "-y.center",
122+
"childPoint": "+y.center"
123+
},
124+
]
99125
},
100126
{
101127
"name": "carriage",
@@ -110,9 +136,21 @@
110136
"length": 210
111137
},
112138
"attributes": {
113-
"driveMechanism": "timingBelt",
139+
"driveType": "timingBelt",
114140
"stepDisplacementRatio": 0.5
115-
}
141+
},
142+
"children": [
143+
{
144+
"child": "carriage motor",
145+
"parentPoint": "+z.center",
146+
"childPoint": "+x.center"
147+
},
148+
{
149+
"child": "extruder assembly",
150+
"parentPoint": "+x.center",
151+
"childPoint": "-x.center"
152+
},
153+
]
116154
},
117155
{
118156
"name": "y leadscrews",
@@ -127,9 +165,16 @@
127165
"length": 210
128166
},
129167
"attributes": {
130-
"driveMechanism": "leadscrew",
168+
"driveType": "leadscrew",
131169
"stepDisplacementRatio": 0.5
132-
}
170+
},
171+
"children": [
172+
{
173+
"child": "carriage",
174+
"parentPoint": "+x.center",
175+
"childPoint": "-x.+z"
176+
}
177+
]
133178
},
134179
{
135180
"name": "extruder assembly",
@@ -141,7 +186,14 @@
141186
},
142187
"attributes": {
143188
"isToolAssembly": true
144-
}
189+
},
190+
"children": [
191+
{
192+
"child": "extruder",
193+
"parentPoint": "+x.center",
194+
"childPoint": "-x.center"
195+
}
196+
]
145197
}
146198
],
147199
"tools": [
@@ -158,56 +210,6 @@
158210
}
159211
}
160212
],
161-
"connections": [
162-
{
163-
"base": "leadscrew motor a",
164-
"basePoint": "-y.center",
165-
"addBlock": "y leadscrews",
166-
"addPoint": "+y.+z"
167-
},
168-
{
169-
"base": "leadscrew motor b",
170-
"basePoint": "-y.center",
171-
"addBlock": "y leadscrews",
172-
"addPoint": "+y.-z"
173-
},
174-
{
175-
"base": "platform belt",
176-
"basePoint": "+x.center",
177-
"addBlock": "y leadscrews",
178-
"addPoint": "-x.center"
179-
},
180-
{
181-
"base": "platform belt",
182-
"basePoint": "-y.center",
183-
"addBlock": "build plate",
184-
"addPoint": "+y.center"
185-
},
186-
{
187-
"base": "z leadscrews",
188-
"basePoint": "+x.center",
189-
"addBlock": "carriage",
190-
"addPoint": "-x.+z"
191-
},
192-
{
193-
"base": "carriage",
194-
"basePoint": "+z.center",
195-
"addBlock": "carriage motor",
196-
"addPoint": "+x.center"
197-
},
198-
{
199-
"base": "carriage",
200-
"basePoint": "+x.center",
201-
"addBlock": "hotend",
202-
"addPoint": "-x.center"
203-
},
204-
{
205-
"base": "hotend",
206-
"basePoint": "+x.center",
207-
"addBlock": "extruder",
208-
"addPoint": "-x.center"
209-
}
210-
],
211213
"metafeatures": {
212214
"version": 2.0,
213215
"machineType": "printer3d",

0 commit comments

Comments
 (0)