Skip to content

R
re860_factory
Commit ea58ae9d authored by lyong's avatar lyong
Browse files
Options

fix(autoFactory):优化RTC,修改wifi发送方式,分割，USB状态获取

parent 4ad59484
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 29 deletions
factoryTest_plugin/factory_autoFactoryTest.js
View file @ ea58ae9d
......@@ -14,7 +14,7 @@ var uartMode = 2 //0:uart 1:uart_carrie_wave
const cmdTable = [
{ kw: 'TEST_START', fn: doStart },
{ kw: 'VERSION', fn: doVersion },
{ kw: 'DUT_START=1', fn: doDutStart },
{ kw: 'DUT_START', fn: doDutStart },
{ kw: 'SCAN', fn: doScan },
{ kw: 'OTG_TEST', fn: doOtg },
{ kw: 'LCD', fn: doLcd },
......@@ -65,19 +65,24 @@ function doVersion(fd) {
console.log("version: " + version);
send(fd, version);
}
function doDutStart(fd) {
function doDutStart(fd, recvBuf) {
console.log("doDutStart");
autoUtil.startWifiScan();
autoUtil.AnalyzeATSearchSsid(recvBuf);
send(fd, '+OK');
}
function doScan(fd) {
var value = autoUtil.getWifiScan();
if (value != "null") {
var scanList = "+" + autoUtil.getWifiScan();
console.log("scanList: " + scanList);
var value = autoUtil.getWifiScan() || ""; // if (value != "null") {
// var value = "01,name:Midea_test,rssi:-43,mac:02-b1-f7-70-1d-a2;02,name:HUAWEI_B311_A736,rssi:-41,mac:42-53-0f-36-a7-3d;03,name:MIDEA_B311_A74E,rssi:-47,mac:02-8e-97-4e-a7-3d;"
// 02,name:HUAWEI_B311_A736,rssi:-41,mac:42-53-0f-36-a7-3d;03,name:MIDEA_B311_A74E,rssi:-47,mac:02-8e-97-4e-a7-3d;04,name:360\xe5\x85\x8d\xe8\xb4\xb9WiFi-8A,rssi:-39,mac:b2-95-9d-82-0b-28;05,name:HUAWEI-888,rssi:-48,mac:22-7e-45-7e-03-a4"
// 06,name:\x00\x00\x00\x00\x00\x00\x00\x00,rssi:-52,mac:b4-86-55-1e-e9-2d;07,name:BYT_HS,rssi:-48,mac:30-89-d3-2f-a5-a3;08,name:\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00,rssi:-50,mac:fc-60-9b-7a-8e-50;09,name:Midea_test,rssi:-49,mac:8e-21-70-c1-69-c8;10,name:HUAWEI-0E1G4D,rssi:-51,mac:d4-8f-a2-42-26-90;"
var scanList = "+" + value ;
// console.log("scanList: " + scanList);
send(fd, scanList);
}
// }
}
function doOtg(fd) {
if (autoUtil.checkUsbDeviceExist() == true) {
......@@ -165,7 +170,7 @@ function doWriteLic(fd, recvBuf) {
}
function doKeyBz(fd, recvBuf) {
/* 人工弹窗可接 UI，这里直接返回 OK */
autoUtil.setAutoModeUI("INIT");
// autoUtil.setAutoModeUI("INIT");
autoUtil.setAutoModeUI("TOUCH");
touchFlag = 1;
// send(fd, '+OK');
......@@ -258,6 +263,7 @@ function uartCarrieWave() {
uartFd(fd);
// testUartFd(fd);
console.log("!!!auto ing :" + outTime);
cnt30s(fd);
}, 1000)
......@@ -312,9 +318,9 @@ function getCountdownStatus() {
}
function send(fd, cmd) {
var cmdBuf = cmd + "\r\n";
var cmdBuf = cmd + "\r\r\n\n";
var len = cmdBuf.length; // 返回 8
console.log("TX:" + cmdBuf + "(len):" + cmdBuf.length);
console.log("!!TX:" + cmdBuf + "(len):" + cmdBuf.length);
return uart.uart_send(fd, cmdBuf, len);
}
......
factoryTest_plugin/factory_autoFactoryTestUtil.js
View file @ ea58ae9d
......@@ -42,9 +42,13 @@ function parseWifiScanResults(output) {
return results;
}
function checkUsbDeviceExist() {
var eUSB = require("eUSB.js");
return eUSB.isExist("/sys/devices/platform/soc@3000000/4200000.ehci1-controller/usb1/1-1");
function checkUsbDeviceExist() {
// /sys/devices/platform/soc@3000000/4200000.ehci1-controller/usb1/1-1doOtg
var usbPath = "/sys/devices/platform/soc@3000000/4200000.ehci1-controller/usb1/1-1"
var ret = devExist(usbPath);
// console.log("checkUsbDeviceExist ret: " + ret)
if (devExist(usbPath)) return true
return false;
}
function enableScan() {
......@@ -55,7 +59,7 @@ function enableScan() {
console.log("its win32.")
return;
}
console.log("resultsWifiList:")
// console.log("resultsWifiList:")
// if (resultsWifiList && oneFlag) {
// scanRefreshWifiList(resultsWifiList)
// oneFlag = 0;
......@@ -76,12 +80,12 @@ function enableScan() {
system("wpa_cli -p /tmp/wpa_supplicant/sockets scan_results > /tmp/scan_FactoryResult.txt")
var content = fs.read("/tmp/scan_FactoryResult.txt", "r")
if (content) {
console.log("content: " + content)
// console.log("content: " + content)
var listScanValue = parseWifiScanResults(content)
console.log("listScanValue------------" + JSON.stringify(listScanValue))
// console.log("listScanValue------------" + JSON.stringify(listScanValue))
if (listScanValue.length > 0) {
resultsWifiList = listScanValue;
console.log(JSON.stringify(resultsWifiList))
// console.log("!!scan"+JSON.stringify(resultsWifiList))
}
}
scanFlag = true;
......@@ -95,19 +99,51 @@ function startWifiScan() {
}
var checkSsidName = "null"
function getCheckSsid() {
return checkSsidName
}
function setCheckSsid(value) {
checkSsidName = value;
}
function AnalyzeATSearchSsid(value) {
// AT+DUT_START=Midea_test\r\r\n\n
let line = value;
/* 1. 只有出现 \r 或 \n 时才去删，否则保持原样 */
if (/(?:\r|\n)/.test(line)) {
line = line.replace(/[\r\n]/g, '');
}
/* 2. 取 SSID */
const prefix = 'AT+DUT_START=';
const idx = line.indexOf(prefix);
if (idx === -1) return; // 格式不对直接放弃
const ssid = line.slice(idx + prefix.length).trim();
setCheckSsid(ssid);
}
function getWifiScan() {
console.log("getWifiScan")
// console.log("getWifiScan")
if (resultsWifiList == "null" || resultsWifiList.length == 0)
return "null";
console.log("getWifiScan--------2")
// console.log("getWifiScan--------2")
var result = JSON.stringify(resultsWifiList);
console.log(result)
var rel = resultsWifiList.map(ap => `${ap.idx},name:${ap.name},rssi:${ap.rssi},mac:${ap.mac}`)
.join(';');
console.log(rel)
return rel;
// var rel = resultsWifiList.map(ap => `${ap.idx},name:${ap.name},rssi:${ap.rssi},mac:${ap.mac}`)
// .join(';');
// console.log("!getWifiScan:"+ rel)
// return rel;
const first = resultsWifiList.find(ap => ap.name == getCheckSsid());
if (first) {
/* 只要 01 号这一条 */
return `01,name:${first.name},rssi:${first.rssi},mac:${first.mac}`;
}
else {
return "FAIL";
}
}
function writeSn(sn) {
userData.aboutSNValue = sn;
......@@ -217,7 +253,7 @@ function getAutoStartMode() {
}
function initPage(id) {
console.log("!!init id:"+ id)
console.log("!!init id:" + id)
that = id;
}
function ledTimerOut() {
......@@ -225,7 +261,7 @@ function ledTimerOut() {
that.resetUI();
}
function setAutoModeUI(mode) {
console.log("!!that:"+ that)
console.log("!!that:" + that)
console.log("!!setAutoModeUI: " + mode)
switch (mode) {
case "LCD":
......@@ -406,7 +442,7 @@ function figureChecksum(hexStr, size = 2048) {
return checksum;
}
function initUartPWM() {
function initUartPWM() {
system("/mnt/app/quicknode/shell/uartPwmInit.sh &");
}
......@@ -420,7 +456,7 @@ function hexStringToBytes(hexStr) {
}
// 入参：设备路径 返回：1 存在，0 不存在
// 入参：设备路径 返回：1 存在，0 不存在
function devExist(devPath) {
const tmpFlag = "/tmp/dev_exist.flag";
system(
......@@ -458,5 +494,7 @@ module.exports = {
testLicParce: testLicParce,
initUartPWM: initUartPWM,
devExist: devExist,
checkUsbDeviceExist: checkUsbDeviceExist
checkUsbDeviceExist: checkUsbDeviceExist,
AnalyzeATSearchSsid: AnalyzeATSearchSsid,
getRtcTimer: getRtcTimer
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment