Rewriting the radio in TypeScript (#2000)

* Refactoring radio into the ts

* Moving the rest of the radio functionality to the TypeScript

* Removing sim implementation of old radio cpp

* Adding test script

* Removing handler key

* Rename internal functions

* PR feedback

* Refactoring to use event bus
This commit is contained in:
Richard Knoll
2019-04-12 13:10:47 -07:00
committed by GitHub
parent 19641abe92
commit 61aae94d8b
8 changed files with 926 additions and 812 deletions

View File

@ -96,13 +96,6 @@ namespace pxsim {
}
namespace pxsim.radio {
enum PacketPayloadType {
NUMBER = 0,
VALUE = 1,
STRING = 2,
BUFFER = 3
}
export function raiseEvent(id: number, eventid: number): void {
board().radioState.raiseEvent(id, eventid);
}
@ -115,70 +108,17 @@ namespace pxsim.radio {
board().radioState.setTransmitPower(power);
}
export function setTransmitSerialNumber(transmit: boolean): void {
board().radioState.setTransmitSerialNumber(transmit);
}
export function sendNumber(value: number): void {
export function sendRawPacket(buf: RefBuffer) {
board().radioState.datagram.send({
type: PacketPayloadType.NUMBER,
type: 0,
groupId: board().radioState.groupId,
numberData: value,
bufferData: buf.data
});
}
export function sendString(msg: string): void {
if (msg === undefined) return;
msg = msg.substr(0, 19);
board().radioState.datagram.send({
type: PacketPayloadType.STRING,
groupId: board().radioState.groupId,
stringData: msg,
});
}
export function sendBuffer(buf: RefBuffer): void {
if (!buf) return;
const data = buf.data.slice(0, 18);
board().radioState.datagram.send({
type: PacketPayloadType.STRING,
groupId: board().radioState.groupId,
bufferData: data
});
}
export function writeValueToSerial(): void {
const b = board();
writePacketToSerial(b, b.radioState.datagram.recv())
}
export function writeReceivedPacketToSerial(): void {
const b = board();
writePacketToSerial(b, b.radioState.datagram.lastReceived);
}
export function sendValue(name: string, value: number) {
name = name.substr(0, 8);
const msg: number[] = [];
msg.push()
board().radioState.datagram.send({
type: PacketPayloadType.VALUE,
groupId: board().radioState.groupId,
stringData: name,
numberData: value
});
}
export function receiveNumber(): number {
export function readRawPacket() {
const packet = board().radioState.datagram.recv();
return receivedNumber();
}
export function receiveString(): string {
const packet = board().radioState.datagram.recv();
return receivedString();
return new RefBuffer(packet.payload.bufferData)
}
export function receivedSignalStrength(): number {
@ -187,50 +127,6 @@ namespace pxsim.radio {
export function onDataReceived(handler: RefAction): void {
pxtcore.registerWithDal(DAL.MICROBIT_ID_RADIO, DAL.MICROBIT_RADIO_EVT_DATAGRAM, handler);
radio.receiveNumber();
}
export function receivedNumber(): number {
return board().radioState.datagram.lastReceived.payload.numberData || 0;
}
export function receivedSerial(): number {
return board().radioState.datagram.lastReceived.serial;
}
export function receivedString(): string {
return initString(board().radioState.datagram.lastReceived.payload.stringData || "");
}
export function receivedBuffer(): RefBuffer {
return new RefBuffer(board().radioState.datagram.lastReceived.payload.bufferData || new Uint8Array(0))
}
export function receivedTime(): number {
return board().radioState.datagram.lastReceived.time;
}
function writePacketToSerial(b: DalBoard, p: PacketBuffer) {
switch (p.payload.type) {
case PacketPayloadType.NUMBER:
b.writeSerial(`{"t":${p.time},"s":${p.serial},"v":${p.payload.numberData}}\r\n`)
break;
case PacketPayloadType.VALUE:
b.writeSerial(`{"t":${p.time},"s":${p.serial},"n":"${p.payload.stringData}","v":${p.payload.numberData}}\r\n`)
break;
case PacketPayloadType.STRING:
b.writeSerial(`{"t":${p.time},"s":${p.serial},"n":"${p.payload.stringData}"}\r\n`)
break;
// TODO: (microbit master)
// case PacketPayloadType.BUFFER:
// const buf = new Uint8Array(p.payload.bufferData.buffer);
// let res = "";
// for (let i = 0; i < buf.length; ++i)
// res += String.fromCharCode(buf[i]);
// b.writeSerial(`{"t":${p.time},"s":${p.serial},"b":"${res}"}\r\n`)
default:
// unknown type
break;
}
readRawPacket();
}
}