Skip to content

董杰 / induction_shelf

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 766a51a0 由 刘韬
选项

1

1 个父辈 70e3d023
全部展开
内嵌 并排
正在显示 11 个修改的文件 包含 9 行增加 和 6 行删除
smartshelf/app/induction_admin.py
...@@ -23,6 +23,7 @@ from app.utils.location import Location ...@@ -23,6 +23,7 @@ from app.utils.location import Location
config_dict,convert_dict = Location().read_location_file() config_dict,convert_dict = Location().read_location_file()
sensorindex={} sensorindex={}
print('convert_dict',convert_dict)
for k,v in convert_dict.items(): for k,v in convert_dict.items():
d=k.split('@') d=k.split('@')
if d[1] not in sensorindex: if d[1] not in sensorindex:
...@@ -307,9 +308,10 @@ def ProcessLastSensor(cur_dict,last_sensor_dict): ...@@ -307,9 +308,10 @@ def ProcessLastSensor(cur_dict,last_sensor_dict):
closelist=[] closelist=[]
lv = last_sensor_dict.get(k) lv = last_sensor_dict.get(k)
hv= sensorindex.get(k) hv= sensorindex.get(k)
print('HV',k,hv)
ledcount=0; ledcount=0;
if lv and len(lv)==len(v): if lv and len(lv)==len(v):
for i in range(0,len(lv)): for i in range(0,len(lv)):
if hv[i]=='1': if hv[i]=='1':
ledcount=ledcount+1 ledcount=ledcount+1
if v[i]=='1' and v[i]!=lv[i]: if v[i]=='1' and v[i]!=lv[i]:
......
smartshelf/app/induction_test.py
...@@ -135,7 +135,7 @@ def process_linetest(data): ...@@ -135,7 +135,7 @@ def process_linetest(data):
# addr = "99" # addr = "99"
#texts = deal_allcommand(color) #texts = deal_allcommand(color)
for i in range(1, 21): for i in range(1, 21):
texts += '{"ADDR":"'+str(i)+'","ledrange":[16,1,100]}\n' texts += '{"ADDR":"'+str(i)+'","ledrange":['+str(color[0])+',1,100]}\n'
else: else:
addr = new_channel_nums addr = new_channel_nums
color_index = color[0] color_index = color[0]
......
smartshelf/app/scan_collection.py
...@@ -58,6 +58,7 @@ def transfer(origin_value): ...@@ -58,6 +58,7 @@ def transfer(origin_value):
c_list.pop(-1) c_list.pop(-1)
keyword = 'A' + addr.group() keyword = 'A' + addr.group()
cur_dict[keyword] = c_list cur_dict[keyword] = c_list
print('cur_dict',keyword,cur_dict[keyword])
except Exception as e: except Exception as e:
logging.warning("读取传感器状态出错:{}".format(repr(e))) logging.warning("读取传感器状态出错:{}".format(repr(e)))
logging.warning("当前解析值:{}".format(receive_data)) logging.warning("当前解析值:{}".format(receive_data))
......
smartshelf/app/templates/induction_test.html
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
addrs=addrs.replace('B','A1'); addrs=addrs.replace('B','A1');
addrs=addrs.replace('A',''); addrs=addrs.replace('A','');
var data = {"channel_num":addrs, var data = {"channel_num":addrs,
"channel_color":15} "channel_color":'off'}
// var form= new FormData(document.getElementById("test_form")); // var form= new FormData(document.getElementById("test_form"));
// var data = {"word":"hello"} // var data = {"word":"hello"}
console.log(data) console.log(data)
......
感应料架_v1.873/Config/ControlBoardList.json
{"192.168.101.222":{"IP":"192.168.101.222","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":70,"shelfState":{"isupdate":false,"state":"off","msg":"未进行测试动作","ipconfig":{"post":"wait","ip":"http://192.168.101.58/smf-core","cid":"1245-02"},"version":"1.871","serial_state":"串口连接正常","ad_serial":"串口号：/dev/ttyUSBN,地址：A1@A2@A3@A4@A5@B1@B2@B3"},"memo":null},"192.168.101.221":{"IP":"192.168.101.221","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":71,"shelfState":{"isupdate":false,"state":"na","msg":null,"ipconfig":null,"version":null,"serial_state":"na","ad_serial":null},"memo":null},"192.168.101.111":{"IP":"192.168.101.111","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":34,"shelfState":{"isupdate":false,"state":"na","msg":null,"ipconfig":null,"version":null,"serial_state":"na","ad_serial":null},"memo":null},"192.168.101.113":{"IP":"192.168.101.113","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":25,"shelfState":{"isupdate":false,"state":"on","msg":"未进行测试动作","ipconfig":{"post":"failed","ip":"http://192.168.10.200/smf-core","cid":"001"},"version":"1.4","serial_state":null,"ad_serial":null},"memo":null},"192.168.101.115":{"IP":"192.168.101.115","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":9,"shelfState":{"isupdate":true,"state":"off","msg":"未进行测试动作","ipconfig":{"post":"failed","ip":"http://192.168.101.77/smf-core","cid":"01"},"version":"1.872","serial_state":"串口连接正常","ad_serial":"串口号：/dev/ttyUSB0,地址：A1@A2@A3@A4@A5@A6@A7@B1@B2@B3@B4@B5@B6@B7"},"memo":null},"192.168.101.116":{"IP":"192.168.101.116","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":72,"shelfState":{"isupdate":true,"state":"off","msg":"未进行测试动作","ipconfig":{"post":"failed","ip":"http://192.168.101.77/smf-core","cid":"01"},"version":"1.872","serial_state":"串口连接正常","ad_serial":"串口号：/dev/ttyUSB0,地址：A1@A2@A3@A4@A5@B1@B2"},"memo":null},"192.168.101.117":{"IP":"192.168.101.117","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":20,"shelfState":{"isupdate":true,"state":"off","msg":"未进行测试动作","ipconfig":{"post":"failed","ip":"http://192.168.101.77/smf-core","cid":"01"},"version":"1.872","serial_state":"Error,'NoneType' object has no attribute 'is_open'","ad_serial":"串口号：/dev/ttyUSB0,地址：A1@A2@A3@A4@A5@B1@B2@B3@B4@B5"},"memo":null}}
\ No newline at end of file \ No newline at end of file
{"192.168.101.222":{"IP":"192.168.101.222","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":70,"shelfState":{"isupdate":false,"state":"off","msg":"未进行测试动作","ipconfig":{"post":"wait","ip":"http://192.168.101.58/smf-core","cid":"1245-02"},"version":"1.871","serial_state":"串口连接正常","ad_serial":"串口号：/dev/ttyUSBN,地址：A1@A2@A3@A4@A5@B1@B2@B3"},"memo":null},"192.168.101.221":{"IP":"192.168.101.221","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":71,"shelfState":{"isupdate":false,"state":"na","msg":null,"ipconfig":null,"version":null,"serial_state":"na","ad_serial":null},"memo":null},"192.168.101.111":{"IP":"192.168.101.111","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":34,"shelfState":{"isupdate":true,"state":"on","msg":"未进行测试动作","ipconfig":{"post":"failed","ip":"http://192.168.101.77/smf-core","cid":"01"},"version":"1.873","serial_state":"串口连接正常","ad_serial":"串口号：/dev/ttyUSB0,地址：A1@A2@A3@A4@A5@A6@A7@B1@B2@B3@B4@B5@B6@B7"},"memo":null},"192.168.101.113":{"IP":"192.168.101.113","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":25,"shelfState":{"isupdate":false,"state":"on","msg":"未进行测试动作","ipconfig":{"post":"failed","ip":"http://192.168.10.200/smf-core","cid":"001"},"version":"1.4","serial_state":null,"ad_serial":null},"memo":null},"192.168.101.115":{"IP":"192.168.101.115","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":9,"shelfState":{"isupdate":true,"state":"on","msg":"未进行测试动作","ipconfig":{"post":"failed","ip":"http://192.168.101.77/smf-core","cid":"01"},"version":"1.873","serial_state":"串口连接正常","ad_serial":"串口号：/dev/ttyUSB0,地址：A1@A2@A3@A4@A5@A6@A7@B1@B2@B3@B4@B5@B6@B7"},"memo":null},"192.168.101.116":{"IP":"192.168.101.116","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":72,"shelfState":{"isupdate":true,"state":"on","msg":"未进行测试动作","ipconfig":{"post":"failed","ip":"http://192.168.101.77/smf-core","cid":"01"},"version":"1.873","serial_state":"串口连接正常","ad_serial":"串口号：/dev/ttyUSB0,地址：A1@A2@A3@A4@A5@B1@B2"},"memo":null},"192.168.101.117":{"IP":"192.168.101.117","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":20,"shelfState":{"isupdate":false,"state":"na","msg":null,"ipconfig":null,"version":null,"serial_state":"na","ad_serial":null},"memo":null}}
\ No newline at end of file \ No newline at end of file
感应料架_v1.873/smartshelf/app/induction_test.py
...@@ -135,7 +135,7 @@ def process_linetest(data): ...@@ -135,7 +135,7 @@ def process_linetest(data):
# addr = "99" # addr = "99"
#texts = deal_allcommand(color) #texts = deal_allcommand(color)
for i in range(1, 21): for i in range(1, 21):
texts += '{"ADDR":"'+str(i)+'","ledrange":[16,1,100]}\n' texts += '{"ADDR":"'+str(i)+'","ledrange":['+str(color[0])+',1,100]}\n'
else: else:
addr = new_channel_nums addr = new_channel_nums
color_index = color[0] color_index = color[0]
......
感应料架_v1.873/smartshelf/app/templates/induction_test.html
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
addrs=addrs.replace('B','A1'); addrs=addrs.replace('B','A1');
addrs=addrs.replace('A',''); addrs=addrs.replace('A','');
var data = {"channel_num":addrs, var data = {"channel_num":addrs,
"channel_color":15} "channel_color":'off'}
// var form= new FormData(document.getElementById("test_form")); // var form= new FormData(document.getElementById("test_form"));
// var data = {"word":"hello"} // var data = {"word":"hello"}
console.log(data) console.log(data)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!