Skip to content

Commit 5f7de11

Browse files
authored
Merge pull request #2504 from entrylabs/develop-hw
[HW][4.23.0] 하드웨어 버전업 PR
2 parents 6c49429 + 5e2bda3 commit 5f7de11

15 files changed

+10274
-958
lines changed

images/hardware/neo_cannon.png

93.3 KB
Loading

images/hw/neo_cannon.png

93.3 KB
Loading

src/playground/blocks/hardware/block_0uboard.js

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -313,43 +313,6 @@ Entry.pyocoding.getBlocks = function() {
313313
return ANALOG ? ANALOG[port] || 0 : 0;
314314
},
315315
},
316-
pyocoding_get_touch_value: {
317-
color: EntryStatic.colorSet.block.default.HARDWARE,
318-
outerLine: EntryStatic.colorSet.block.darken.HARDWARE,
319-
skeleton: 'basic_string_field',
320-
statements: [],
321-
events: {},
322-
params: [
323-
{
324-
"type": "Dropdown",
325-
"options": [
326-
[ "A3", "3" ],
327-
//[ "A5", "5" ],
328-
],
329-
"value": "3",
330-
"fontSize": 11,
331-
bgColor: EntryStatic.colorSet.block.darken.HARDWARE,
332-
arrowColor: EntryStatic.colorSet.arrow.default.HARDWARE,
333-
},
334-
],
335-
def: {
336-
params: [ null ],
337-
"type": "pyocoding_get_touch_value"
338-
},
339-
isNotFor: [ '0uboard' ],
340-
class: "SENSOR",
341-
paramsKeyMap: {
342-
"PORT": 0,
343-
},
344-
func: function (sprite, script) {
345-
var port = script.getValue("PORT", script);
346-
var ANALOG = Entry.hw.portData.ANALOG;
347-
console.log(port,ANALOG)
348-
if (port[0] === "A")
349-
port = port.substring(1)
350-
return ANALOG ? ANALOG[5] || 0 : 0;
351-
},
352-
},
353316
pyocoding_change_4095to255_value: {
354317
color: EntryStatic.colorSet.block.default.HARDWARE,
355318
outerLine: EntryStatic.colorSet.block.darken.HARDWARE,

src/playground/blocks/hardware/block_KKMOO.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ Entry.kkmoo.getBlocks = function() {
158158
isNotFor: ['kkmoo'],
159159
func: async function(sprite,script){
160160
const wait = (timeToDelay) => new Promise((resolve) => setTimeout(resolve, timeToDelay))
161-
await wait(100);
161+
await wait(300);
162162
await Entry.hw.update();
163163
if(Entry.hw.portData.data == 'true'){
164164
Entry.kkmoo.isMotionRunning = true;

src/playground/blocks/hardware/block_dalgona.js

Lines changed: 6285 additions & 0 deletions
Large diffs are not rendered by default.

src/playground/blocks/hardware/block_neo.js

Lines changed: 354 additions & 171 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)