Skip to content

Commit 9f44b89

Browse files
eanders-mseanders-ms
committed
Update pxt.json, assets.ts, language.ts, library.ts, editor.ts
1 parent 5b2e6a6 commit 9f44b89

5 files changed

Lines changed: 114 additions & 1 deletion

File tree

‎assets.ts‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ namespace kojac {
4242
this.reg[tid.modifier.page_3] = icondb.tile_page_3;
4343
this.reg[tid.modifier.page_4] = icondb.tile_page_4;
4444
this.reg[tid.modifier.page_5] = icondb.tile_page_5;
45+
this.reg[tid.modifier.pin_on] = icondb.tile_pin_on;
46+
this.reg[tid.modifier.pin_off] = icondb.tile_pin_off;
4547
this.reg[tid.filter.express_none] = this.reg[tid.modifier.express_none] = icondb.tile_express_none;
4648
this.reg[tid.filter.express_happy] = this.reg[tid.modifier.express_happy] = icondb.tile_express_happy;
4749
this.reg[tid.filter.express_angry] = this.reg[tid.modifier.express_angry] = icondb.tile_express_angry;
@@ -51,6 +53,7 @@ namespace kojac {
5153
this.reg[tid.filter.timespan_long] = icondb.tile_timespan_long;
5254
this.reg[tid.actuator.switch_page] = icondb.tile_switch_page;
5355
this.reg[tid.actuator.express] = icondb.tile_express;
56+
this.reg[tid.actuator.pin_0] = icondb.tile_pin_0;
5457
this.reg[RuleCondition.DEFAULT] = icondb.rc_default;
5558
this.reg[RuleCondition.HIGH] = icondb.rc_high;
5659
this.reg[RuleCondition.LOW] = icondb.rc_low;
@@ -808,6 +811,60 @@ namespace icondb {
808811
. . . . . . . . . . . . . . . .
809812
. . . . . . . . . . . . . . . .
810813
`;
814+
export const tile_pin_0 = img`
815+
. . . . . . . . . . . . . . . .
816+
. . . . . . . . . . . . . . . .
817+
. . . f f f f f f f f f . . . .
818+
. . f 5 5 5 5 5 5 5 5 5 f . . .
819+
. . f 5 5 5 5 5 5 5 5 5 f . . .
820+
. . f 5 5 5 5 5 5 5 5 5 f . . .
821+
. . f 5 f f 5 5 5 f 5 5 f . . .
822+
. . f 5 f 5 f 5 f 5 f 5 f . . .
823+
. . f 5 f f 5 5 f 5 f 5 f . . .
824+
. . f 5 f 5 5 5 5 f 5 5 f . . .
825+
. . f 5 5 5 5 5 5 5 5 5 f . . .
826+
. . f 5 5 5 5 5 5 5 5 5 f . . .
827+
. . f 5 5 5 5 5 5 5 5 5 f . . .
828+
. . . . . . . . . . . . . . . .
829+
. . . . . . . . . . . . . . . .
830+
. . . . . . . . . . . . . . . .
831+
`;
832+
export const tile_pin_on = img`
833+
. . . . . . . . . . . . . . . .
834+
. . . . . . . . . . . . . . . .
835+
. . . . . . . . . . . . . . . .
836+
. . . . . . . . . . . . . . . .
837+
. . . . . . . . . . . . . . . .
838+
. . . . f f . . . f . . . . . .
839+
. . . f . . f . . f f f . . . .
840+
. . . f . . f . . f . . f . . .
841+
. . . f . . f . . f . . f . . .
842+
. . . . f f . . . f . . f . . .
843+
. . . . . . . . . . . . . . . .
844+
. . . . . . . . . . . . . . . .
845+
. . . . . . . . . . . . . . . .
846+
. . . . . . . . . . . . . . . .
847+
. . . . . . . . . . . . . . . .
848+
. . . . . . . . . . . . . . . .
849+
`;
850+
export const tile_pin_off = img`
851+
. . . . . . . . . . . . . . . .
852+
. . . . . . . . . . . . . . . .
853+
. . . . . . . . . . . . . . . .
854+
. . . . . . . . f f . . f f . .
855+
. . . . . . . f . . . f . . . .
856+
. . . f f . . f . . . f . . . .
857+
. . f . . f . f f . . f f . . .
858+
. . f . . f . f . . . f . . . .
859+
. . f . . f . f . . . f . . . .
860+
. . . f f . . f . . . f . . . .
861+
. . . . . . . . . . . . . . . .
862+
. . . . . . . . . . . . . . . .
863+
. . . . . . . . . . . . . . . .
864+
. . . . . . . . . . . . . . . .
865+
. . . . . . . . . . . . . . . .
866+
. . . . . . . . . . . . . . . .
867+
`;
811868
///
812869
/// RULE CONDITIONS
813870
///

‎editor.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ namespace kojac {
4545

4646
private okClicked() {
4747
this.app.save(SAVESLOT_AUTO, this.progdef);
48+
while (controller.A.isPressed()) { pause(10); }
4849
this.app.stageManager.pop();
4950
}
5051

‎language.ts‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@ namespace kojac {
423423
actuator: <any>{
424424
switch_page: "A1",
425425
express: "A2",
426+
pin_0: "A3",
426427
},
427428
modifier: <any>{
428429
page_1: "M1",
@@ -435,6 +436,8 @@ namespace kojac {
435436
express_angry: "M8",
436437
express_heart: "M9",
437438
express_sad: "M10",
439+
pin_on: "M11",
440+
pin_off: "M12",
438441
}
439442
}
440443

@@ -443,7 +446,8 @@ namespace kojac {
443446
tid.modifier.page_2,
444447
tid.modifier.page_3,
445448
tid.modifier.page_4,
446-
tid.modifier.page_5];
449+
tid.modifier.page_5
450+
];
447451

448452
export const tiles: TileDatabase = {
449453
sensors: {
@@ -592,6 +596,16 @@ namespace kojac {
592596
}
593597
}
594598
},
599+
[tid.actuator.pin_0]: {
600+
type: TileType.ACTUATOR,
601+
tid: tid.actuator.pin_0,
602+
name: "Pin 0",
603+
constraints: {
604+
allow: {
605+
categories: ["pin_output"]
606+
}
607+
}
608+
},
595609
},
596610
modifiers: {
597611
[tid.modifier.page_1]: {
@@ -719,6 +733,30 @@ namespace kojac {
719733
}
720734
}
721735
},
736+
[tid.modifier.pin_on]: {
737+
type: TileType.MODIFIER,
738+
tid: tid.modifier.pin_on,
739+
name: "on",
740+
category: "pin_output",
741+
priority: 10,
742+
constraints: {
743+
handling: {
744+
"terminal": true
745+
}
746+
}
747+
},
748+
[tid.modifier.pin_off]: {
749+
type: TileType.MODIFIER,
750+
tid: tid.modifier.pin_off,
751+
name: "off",
752+
category: "pin_output",
753+
priority: 10,
754+
constraints: {
755+
handling: {
756+
"terminal": true
757+
}
758+
}
759+
},
722760
}
723761
}
724762
}

‎library.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,14 @@ namespace kojac {
8383
}
8484
},
8585

86+
[tid.actuator.pin_0]: (rule: Rule) => {
87+
let state: boolean = rule.state["pin_state"];
88+
if (state === undefined) {
89+
state = true;
90+
}
91+
pins.digitalWritePin(DigitalPin.P0, state ? 1 : 0);
92+
},
93+
8694
///
8795
/// MODIFIERS
8896
///
@@ -105,5 +113,13 @@ namespace kojac {
105113
[tid.modifier.page_5]: (rule: Rule) => {
106114
rule.state["page"] = 4;
107115
},
116+
117+
[tid.modifier.pin_on]: (rule: Rule) => {
118+
rule.state["pin_state"] = true;
119+
},
120+
121+
[tid.modifier.pin_off]: (rule: Rule) => {
122+
rule.state["pin_state"] = false;
123+
},
108124
}
109125
}

‎pxt.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"description": "",
55
"dependencies": {
66
"device": "*",
7+
"edge-connector": "*",
78
"arcade-text": "github:microsoft/arcade-text#v1.3.0"
89
},
910
"files": [

0 commit comments

Comments
 (0)