De objectify (#421)

* remove more fields from classes, replace by function lookup

* remove serviceClassName

* remove serviceInstanceIndex field

* fully remove TileType

* remove serviceCommand

* remove jdExternalClass

* fix compile error

* remove json.ts

* remove defaultModifier

* work in fieldEditor

* more work

* more fixes

* fix up compile errors

* refactor

* remove abstract class

* remove priority

* kind to function

* removing jdParam

* finish jdParam

* fix cast

* explicitly allocate numbers to tids

* fix up compile errors

* fix range checks

* jdParam2

* done with jdparam2

* separators

* simplify constraint data structure

* more changes

* fix disallow

* extract constraints to function

* some minor fix and reformat

* forgot a few tiles

* negate terminal function

* fix up sensor read of variable and radio receive

* forgot mod radio value

* fix up priority logic

* removing maps... in progress

* a few fixes

* some casts

* more refactoring

* more errors

* finish up all but topwriter

* done with topwriter

* all fixed

* a few errors

* another fix

* create editor as needed

* renaming

* ranges inclusive

* debugging

* more debugging

* fix deserialize on modifier

* remove logging

* fix regression of serviceCommandArg

* update with new test

* fix servo

* missed a case!

* fix enum error

* passed!

* comment out assembly

* cleanup

* reorder

* fix up first instance logic

* more rearranging

Author: tballmsft

assets.ts

@@ -189,7 +189,6 @@ namespace microcode {
             if (name == TID_ACTUATOR_RADIO_SEND) return icondb.radio_send
             if (name == TID_ACTUATOR_RADIO_SET_GROUP)
                 return icondb.radio_set_group
-            if (name == TID_ACTUATOR_MICROPHONE) return icondb.microphone
             if (name == TID_ACTUATOR_SPEAKER) return icondb.speakerFun
             if (name == TID_ACTUATOR_MUSIC) return icondb.music
 

button.ts

@@ -105,7 +105,6 @@ namespace microcode {
 
         public get bounds() {
             // Returns bounds in local space
-            // This isn't quite right, but it's close enough for now
             return Bounds.GrowXY(
                 this.icon.bounds,
                 borderLeft(this.style),

docs.ts

@@ -360,7 +360,6 @@ namespace docs {
             microcode.TID_ACTUATOR_SHOW_NUMBER,
             microcode.TID_ACTUATOR_RADIO_SEND,
             microcode.TID_ACTUATOR_RADIO_SET_GROUP,
-            microcode.TID_ACTUATOR_MICROPHONE,
             microcode.TID_ACTUATOR_SPEAKER,
             microcode.TID_ACTUATOR_MUSIC,
 

editor.ts

@@ -18,6 +18,10 @@ namespace microcode {
         if (!skipBack) editor.forward()
     }
 
+    export function diskSlots() {
+        return ["disk1", "disk2", "disk3"]
+    }
+
     export class Editor extends Scene {
         navigator: RuleRowNavigator
         private progdef: ProgramDefn
@@ -104,7 +108,7 @@ namespace microcode {
         private pickPage() {
             const btns: PickerButtonDef[] = PAGE_IDS().map(pageId => {
                 return {
-                    icon: pageId,
+                    icon: getIcon(pageId) as string,
                 }
             })
             this.picker.setGroup(btns)
@@ -120,7 +124,7 @@ namespace microcode {
                 return
             }
             this.currPage = index
-            this.pageBtn.setIcon(PAGE_IDS()[this.currPage])
+            this.pageBtn.setIcon(getIcon(PAGE_IDS()[this.currPage]) as string)
             this.pageEditor = new PageEditor(
                 this,
                 this.scrollroot,
@@ -258,7 +262,7 @@ namespace microcode {
             this.pageBtn = new Button({
                 parent: this.hudroot,
                 style: ButtonStyles.BorderedPurple,
-                icon: PAGE_IDS()[this.currPage],
+                icon: getIcon(PAGE_IDS()[this.currPage]),
                 x: Screen.RIGHT_EDGE - 12,
                 y: 8,
                 onClick: () => this.pickPage(),
@@ -406,7 +410,7 @@ namespace microcode {
 
         /* override */ activate() {
             super.activate()
-            this.pageBtn.setIcon(PAGE_IDS()[this.currPage])
+            this.pageBtn.setIcon(tidToString(PAGE_IDS()[this.currPage]))
             if (!this.pageEditor) {
                 this.switchToPage(this.currPage)
             }

fieldeditors.ts

@@ -1,5 +1,278 @@
 namespace microcode {
-    export function iconEditor(
+    export function getFieldEditor(tile: Tile): FieldEditor {
+        if (tile instanceof ModifierEditor) return tile.fieldEditor
+        return undefined
+    }
+
+    class FieldEditor {
+        init(): any {
+            return undefined
+        }
+        clone(field: any): any {
+            return undefined
+        }
+        editor(
+            field: any,
+            picker: Picker,
+            onHide: () => void,
+            onDelete?: () => void
+        ): void {}
+        toImage(field: any): Image {
+            return undefined
+        }
+        toBuffer(field: any): Buffer {
+            return undefined
+        }
+        fromBuffer(buf: BufferReader): any {
+            return undefined
+        }
+    }
+
+    export class ModifierEditor {
+        constructor(public tid: number) {
+            this.firstInstance = false
+        }
+        fieldEditor: FieldEditor
+        firstInstance: boolean
+        getField(): any {
+            return null
+        }
+        getIcon(): string | Image {
+            return null
+        }
+        getNewInstance(field: any = null): ModifierEditor {
+            return null
+        }
+        serviceCommandArg(): Buffer {
+            return null
+        }
+    }
+
+    class IconFieldEditor extends FieldEditor {
+        init() {
+            return img`
+        . . . . .
+        . 1 . 1 .
+        . . . . . 
+        1 . . . 1
+        . 1 1 1 .
+        `
+        }
+        clone(img: Image) {
+            return img.clone()
+        }
+        editor(
+            field: any,
+            picker: Picker,
+            onHide: () => void,
+            onDelete?: () => void
+        ) {
+            iconEditor(field, picker, onHide, onDelete)
+        }
+        toImage(field: any) {
+            return icondb.renderMicrobitLEDs(field)
+        }
+        toBuffer(img: Image) {
+            const ret = Buffer.create(4)
+            for (let index = 0; index < 25; index++) {
+                let byte = index >> 3
+                let bit = index & 7
+                let col = index % 5
+                let row = Math.idiv(index, 5)
+                ret[byte] |= img.getPixel(col, row) << bit
+            }
+            return ret
+        }
+        fromBuffer(br: BufferReader) {
+            const buf = br.readBuffer(4)
+            const img = image.create(5, 5)
+            for (let index = 0; index < 25; index++) {
+                let byte = index >> 3
+                let bit = index & 7
+                let col = index % 5
+                let row = Math.idiv(index, 5)
+                img.setPixel(col, row, (buf[byte] >> bit) & 1)
+            }
+            return img
+        }
+    }
+
+    export class IconEditor extends ModifierEditor {
+        field: Image
+        constructor(field: Image = null) {
+            super(Tid.TID_MODIFIER_ICON_EDITOR)
+            this.fieldEditor = new IconFieldEditor()
+            this.field = this.fieldEditor.clone(
+                field ? field : this.fieldEditor.init()
+            )
+        }
+
+        getField() {
+            return this.field
+        }
+
+        getIcon(): string | Image {
+            return this.firstInstance
+                ? getIcon(Tid.TID_MODIFIER_ICON_EDITOR)
+                : this.fieldEditor.toImage(this.field)
+        }
+
+        getNewInstance(field: any = null) {
+            return new IconEditor(field ? field : this.field.clone())
+        }
+
+        serviceCommandArg() {
+            const buf = Buffer.create(5)
+            for (let col = 0; col < 5; ++col) {
+                let v = 0
+                for (let row = 0; row < 5; ++row) {
+                    if (this.field.getPixel(col, row)) v |= 1 << row
+                }
+                buf[col] = v
+            }
+            return buf
+        }
+    }
+
+    export interface Melody {
+        notes: string
+        tempo: number
+    }
+
+    export const MELODY_LENGTH = 4
+    export const NUM_NOTES = 5
+
+    //export const noteNames = ["C", "D", "E", "F", "G", "A", "B", "C", "D"]
+
+    function setNote(buf: Buffer, offset: number, note: string) {
+        const noteToFreq: { [note: string]: number } = {
+            "0": 261.63, // C4
+            "1": 293.66, // D4
+            "2": 329.63, // E4
+            "3": 349.23, // F4
+            "4": 392.0, // G4
+            "5": 440.0, // A4
+            "6": 493.88, // B4
+            "7": 523.25, // C5
+            "8": 587.33, // D5
+        }
+
+        const period = 1000000 / (note !== "." ? noteToFreq[note] : 1000)
+        const duty = note === "." ? 0 : (period * 0.5) / 2
+        const duration = 250
+        buf.setNumber(NumberFormat.UInt16LE, offset + 0, period)
+        buf.setNumber(NumberFormat.UInt16LE, offset + 2, duty)
+        buf.setNumber(NumberFormat.UInt16LE, offset + 4, duration)
+    }
+
+    class MelodyFieldEditor extends FieldEditor {
+        init() {
+            return { notes: `0240`, tempo: 120 }
+        }
+        clone(melody: Melody) {
+            return { notes: melody.notes.slice(0), tempo: melody.tempo }
+        }
+        editor(
+            field: any,
+            picker: Picker,
+            onHide: () => void,
+            onDelete?: () => void
+        ) {
+            melodyEditor(field, picker, onHide, onDelete)
+        }
+        toImage(field: any) {
+            return icondb.melodyToImage(field)
+        }
+        toBuffer(melody: Melody) {
+            const buf = Buffer.create(3)
+            buf.setUint8(0, melody.tempo)
+            // convert the melody notes into list of integers
+            const notes = melody.notes.split("")
+            // fill the buffer with the notes, 4 bits for each note
+            for (let i = 0; i < MELODY_LENGTH; i++) {
+                const byte = i >> 1
+                const bit = (i & 1) << 2
+                if (notes[i] != ".") {
+                    const note = (parseInt(notes[i]) || 0) + 1
+                    buf.setUint8(
+                        byte + 1,
+                        buf.getUint8(byte + 1) | (note << bit)
+                    )
+                }
+            }
+            return buf
+        }
+        fromBuffer(br: BufferReader) {
+            const buf = br.readBuffer(3)
+            const tempo = buf[0]
+            let notes = ""
+            // read the notes from the buffer
+            for (let i = 0; i < MELODY_LENGTH; i++) {
+                const byte = i >> 1
+                const bit = (i & 1) << 2
+                const note = (buf[byte + 1] >> bit) & 0xf
+                notes += note == 0 ? "." : (note - 1).toString()
+            }
+            return { tempo, notes }
+        }
+    }
+
+    export class MelodyEditor extends ModifierEditor {
+        field: Melody
+        constructor(field: Melody = null) {
+            super(Tid.TID_MODIFIER_MELODY_EDITOR)
+            this.firstInstance = false
+            this.fieldEditor = new MelodyFieldEditor()
+            this.field = this.fieldEditor.clone(
+                field ? field : this.fieldEditor.init()
+            )
+        }
+
+        getField() {
+            return this.field
+        }
+
+        getIcon(): string | Image {
+            return this.firstInstance
+                ? getIcon(Tid.TID_MODIFIER_MELODY_EDITOR)
+                : this.fieldEditor.toImage(this.field)
+        }
+
+        getNewInstance(field: any = null) {
+            return new MelodyEditor(
+                field ? field : this.fieldEditor.clone(this.field)
+            )
+        }
+
+        serviceCommandArg() {
+            const buf = Buffer.create(6 * 8)
+            for (let i = 0; i < MELODY_LENGTH; i++) {
+                setNote(buf, i * 6, this.field.notes[i])
+            }
+            return buf
+        }
+    }
+
+    let iconEditorTile: ModifierEditor = undefined
+    let melodyEditorTile: ModifierEditor = undefined
+    export function getEditor(tid: Tid): ModifierEditor {
+        if (tid == Tid.TID_MODIFIER_ICON_EDITOR) {
+            if (!iconEditorTile) {
+                iconEditorTile = new IconEditor()
+                iconEditorTile.firstInstance = true
+            }
+            return iconEditorTile
+        } else if (tid == Tid.TID_MODIFIER_MELODY_EDITOR) {
+            if (!melodyEditorTile) {
+                melodyEditorTile = new MelodyEditor()
+                melodyEditorTile.firstInstance = true
+            }
+            return melodyEditorTile
+        }
+        return undefined
+    }
+
+    function iconEditor(
         image5x5: Image,
         picker: Picker,
         onHide: () => void,
@@ -44,7 +317,7 @@ namespace microcode {
         )
     }
 
-    export function melodyEditor(
+    function melodyEditor(
         melody: Melody,
         picker: Picker,
         onHide: () => void,

jacs_stringify.ts

@@ -185,8 +185,9 @@ namespace jacs {
         /*
         const fmt = OP_PRINT_FMTS[op]
         if (!fmt) return `???oops op${op}`
-        return expandFmt(fmt, t)        
-        */
+        return expandFmt(fmt, t)
+*/
+
         return "uncomment"
     }
 }