c_meyer/pxt-ev3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix alignment

Browse Source
This commit is contained in:
Michal Moskal 2017-07-09 18:12:24 +01:00
parent fd67bb8845
commit c8f41737cb
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libs/core/analog.ts
View File

@ -15,7 +15,8 @@ namespace input {
Crc = 52, // uint16 Crc = 52, // uint16
ADRaw = 54, // uint16[4] ADRaw = 54, // uint16[4]
SensorRaw = 62, // uint16[4] SensorRaw = 62, // uint16[4]
Size = 70 Padding = 70,
Size = 72
} }
const enum AnalogOff { const enum AnalogOff {
InPin1 = 0, // int16[4] InPin1 = 0, // int16[4]
@ -30,14 +31,14 @@ namespace input {
Actual = 4832, // uint16[4] Actual = 4832, // uint16[4]
LogIn = 4840, // uint16[4] LogIn = 4840, // uint16[4]
LogOut = 4848, // uint16[4] LogOut = 4848, // uint16[4]
NxtCol = 4856, // int16[35][4] - NxtCol * 4 NxtCol = 4856, // uint16[36][4] - NxtColor*4
OutPin5Low = 5136, // int16[4] OutPin5Low = 5144, // int16[4]
Updated = 5144, // int8[4] Updated = 5152, // int8[4]
InDcm = 5148, // int8[4] InDcm = 5156, // int8[4]
InConn = 5152, // int8[4] InConn = 5160, // int8[4]
OutDcm = 5156, // int8[4] OutDcm = 5164, // int8[4]
OutConn = 5160, // int8[4] OutConn = 5168, // int8[4]
Size = 5164 Size = 5172
} }
function init() { function init() {
@ -46,6 +47,11 @@ namespace input {
if (!analogMM) control.fail("no analog sensor") if (!analogMM) control.fail("no analog sensor")
} }
export function portState() {
init()
return analogMM.slice(AnalogOff.Updated, 12)
}
export class AnalogSensor { export class AnalogSensor {
protected port: number protected port: number
protected id: number protected id: number
@ -273,12 +279,7 @@ namespace input {
function getUartBytes(port: number): Buffer { function getUartBytes(port: number): Buffer {
let index = uartMM.getNumber(NumberFormat.UInt16LE, UartOff.Actual + port * 2) let index = uartMM.getNumber(NumberFormat.UInt16LE, UartOff.Actual + port * 2)
let buf = output.createBuffer(32) return uartMM.slice(UartOff.Raw + 32 * 300 * port + 32 * index, 32)
for (let i = 0; i < 32; i += 4) {
let v = uartMM.getNumber(NumberFormat.Int32LE, UartOff.Raw + 32 * 300 * port + 32 * index + i)
buf.setNumber(NumberFormat.Int32LE, i, v)
}
return buf
} }
function getUartNumber(fmt: NumberFormat, off: number, port: number) { function getUartNumber(fmt: NumberFormat, off: number, port: number) {
@ -360,5 +361,16 @@ namespace input {
} }
} }
function testPorts() {
let tstPin = control.mmap("/dev/lms_tst_pin", 0, 0)
let tstUart = control.mmap("/dev/lms_tst_uart", 0, 0)
let buf = output.createBuffer(0)
tstPin.ioctl(IO.TST_PIN_ON, buf)
tstUart.ioctl(IO.TST_UART_ON, buf)
loops.pause(30000)
tstUart.ioctl(IO.TST_UART_OFF, buf)
tstPin.ioctl(IO.TST_PIN_OFF, buf)
}
} }