@@ -22,7 +22,12 @@ import {
2222import { jacdacDefaultSpecifications } from "./embedspecs"
2323import { prelude } from "./prelude"
2424import { camelize , upperCamel } from "./util"
25- import { packetsToRegisters } from "../../runtime/jacdac-c/jacdac/spectool/jdutils"
25+
26+ const REGISTER_NUMBER = "RegisterNumber"
27+ const REGISTER_BOOL = "RegisterBool"
28+ const REGISTER_STRING = "RegisterString"
29+ const REGISTER_BUFFER = "RegisterBuffer"
30+ const REGISTER_ARRAY = "RegisterArray"
2631
2732function isRegister ( k : jdspec . PacketKind ) {
2833 return k == "ro" || k == "rw" || k == "const"
@@ -114,18 +119,18 @@ function specToDeviceScript(info: jdspec.ServiceSpec): string {
114119 if ( isRegister ( pkt . kind ) ) {
115120 kw = "readonly "
116121 if ( cmt . needsStruct ) {
117- tp = `RegisterArray`
122+ tp = REGISTER_ARRAY
118123 if ( pkt . fields . length > 1 ) tp += ` & { ${ fields } }`
119124 } else {
120125 if ( pkt . fields . length == 1 && pkt . fields [ 0 ] . type == "string" )
121- tp = "RegisterString"
126+ tp = REGISTER_STRING
122127 else if (
123128 pkt . fields . length == 1 &&
124129 pkt . fields [ 0 ] . type == "bytes"
125130 )
126- tp = "RegisterBuffer"
127- else if ( pkt . fields [ 0 ] . type == "bool" ) tp = "RegisterBool"
128- else tp = "RegisterNum"
131+ tp = REGISTER_BUFFER
132+ else if ( pkt . fields [ 0 ] . type == "bool" ) tp = REGISTER_BOOL
133+ else tp = REGISTER_NUMBER
129134 }
130135 } else if ( pkt . kind == "event" ) {
131136 kw = "readonly "
@@ -277,19 +282,19 @@ ${varname}.${camelize(pkt.name)}(${fields}): void
277282 const isConst = pkt . kind === "const"
278283 let tp : string = undefined
279284 if ( cmt . needsStruct ) {
280- tp = `RegisterArray`
285+ tp = REGISTER_ARRAY
281286 if ( pkt . fields . length > 1 ) tp += ` & { ${ fields } }`
282287 } else {
283288 if ( pkt . fields . length == 1 && pkt . fields [ 0 ] . type == "string" )
284- tp = "RegisterString"
289+ tp = REGISTER_STRING
285290 else if ( pkt . fields . length == 1 && pkt . fields [ 0 ] . type == "bytes" )
286- tp = "RegisterBuffer"
287- else if ( pkt . fields [ 0 ] . type == "bool" ) tp = "RegisterBool"
288- else tp = "RegisterNum"
291+ tp = REGISTER_BUFFER
292+ else if ( pkt . fields [ 0 ] . type == "bool" ) tp = REGISTER_BOOL
293+ else tp = REGISTER_NUMBER
289294 }
290- const isNumber = tp === "RegisterNum"
291- const isBoolean = tp === "RegisterBool"
292- const isString = tp === "RegisterString"
295+ const isNumber = tp === REGISTER_NUMBER
296+ const isBoolean = tp === REGISTER_BOOL
297+ const isString = tp === REGISTER_STRING
293298 r . push (
294299 `### ${ pname }
295300` ,
0 commit comments