Skip to content

董杰 / induction_shelf

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

添加20mm料盘厚度类型, 添加单面灯塔

1 个父辈 76cbbaaa
内嵌 并排
正在显示 9 个修改的文件 包含 12 行增加 和 9 行删除
smartshelf/app/induction_admin.py
...@@ -336,7 +336,7 @@ def ProcessLastSensor(cur_dict,last_sensor_dict): ...@@ -336,7 +336,7 @@ def ProcessLastSensor(cur_dict,last_sensor_dict):
#16mm 放8mm料盘；25mm放16mm料盘；35放24mm料盘；45放32mm料盘；54门放44mm料盘 #16mm 放8mm料盘；25mm放16mm料盘；35放24mm料盘；45放32mm料盘；54门放44mm料盘
#plateh={'1':8,'2':16,'3':24,'4':32,'5':44} #plateh={'1':8,'2':16,'3':24,'4':32,'5':44}
plateh={'20':8,'14':16,'10':24,'8':32,'5':44} plateh={'20':8,'14':16,'10':24,'8':32,'5':44,'4':20}
@app.route('/buildstore', methods=['POST','GET']) @app.route('/buildstore', methods=['POST','GET'])
def buildstore(): def buildstore():
cid = ip_config['cid'] cid = ip_config['cid']
......
smartshelf/app/induction_config.py
...@@ -298,6 +298,9 @@ def get_towerstate(): ...@@ -298,6 +298,9 @@ def get_towerstate():
'1@4':{'action':False,'status':'off'}, '1@4':{'action':False,'status':'off'},
'2@5':{'action':False,'status':'off'}, '2@5':{'action':False,'status':'off'},
'3@6':{'action':True,'status':'on'}, '3@6':{'action':True,'status':'on'},
'4@1':{'action':False,'status':'off'},
'5@2':{'action':False,'status':'off'},
'6@3':{'action':True,'status':'on'},
'1@1':{'action':False,'status':'off'}, '1@1':{'action':False,'status':'off'},
'2@2':{'action':False,'status':'off'}, '2@2':{'action':False,'status':'off'},
'3@3':{'action':True,'status':'on'}, '3@3':{'action':True,'status':'on'},
......
smartshelf/app/utils/g.py
...@@ -12,7 +12,7 @@ basepath = os.path.dirname(__file__) ...@@ -12,7 +12,7 @@ basepath = os.path.dirname(__file__)
shelfconfigfile = basepath+"/../" + Config.STATE_PATH+'shelfconfig.pkl' shelfconfigfile = basepath+"/../" + Config.STATE_PATH+'shelfconfig.pkl'
def ver(): def ver():
return "1.92" return "1.93"
class _shelfconfig: class _shelfconfig:
def __init__(self): def __init__(self):
......
感应料架_v1.92/Config/AutoSave.config
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<config ver="10"> <config ver="10">
<item key="ipstart" ver="10" value="192.168.101.132" /> <item key="ipstart" ver="10" value="192.168.1.113" />
<item key="ipend" ver="10" value="133" /> <item key="ipend" ver="10" value="113" />
</config> </config>
\ No newline at end of file \ No newline at end of file
感应料架_v1.92/Config/Backup/~AutoSave.config
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<config ver="10"> <config ver="10">
<item key="ipstart" ver="10" value="192.168.101.132" /> <item key="ipstart" ver="10" value="192.168.1.113" />
<item key="ipend" ver="10" value="133" /> <item key="ipend" ver="10" value="113" />
</config> </config>
\ No newline at end of file \ No newline at end of file
感应料架_v1.92/Config/ControlBoardList.json
{"192.168.101.132":{"IP":"192.168.101.132","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":91,"shelfState":{"isupdate":true,"state":"on","msg":"未进行测试动作","ipconfig":{"post":"success","ip":"http://192.168.101.108/smf-core","cid":"SO1484"},"version":"1.92","serial_state":"串口连接正常","ad_serial":"串口号：/dev/ttyUSB0,地址：A1@A2@A3@B1@B2"},"memo":null}}
\ No newline at end of file \ No newline at end of file
{"192.168.101.132":{"IP":"192.168.101.132","Mac":"","Host":null,"BoardType":0,"Ver":0.0,"MCAddr":null,"PingDelay":91,"shelfState":{"isupdate":false,"state":"on","msg":"未进行测试动作","ipconfig":{"post":"success","ip":"http://192.168.101.108/smf-core","cid":"SO1484"},"version":"1.92","serial_state":"串口连接正常","ad_serial":"串口号：/dev/ttyUSB0,地址：A1@A2@A3@B1@B2"},"memo":null},"192.168.1.113":{"IP":"192.168.1.113","Mac":"DA:90:CC:85:CE:A2","Host":null,"BoardType":2,"Ver":0.0,"MCAddr":null,"PingDelay":47,"shelfState":{"isupdate":true,"state":"off","msg":"未进行测试动作","ipconfig":{"post":"wait","ip":"http://192.168.1.243/smf-core","cid":"4"},"version":"1.7","serial_state":"Error,'NoneType' object has no attribute 'is_open'","ad_serial":"串口号：/dev/ttyUSB0,地址：A1@A2@A3@A4@A5@A6@A7@B1@B2@B3@B4@B5@B6@B7"},"memo":null}}
\ No newline at end of file \ No newline at end of file
感应料架_v1.92/smartshelf/app/induction_admin.py
...@@ -336,7 +336,7 @@ def ProcessLastSensor(cur_dict,last_sensor_dict): ...@@ -336,7 +336,7 @@ def ProcessLastSensor(cur_dict,last_sensor_dict):
#16mm 放8mm料盘；25mm放16mm料盘；35放24mm料盘；45放32mm料盘；54门放44mm料盘 #16mm 放8mm料盘；25mm放16mm料盘；35放24mm料盘；45放32mm料盘；54门放44mm料盘
#plateh={'1':8,'2':16,'3':24,'4':32,'5':44} #plateh={'1':8,'2':16,'3':24,'4':32,'5':44}
plateh={'20':8,'14':16,'10':24,'8':32,'5':44} plateh={'20':8,'14':16,'10':24,'8':32,'5':44,'4':20}
@app.route('/buildstore', methods=['POST','GET']) @app.route('/buildstore', methods=['POST','GET'])
def buildstore(): def buildstore():
cid = ip_config['cid'] cid = ip_config['cid']
......
感应料架_v1.92/smartshelf/app/utils/g.py
...@@ -12,7 +12,7 @@ basepath = os.path.dirname(__file__) ...@@ -12,7 +12,7 @@ basepath = os.path.dirname(__file__)
shelfconfigfile = basepath+"/../" + Config.STATE_PATH+'shelfconfig.pkl' shelfconfigfile = basepath+"/../" + Config.STATE_PATH+'shelfconfig.pkl'
def ver(): def ver():
return "1.92" return "1.93"
class _shelfconfig: class _shelfconfig:
def __init__(self): def __init__(self):
......
感应料架_v1.92/感应料架_v1.92.zip 0 → 100644
此文件太大，无法显示。
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!