Skip to content

Robot relocated #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 22, 2025
Merged

Robot relocated #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3402d4
move robot icons out of mainline
thomasjball Nov 20, 2025
81deba7
more refactor
thomasjball Nov 20, 2025
8739822
rename
thomasjball Nov 22, 2025
d64f550
rename
thomasjball Nov 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
348 changes: 22 additions & 326 deletions assets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,50 +21,6 @@ namespace microcode {
extraImage = icondb.sampleRailCrossingLight
}

function carImages(name: string | number) {
if (name == Tid.TID_ACTUATOR_CAR) return icondb.car
if (name == Tid.TID_MODIFIER_CAR_FORWARD) return icondb.car_forward
if (name == Tid.TID_MODIFIER_CAR_REVERSE) return icondb.car_reverse
if (name == Tid.TID_MODIFIER_CAR_TURN_LEFT) return icondb.car_left_turn
if (name == Tid.TID_MODIFIER_CAR_TURN_RIGHT)
return icondb.car_right_turn
if (name == Tid.TID_MODIFIER_CAR_STOP) return icondb.car_stop
if (name == Tid.TID_MODIFIER_CAR_FORWARD_FAST)
return icondb.car_forward_fast
if (name == Tid.TID_MODIFIER_CAR_SPIN_LEFT) return icondb.car_left_spin
if (name == Tid.TID_MODIFIER_CAR_SPIN_RIGHT)
return icondb.car_right_spin
if (name == Tid.TID_MODIFIER_CAR_LED_COLOR_1)
return icondb.tile_color_red
if (
name == Tid.TID_MODIFIER_CAR_LED_COLOR_2 ||
name == Tid.TID_MODIFIER_ON ||
name == Tid.TID_FILTER_ON
)
return icondb.tile_color_green
if (name == Tid.TID_MODIFIER_CAR_LED_COLOR_3)
return icondb.tile_color_blue
if (
name == Tid.TID_MODIFIER_CAR_LED_COLOR_4 ||
name == Tid.TID_MODIFIER_OFF ||
name == Tid.TID_FILTER_OFF
)
return icondb.tile_color_black
if (name == Tid.TID_MODIFIER_CAR_ARM_OPEN) return icondb.arm_open
if (name == Tid.TID_MODIFIER_CAR_ARM_CLOSE) return icondb.arm_close
if (name == Tid.TID_SENSOR_CAR_WALL) return icondb.car_wall
if (name == Tid.TID_SENSOR_LINE) return icondb.line_sensor
if (name == Tid.TID_FILTER_LINE_LEFT) return icondb.line_left_on
if (name == Tid.TID_FILTER_LINE_RIGHT) return icondb.line_right_on
if (name == Tid.TID_FILTER_LINE_BOTH) return icondb.line_both_on
if (name == Tid.TID_FILTER_LINE_NEITHER) return icondb.line_neither_on
if (name == Tid.TID_FILTER_LINE_NEITHER_LEFT)
return icondb.line_none_from_left
if (name == Tid.TID_FILTER_LINE_NEITHER_RIGHT)
return icondb.line_none_from_right
return null
}

// TODO: factor out all the jacdac stuff into separate file/class
// TODO: so we can generate different builds
function jacdacImages(name: string | number) {
Expand Down Expand Up @@ -282,10 +238,10 @@ namespace microcode {
if (name == Tid.TID_COMPARE_GTE) return icondb.gte

// micro:bit car
const car = carImages(name)
if (car) return car
const jacdac = jacdacImages(name)
if (jacdac) return jacdac
// const car = carImages(name)
// if (car) return car
// const jacdac = jacdacImages(name)
// if (jacdac) return jacdac
extraImage = null
extraSamples(name) // only for web app
if (extraImage) return extraImage
Expand Down Expand Up @@ -2940,120 +2896,7 @@ bffffffffffffffffffffffffffffffb
. . . . . . . . . . . . . . . .
`

export const car = bmp`
. . . . . . . . . . . . . . . .
. . . . . . . . . . . . . . . .
. . . . f f f f f f f f . . . .
. . . f f 1 1 1 1 1 1 f f . . .
. . f f 1 1 1 1 1 1 1 1 f f . .
. . f f 1 1 1 1 1 1 1 d f f . .
. . f f 1 d d d d d d d f f . .
. f f f f f f f f f f f f f f .
. f f 9 f f f f f f f f 9 f f .
. f 9 1 9 f f f f f f 9 1 9 f d
. f f 9 f f f f f f f f 9 f f d
. f f f f f f f f f f f f f f d
. . f f d . . . . . . . f f d d
. . f f d . . . . . . . f f d .
. . f f . . . . . . . . f f . .
. . . . . . . . . . . . . . . .
`

export const car_forward = bmp`
. . . . . . . . . . . . . . . .
. . . . . . . c . . . . . . . .
. . . . . . c 7 c . . . . . . .
. . . . . c 7 7 7 c . . . . . .
. . . . c 7 7 7 7 7 c . . . . .
. . . c 7 7 7 7 7 7 7 c . . . .
. . . c 7 7 7 7 7 7 7 c . . . .
. . . c c c 7 7 7 c c c d . . .
. . . . . c 7 7 7 c d d d . . .
. . . . . c 7 7 7 c d . . . . .
. . . . . c 7 7 7 c d . . . . .
. . . . . c 7 7 7 c d . . . . .
. . . . . c 7 7 7 c d . . . . .
. . . . . c c c c c . . . . . .
. . . . . . . . . . . . . . . .
. . . . . . . . . . . . . . . .
`
export const car_forward_fast = bmp`
. . . . . . . c . . . . . . . .
. . . . . . c 7 c . . . . . . .
. . . . . c 7 7 7 c . . . . . .
. . . . c 7 7 7 7 7 c . . . . .
. . . c 7 7 7 7 7 7 7 c . . . .
. . . c 7 7 7 7 7 7 7 c . . . .
. . . c c c c c c c c c d . . .
. . . . . . . . . . . . . . . .
. . . . . c c c c c . . . . . .
. . . . . c 7 7 7 c d . . . . .
. . . . . c c c c c d . . . . .
. . . . . . . . . . . . . . . .
. . . . . c 7 7 7 c . . . . . .
. . . . . c c c c c d . . . . .
. . . . . . . . . . . . . . . .
. . . . . c 7 7 7 c d . . . . .
`

export const car_reverse = bmp`
. . . . . . . . . . . . . . . .
. . . . . . . . . . . . . . . .
. . . . . . c c c c c . . . . .
. . . . . . c 7 7 7 c . . . . .
. . . . . . c 7 7 7 c d . . . .
. . . . . . c 7 7 7 c d . . . .
. . . . . . c 7 7 7 c d . . . .
. . . . . . c 7 7 7 c d . . . .
. . . . c c c 7 7 7 c c c . . .
. . . . c 7 7 7 7 7 7 7 c . . .
. . . . c 7 7 7 7 7 7 7 c . . .
. . . . . c 7 7 7 7 7 c . . . .
. . . . . . c 7 7 7 c . . . . .
. . . . . . . c 7 c . . . . . .
. . . . . . . . c . . . . . . .
. . . . . . . . . . . . . . . .
`

export const car_left_turn = bmp`
. . . . . . . . . . . . . . . .
. . . . . c c c . . . . . . . .
. . . . c 7 7 c . . . . . . . .
. . . c 7 7 7 c c c c . . . . .
. . c 7 7 7 7 7 7 7 7 c . . . .
. c 7 7 7 7 7 7 7 7 7 7 c . . .
. . c 7 7 7 7 7 7 7 7 7 7 c . .
. . . c 7 7 7 c c 7 7 7 7 7 c .
. . . . c 7 7 c d c 7 7 7 7 c .
. . . . . c c c . . c 7 7 7 c d
. . . . . . . . . . c 7 7 7 c d
. . . . . . . . . . c 7 7 7 c d
. . . . . . . . . . c 7 7 7 c d
. . . . . . . . . . c 7 7 7 c d
. . . . . . . . . . c c c c c .
. . . . . . . . . . . . . . . .
`

export const car_left_spin = bmp`
. . . . . . . . . . . . . . . .
. . . . . . . . . . . . . . . .
. . . . . c c c c c . . . . . .
. . . . c 7 7 7 7 7 c . . . . .
. . . c 7 7 7 7 7 7 7 c . . . .
. . c 7 7 7 7 7 7 7 7 7 c . . .
. . c 7 7 7 c c 7 7 7 7 7 c . .
c c c 7 7 7 c c c 7 7 7 7 7 c .
c 7 7 7 7 7 7 7 c c 7 7 7 7 c .
c 7 7 7 7 7 7 7 c d c 7 7 7 c d
. c 7 7 7 7 7 c d . c 7 7 7 c d
. . c 7 7 7 c d . . c 7 7 7 c d
. . . c 7 c d . . . c 7 7 7 c d
. . . . c . . . . . c 7 7 7 c d
. . . . . . . . . . c c c c c .
. . . . . . . . . . . . . . . .
`

export const car_stop = bmp`
export const stop = bmp`
. . . . . . . . . . . . . . . .
. . . . . d d d d d d . . . . .
. . . . d 1 1 1 1 1 1 d . . . .
Expand Down Expand Up @@ -3091,152 +2934,24 @@ bffffffffffffffffffffffffffffffb
. . . . . . . . . . . . . . . .
`

export const car_wall = bmp`
. . . . . . . . . . . . . . . .
d d d d d d d d d d d d d d d d
2 2 2 2 d 2 2 2 2 d 2 2 2 2 d 2
2 2 2 2 d 2 2 2 2 d 2 2 2 2 d 2
d d d d d d d d d d d d d d d d
2 2 d 2 2 2 2 d 2 2 2 2 d 2 2 2
2 2 d 2 2 2 2 d 2 2 2 2 d 2 2 2
d d d d d d d d d d d d d d d d
2 2 2 2 d 2 2 2 2 d 2 2 2 2 d 2
2 2 2 2 d 2 2 2 2 f f f f f f 2
d d d d d d d d d f 1 1 1 1 f d
2 2 d 2 2 2 2 d 2 f d d d d f 2
2 2 d 2 2 2 2 d f 9 f f f f 9 f
d d d d d d d d f 1 f f f f 1 f
. . . . . . . . f f f f f f f f
. . . . . . . . . f . . . . f .
`

export const line_sensor = bmp`
. . . . . . . . . . . . . . . .
. b d d d d c f f c d d d d b .
. b d d d d c f f c d d d d b .
. b d d d d c f f c d d d d b .
. d d d d d c f f c d d d d d .
. d d d d d c f f c d d d d d .
. d d d d d c f f c d d d d d .
. b d d d d c f f c d d d d b .
. b d d d d c f c c d d d d b .
. b d d d d c f c f f f f f f .
. d d d d d c f c f 1 1 1 1 f .
. d d d d d c f c f d d d d f .
. d d d d d c c f 9 f f f f 9 f
. b d d d d c c f 1 f f f f 1 f
. b d d d d c c f f f f f f f f
. . . . . . . . . f . . . . f .
`
export const line_neither_on = bmp`
. . . . . . . . . . . . . . . .
. . . . . . . . . . . . . . . .
. . . . . . . . . . . . . . . .
. . . . . d d . d d . . . . . .
. . . . d 1 d . d 1 d . . . . .
. . . d 1 1 d . d 1 1 d . . . .
. . d 1 1 1 d . d 1 1 1 d . . .
. d 1 1 1 1 d . d 1 1 1 1 d . .
. d 1 1 1 1 d . d 1 1 1 1 d . .
. d 1 1 1 1 d . d 1 1 1 1 d . .
. d 1 1 1 1 d . d 1 1 1 1 d . .
. d 1 1 1 d . . . d 1 1 1 d . .
. d 1 1 d . . . . . d 1 1 d . .
. d 1 d . . . . . . . d 1 d . .
. d d . . . . . . . . . d d . .
. . . . . . . . . . . . . . . .
export const soil_moisture = bmp`
. . . . . . . . . . . . . . . .
. . . . 8 . . . . . . . . . . .
. . . . 9 8 . . . . . 8 . . . .
. . . . 9 8 . . . . . 9 8 . . .
. . . 9 9 9 8 . . . . 9 8 . . .
. . . 9 9 9 8 . . . 9 9 9 8 . .
. . 9 9 9 9 9 8 . . 9 9 9 8 . .
. . 9 9 9 9 9 8 . 9 9 9 9 9 8 .
. . 9 1 9 9 9 8 . 9 9 9 9 9 8 .
. . 9 9 1 9 9 8 . 9 1 9 9 9 8 .
. . e 9 9 9 8 e e 9 9 1 9 9 8 .
. e e e e e e e e e 9 9 9 8 . .
. b e e e e e e e e e e e 5 5 5
. . b e e e e e e e e e b 5 5 5
. . . b b b b b b b b b . 5 5 4
. . . . . . . . . . . . . 4 4 .
`
export const line_left_on = bmp`
. c f f f c . . . . . . . . . .
. c f f f c . . . . . . . . . .
. c f f f b . . . . . . . . . .
. c f f f d d . d d . . . . . .
. c f f d 7 d . d 1 d . . . . .
. c f d 7 7 d . d 1 1 d . . . .
. b d 7 7 7 d . d 1 1 1 d . . .
. d 7 7 7 7 d . d 1 1 1 1 d . .
. d 7 7 7 7 d . d 1 1 1 1 d . .
. d 7 7 7 7 d . d 1 1 1 1 d . .
. d 7 7 7 7 d . d 1 1 1 1 d . .
. d 7 7 7 d . . . d 1 1 1 d . .
. d 7 7 d b . . . . d 1 1 d . .
. d 7 d f c . . . . . d 1 d . .
. d d f f c . . . . . . d d . .
. b f f f c . . . . . . . . . .`
export const line_right_on = bmp`
. . . . . . . . . c f f f c . .
. . . . . . . . . c f f f c . .
. . . . . . . . . b f f f c . .
. . . . . d d . d d f f f c . .
. . . . d 1 d . d 7 d f f c . .
. . . d 1 1 d . d 7 7 d f c . .
. . d 1 1 1 d . d 7 7 7 d b . .
. d 1 1 1 1 d . d 7 7 7 7 d . .
. d 1 1 1 1 d . d 7 7 7 7 d . .
. d 1 1 1 1 d . d 7 7 7 7 d . .
. d 1 1 1 1 d . d 7 7 7 7 d . .
. d 1 1 1 d . . . d 7 7 7 d . .
. d 1 1 d . . . . b d 7 7 d . .
. d 1 d . . . . . c f d 7 d . .
. d d . . . . . . c f f d d . .
. . . . . . . . . c f f f b . .
`
export const line_both_on = bmp`
. . . . . c f f f c . . . . . .
. . . . . c f f f c . . . . . .
. . . . . b f f f b . . . . . .
. . . . . d d f d d . . . . . .
. . . . d 7 d f d 7 d . . . . .
. . . d 7 7 d f d 7 7 d . . . .
. . d 7 7 7 d f d 7 7 7 d . . .
. d 7 7 7 7 d f d 7 7 7 7 d . .
. d 7 7 7 7 d f d 7 7 7 7 d . .
. d 7 7 7 7 d f d 7 7 7 7 d . .
. d 7 7 7 7 d f d 7 7 7 7 d . .
. d 7 7 7 d f f f d 7 7 7 d . .
. d 7 7 d b f f f b d 7 7 d . .
. d 7 d . c f f f c . d 7 d . .
. d d . . c f f f c . . d d . .
. . . . . c f f f c . . . . . .
`

export const line_none_from_left = bmp`
. c f f f c . . . . . . . . . .
. c f f f c . . . . . . . . . .
. c f f f c . . . . . . . . . .
. c f f f c . . . . . . d d . d
. c f f f c . . . . . d 1 d . d
. c f f f c . . . . d 1 1 d . d
. c f f f c . . . d 1 1 1 d . d
. c f f f c . . d 1 1 1 1 d . d
. c f f f c . . d 1 1 1 1 d . d
. c f f f c . . d 1 1 1 1 d . d
. c f f f c . . d 1 1 1 1 d . d
. c f f f c . . d 1 1 1 d . . .
. c f f f c . . d 1 1 d . . . .
. c f f f c . . d 1 d . . . . .
. c f f f c . . d d . . . . . .
. c f f f c . . . . . . . . . .
`

export const line_none_from_right = bmp`
. . . . . . . . . . c f f f c .
. . . . . . . . . . c f f f c .
. . . . . . . . . . c f f f c .
d . d d . . . . . . c f f f c .
d . d 1 d . . . . . c f f f c .
d . d 1 1 d . . . . c f f f c .
d . d 1 1 1 d . . . c f f f c .
d . d 1 1 1 1 d . . c f f f c .
d . d 1 1 1 1 d . . c f f f c .
d . d 1 1 1 1 d . . c f f f c .
d . d 1 1 1 1 d . . c f f f c .
. . . d 1 1 1 d . . c f f f c .
. . . . d 1 1 d . . c f f f c .
. . . . . d 1 d . . c f f f c .
. . . . . . d d . . c f f f c .
. . . . . . . . . . c f f f c .
`

export const distance_sensor = bmp`
. . . . . . . . . . . . . . . .
Expand All @@ -3257,25 +2972,6 @@ bffffffffffffffffffffffffffffffb
. . . . . . . . . . . . . 4 4 .
`

export const soil_moisture = bmp`
. . . . . . . . . . . . . . . .
. . . . 8 . . . . . . . . . . .
. . . . 9 8 . . . . . 8 . . . .
. . . . 9 8 . . . . . 9 8 . . .
. . . 9 9 9 8 . . . . 9 8 . . .
. . . 9 9 9 8 . . . 9 9 9 8 . .
. . 9 9 9 9 9 8 . . 9 9 9 8 . .
. . 9 9 9 9 9 8 . 9 9 9 9 9 8 .
. . 9 1 9 9 9 8 . 9 9 9 9 9 8 .
. . 9 9 1 9 9 8 . 9 1 9 9 9 8 .
. . e 9 9 9 8 e e 9 9 1 9 9 8 .
. e e e e e e e e e 9 9 9 8 . .
. b e e e e e e e e e e e 5 5 5
. . b e e e e e e e e e b 5 5 5
. . . b b b b b b b b b . 5 5 4
. . . . . . . . . . . . . 4 4 .
`

export const relay = bmp`
. . . . . . . . . . . . . . . .
. . . . . f f f f f f . . . . .
Expand Down
2 changes: 1 addition & 1 deletion editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ namespace microcode {
if (!isProgramRunning()) {
runProgram(this.progdef)
this.runBtn.buildSprite(icondb.runDisabled)
this.stopBtn.buildSprite(icondb.car_stop)
this.stopBtn.buildSprite(icondb.stop)
this.dirty = true
}
}
Expand Down
0 parser.ts → exprparser.ts
View file
Open in desktop
File renamed without changes.
Loading