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

reading nxt analog sensor dev type

Browse Source
This commit is contained in:
Peli de Halleux 2019-10-11 22:20:16 -07:00
parent 030cd46c5f
commit fe39902d10
1 changed files with 565 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libs/core/input.ts
View File

@ -285,36 +285,53 @@ void cUiUpdatePower(void)
let nonActivated = 0; let nonActivated = 0;
function detectDevices() { function detectDevices() {
//control.dmesg(`detect devices (${nonActivated} na)`) //control.dmesg(`detect devices (${nonActivated} na)`)
const conns = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS) const inDcm = analogMM.slice(AnalogOff.InDcm, DAL.NUM_INPUTS)
const inConn = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS)
let numChanged = 0; let numChanged = 0;
const uartSensors: SensorInfo[] = []; const uartSensors: SensorInfo[] = [];
for (const sensorInfo of sensorInfos) { for (const sensorInfo of sensorInfos) {
const newConn = conns[sensorInfo.port] const newConn = inConn[sensorInfo.port]
if (newConn == sensorInfo.connType) { if (newConn == sensorInfo.connType) {
// control.dmesg(`connection unchanged ${newConn} at ${sensorInfo.port}`) // control.dmesg(`connection unchanged ${newConn} at ${sensorInfo.port}`)
continue; continue;
} }
numChanged++ numChanged++
sensorInfo.connType = newConn sensorInfo.connType = newConn
sensorInfo.devType = DAL.DEVICE_TYPE_NONE sensorInfo.devType = DAL.DEVICE_TYPE_NONE;
if (newConn == DAL.CONN_INPUT_UART) { switch (newConn) {
case 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); uartSensors.push(sensorInfo);
} else if (newConn == DAL.CONN_NXT_IIC) { break;
control.dmesg(`new IIC connection at ${sensorInfo.port}`) }
case DAL.CONN_NXT_IIC: {
control.dmesg(`new NXT IIC connection at ${sensorInfo.port}`)
sensorInfo.devType = DAL.DEVICE_TYPE_IIC_UNKNOWN sensorInfo.devType = DAL.DEVICE_TYPE_IIC_UNKNOWN
sensorInfo.iicid = readIICID(sensorInfo.port) sensorInfo.iicid = readIICID(sensorInfo.port)
control.dmesg(`IIC ID ${sensorInfo.iicid.length}`) control.dmesg(`IIC ID ${sensorInfo.iicid.length}`)
} else if (newConn == DAL.CONN_INPUT_DUMB) { break;
} case DAL.CONN_NXT_DUMB: { // analog NXT sensor
control.dmesg(`new NXT analog connection at ${sensorInfo.port}`);
sensorInfo.devType = inDcm[sensorInfo.port];
control.dmesg(`NXT analog dev type ${sensorInfo.devType}`);
break;
}
case DAL.CONN_INPUT_DUMB: {
control.dmesg(`new DUMB connection at ${sensorInfo.port}`) control.dmesg(`new DUMB connection at ${sensorInfo.port}`)
// 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) { break;
}
case DAL.CONN_NONE:
case 0: {
//control.dmesg(`disconnect at port ${sensorInfo.port}`) //control.dmesg(`disconnect at port ${sensorInfo.port}`)
} else { break;
}
default: {
control.dmesg(`unknown connection type: ${newConn} at ${sensorInfo.port}`) control.dmesg(`unknown connection type: ${newConn} at ${sensorInfo.port}`)
break;
} }
} }
@ -805,9 +822,9 @@ void cUiUpdatePower(void)
TST_UART_READ = 0xc0487409, TST_UART_READ = 0xc0487409,
TST_UART_WRITE = 0xc048740a, TST_UART_WRITE = 0xc048740a,
} }
} }
namespace sensors { namespace sensors {
export enum ThresholdState { export enum ThresholdState {
Normal = 1, Normal = 1,
High = 2, High = 2,
@ -893,4 +910,4 @@ namespace sensors {
} }
} }
} }
} }