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

handle disconnect

Browse Source
This commit is contained in:
Peli de Halleux 2019-10-13 13:41:20 -07:00
parent 20be398c2c
commit f116b5d1da
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libs/core/input.ts
View File

@ -287,15 +287,11 @@ void cUiUpdatePower(void)
control.dmesg(`detect devices (hash ${hashDevices()})`) control.dmesg(`detect devices (hash ${hashDevices()})`)
const conns = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS) const conns = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS)
let numChanged = 0; let numChanged = 0;
const uartSensors: SensorInfo[] = [];
for (const sensorInfo of sensorInfos) { for (const sensorInfo of sensorInfos) {
const newConn = conns[sensorInfo.port] const newConn = conns[sensorInfo.port]
if (newConn == sensorInfo.connType if (newConn == sensorInfo.connType
&& sensorInfo.sensor && sensorInfo.sensor) {
&& sensorInfo.sensor.isActive()) {
if (newConn == DAL.CONN_INPUT_UART)
uartSensors.push(sensorInfo);
continue; continue;
} }
numChanged++ numChanged++
@ -304,7 +300,6 @@ void cUiUpdatePower(void)
if (newConn == DAL.CONN_INPUT_UART) { if (newConn == DAL.CONN_INPUT_UART) {
control.dmesg(`new UART connection at ${sensorInfo.port}`) control.dmesg(`new UART connection at ${sensorInfo.port}`)
updateUartMode(sensorInfo.port, 0); updateUartMode(sensorInfo.port, 0);
uartSensors.push(sensorInfo);
} else if (newConn == DAL.CONN_NXT_IIC) { } else if (newConn == DAL.CONN_NXT_IIC) {
control.dmesg(`new IIC connection at ${sensorInfo.port}`) control.dmesg(`new IIC connection at ${sensorInfo.port}`)
sensorInfo.devType = DAL.DEVICE_TYPE_IIC_UNKNOWN sensorInfo.devType = DAL.DEVICE_TYPE_IIC_UNKNOWN
@ -315,21 +310,25 @@ void cUiUpdatePower(void)
// TODO? for now assume touch // TODO? for now assume touch
sensorInfo.devType = DAL.DEVICE_TYPE_TOUCH sensorInfo.devType = DAL.DEVICE_TYPE_TOUCH
} else if (newConn == DAL.CONN_NONE || newConn == 0) { } else if (newConn == DAL.CONN_NONE || newConn == 0) {
//control.dmesg(`disconnect at port ${sensorInfo.port}`) control.dmesg(`disconnected port ${sensorInfo.port}`)
// clear sensor
sensorInfo.sensor = undefined;
clearMode(sensorInfo.port);
} else { } else {
control.dmesg(`unknown connection type: ${newConn} at ${sensorInfo.port}`) control.dmesg(`unknown connection type: ${newConn} at ${sensorInfo.port}`)
// clear sensor
sensorInfo.sensor = undefined;
clearMode(sensorInfo.port);
} }
} }
if (uartSensors.length > 0) {
setUartModes(); setUartModes();
for (const sensorInfo of uartSensors) { for (const sensorInfo of sensorInfos.filter(si => si.connType == DAL.CONN_INPUT_UART)) {
let uinfo = readUartInfo(sensorInfo.port, 0) let uinfo = readUartInfo(sensorInfo.port, 0)
sensorInfo.devType = uinfo[TypesOff.Type] sensorInfo.devType = uinfo[TypesOff.Type]
const mode = uinfo[TypesOff.Mode]; const mode = uinfo[TypesOff.Mode];
control.dmesg(`UART type ${sensorInfo.devType} mode ${mode}`) control.dmesg(`UART type ${sensorInfo.devType} mode ${mode}`)
} }
}
if (numChanged == 0 && nonActivated == 0) if (numChanged == 0 && nonActivated == 0)
return return
@ -550,7 +549,7 @@ void cUiUpdatePower(void)
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Connection + port, DAL.CONN_INPUT_UART) devcon.setNumber(NumberFormat.Int8LE, DevConOff.Connection + port, DAL.CONN_INPUT_UART)
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, 0) devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, 0)
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, 0) devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, 0)
control.dmesg(`UART_CLEAR_CHANGED ${devcon.toHex()}`)
uartMM.ioctl(IO.UART_CLEAR_CHANGED, devcon) uartMM.ioctl(IO.UART_CLEAR_CHANGED, devcon)
uartMM.setNumber(NumberFormat.Int8LE, UartOff.Status + port, uartMM.setNumber(NumberFormat.Int8LE, UartOff.Status + port,
@ -560,7 +559,7 @@ void cUiUpdatePower(void)
} }
function setUartModes() { function setUartModes() {
control.dmesg(`UART set modes 0x${devcon.toHex()}`) control.dmesg(`UART_SET_CONN ${devcon.toHex()}`)
uartMM.ioctl(IO.UART_SET_CONN, devcon) uartMM.ioctl(IO.UART_SET_CONN, devcon)
const ports: number[] = []; const ports: number[] = [];
for (let port = 0; port < DAL.NUM_INPUTS; ++port) { for (let port = 0; port < DAL.NUM_INPUTS; ++port) {
@ -585,13 +584,19 @@ void cUiUpdatePower(void)
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, mode) devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, mode)
} }
function clearMode(port: number) {
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Connection + port, 0)
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, 0)
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, 0)
}
const UART_PORT_CHANGED = 1 const UART_PORT_CHANGED = 1
const UART_DATA_READY = 8 const UART_DATA_READY = 8
function setUartMode(port: number, mode: number) { function setUartMode(port: number, mode: number) {
while (true) { while (true) {
if (port < 0) return if (port < 0) return
updateUartMode(port, mode); updateUartMode(port, mode);
control.dmesg(`UART set mode 0x${devcon.toHex()}`) control.dmesg(`UART_SET_CONN ${devcon.toHex()}`)
uartMM.ioctl(IO.UART_SET_CONN, devcon) uartMM.ioctl(IO.UART_SET_CONN, devcon)
let status = waitNonZeroUartStatus(port) let status = waitNonZeroUartStatus(port)
if (status & UART_PORT_CHANGED) { if (status & UART_PORT_CHANGED) {