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

more twidinling

Browse Source
This commit is contained in:
Peli de Halleux 2019-10-13 19:08:34 -07:00
parent cb0da08063
commit c0bd3a7d5d
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/core/input.ts
View File

@ -36,6 +36,7 @@ namespace sensors.internal {
private poll() { private poll() {
control.runInBackground(() => { control.runInBackground(() => {
pause(this.interval);
this.lastQuery = this.lastPause = control.millis(); this.lastQuery = this.lastPause = control.millis();
this.previousValue = this.currentValue = this.query(); this.previousValue = this.currentValue = this.query();
this.update(this.previousValue, this.currentValue); this.update(this.previousValue, this.currentValue);
@ -279,6 +280,12 @@ void cUiUpdatePower(void)
for (let i = 0; i < conns.length; ++i) { for (let i = 0; i < conns.length; ++i) {
r = conns[i] + (r << 6) + (r << 16) - r; r = conns[i] + (r << 6) + (r << 16) - r;
} }
for (const sensorInfo of sensorInfos.filter(si => si.connType == DAL.CONN_INPUT_UART)) {
const status = getUartStatus(sensorInfo.port);
r = status + (r << 6) + (r << 16) - r;
}
return r; return r;
} }
@ -290,7 +297,14 @@ void cUiUpdatePower(void)
const newConn = conns[sensorInfo.port] const newConn = conns[sensorInfo.port]
if (newConn == sensorInfo.connType if (newConn == sensorInfo.connType
&& sensorInfo.sensor) { && sensorInfo.sensor) {
continue; if (newConn == DAL.CONN_INPUT_UART &&
!getUartStatus(sensorInfo.port)) {
sensorInfo.sensor = undefined;
sensorInfo.devType = DAL.DEVICE_TYPE_NONE;
control.dmesg(`UART status 0 at ${sensorInfo.port}`)
}
else
continue;
} }
sensorInfo.connType = newConn sensorInfo.connType = newConn
sensorInfo.devType = DAL.DEVICE_TYPE_NONE sensorInfo.devType = DAL.DEVICE_TYPE_NONE
@ -524,6 +538,7 @@ void cUiUpdatePower(void)
if (port < 0) return 0 if (port < 0) return 0
let s = getUartStatus(port) let s = getUartStatus(port)
if (s) return s if (s) return s
control.dmesg(`UART status 0, waiting...`)
pause(25) pause(25)
} }
} }
@ -540,7 +555,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()}`) control.dmesg(`UART_CLEAR_CHANGED status ${status} ${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,