Skip to content

Commit a4496df

Browse files
committed
screen.ts: groundwork for independent protocols, adjustment.
1 parent 41c6565 commit a4496df

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

screen.ts

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace user_interface_base {
3131
Screen.connectedDisplayType = ConnectedDisplayType.DISPLAY_SHIELD;
3232
} else if (false) { // shieldhelpers.wdsPresent()
3333
Screen.connectedDisplayType = ConnectedDisplayType.WDS;
34-
} else if (false) { // shieldhelpers.jacdacDisplayPresent() OR jacdac.modules...
34+
} else if (false) { // shieldhelpers.jacdacDisplayPresent() OR jacdac.modules....
3535
Screen.connectedDisplayType = ConnectedDisplayType.JACDAC_DISPLAY;
3636
}
3737
}
@@ -71,15 +71,8 @@ namespace user_interface_base {
7171
}
7272

7373
public static resetScreenImage() {
74-
switch (Screen.connectedDisplayType) {
75-
case ConnectedDisplayType.NONE: {
76-
Screen.updateConnectedDisplayType();
77-
}
78-
case ConnectedDisplayType.DISPLAY_SHIELD: {
79-
Screen.image_ = screen()
80-
Screen.updateBounds()
81-
}
82-
}
74+
Screen.image_ = screen()
75+
Screen.updateBounds()
8376
}
8477

8578
public static setImageSize(width: number, height: number) {
@@ -88,8 +81,18 @@ namespace user_interface_base {
8881
}
8982

9083
public static drawTransparentImage(from: Bitmap, x: number, y: number) {
91-
if (Screen.connectedDisplayType == ConnectedDisplayType.DISPLAY_SHIELD) {
92-
Screen.image.drawTransparentBitmap(from, Screen.x(x), Screen.y(y));
84+
switch (Screen.connectedDisplayType) {
85+
case ConnectedDisplayType.NONE: {
86+
Screen.updateConnectedDisplayType();
87+
}
88+
case ConnectedDisplayType.DISPLAY_SHIELD: {
89+
Screen.image.drawTransparentBitmap(from, Screen.x(x), Screen.y(y));
90+
}
91+
case ConnectedDisplayType.WDS: {
92+
// Send over radio:
93+
}
94+
case ConnectedDisplayType.JACDAC_DISPLAY: {
95+
// Send same encoded information as radio, but over Jacdac:
9396
}
9497
}
9598

0 commit comments

Comments
 (0)