Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
董杰
/
induction_shelf
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 76cbbaaa
由
刘韬
编写于
2024-08-13 11:05:14 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
修正单面灯塔时,出库黄灯不闪烁的问题
1 个父辈
6d35340b
隐藏空白字符变更
内嵌
并排
正在显示
44 个修改的文件
包含
4 行增加
和
5 行删除
感应料架_v1.91/感应料架_v1.91.zip
感应料架_v1.91/Config/AutoSave.config → 感应料架_v1.92/Config/AutoSave.config
感应料架_v1.91/Config/Backup/~AutoSave.config → 感应料架_v1.92/Config/Backup/~AutoSave.config
感应料架_v1.91/Config/ControlBoardList.json → 感应料架_v1.92/Config/ControlBoardList.json
感应料架_v1.91/ConfigHelper.dll → 感应料架_v1.92/ConfigHelper.dll
感应料架_v1.91/ConfigHelper.pdb → 感应料架_v1.92/ConfigHelper.pdb
感应料架_v1.91/ConfigHelper.xml → 感应料架_v1.92/ConfigHelper.xml
感应料架_v1.91/Induction_shelf_manager.exe → 感应料架_v1.92/Induction_shelf_manager.exe
感应料架_v1.91/Induction_shelf_manager.exe.config → 感应料架_v1.92/Induction_shelf_manager.exe.config
感应料架_v1.91/Induction_shelf_manager.pdb → 感应料架_v1.92/Induction_shelf_manager.pdb
感应料架_v1.91/Newtonsoft.Json.dll → 感应料架_v1.92/Newtonsoft.Json.dll
感应料架_v1.91/Newtonsoft.Json.xml → 感应料架_v1.92/Newtonsoft.Json.xml
感应料架_v1.91/Renci.SshNet.dll → 感应料架_v1.92/Renci.SshNet.dll
感应料架_v1.91/Renci.SshNet.xml → 感应料架_v1.92/Renci.SshNet.xml
感应料架_v1.91/WinSCP-5.19.5-Setup.exe → 感应料架_v1.92/WinSCP-5.19.5-Setup.exe
感应料架_v1.91/putty-64bit-0.76-installer.msi → 感应料架_v1.92/putty-64bit-0.76-installer.msi
感应料架_v1.91/smartshelf/app/__init__.py → 感应料架_v1.92/smartshelf/app/__init__.py
感应料架_v1.91/smartshelf/app/autoback.py → 感应料架_v1.92/smartshelf/app/autoback.py
感应料架_v1.91/smartshelf/app/config_ip.py → 感应料架_v1.92/smartshelf/app/config_ip.py
感应料架_v1.91/smartshelf/app/induction_admin.py → 感应料架_v1.92/smartshelf/app/induction_admin.py
感应料架_v1.91/smartshelf/app/induction_config.py → 感应料架_v1.92/smartshelf/app/induction_config.py
感应料架_v1.91/smartshelf/app/induction_post.py → 感应料架_v1.92/smartshelf/app/induction_post.py
感应料架_v1.91/smartshelf/app/induction_test.py → 感应料架_v1.92/smartshelf/app/induction_test.py
感应料架_v1.91/smartshelf/app/netprofile/NEOTEL.nmconnection.bak → 感应料架_v1.92/smartshelf/app/netprofile/NEOTEL.nmconnection.bak
感应料架_v1.91/smartshelf/app/netprofile/dhcpcd.conf.bak → 感应料架_v1.92/smartshelf/app/netprofile/dhcpcd.conf.bak
感应料架_v1.91/smartshelf/app/qr_code.py → 感应料架_v1.92/smartshelf/app/qr_code.py
感应料架_v1.91/smartshelf/app/scan_collection.py → 感应料架_v1.92/smartshelf/app/scan_collection.py
感应料架_v1.91/smartshelf/app/templates/head.html → 感应料架_v1.92/smartshelf/app/templates/head.html
感应料架_v1.91/smartshelf/app/templates/induction_admin.html → 感应料架_v1.92/smartshelf/app/templates/induction_admin.html
感应料架_v1.91/smartshelf/app/templates/induction_config.html → 感应料架_v1.92/smartshelf/app/templates/induction_config.html
感应料架_v1.91/smartshelf/app/templates/induction_control.html → 感应料架_v1.92/smartshelf/app/templates/induction_control.html
感应料架_v1.91/smartshelf/app/templates/induction_debug.html → 感应料架_v1.92/smartshelf/app/templates/induction_debug.html
感应料架_v1.91/smartshelf/app/templates/induction_test.html → 感应料架_v1.92/smartshelf/app/templates/induction_test.html
感应料架_v1.91/smartshelf/app/templates/ipconfig.html → 感应料架_v1.92/smartshelf/app/templates/ipconfig.html
感应料架_v1.91/smartshelf/app/translations/en/LC_MESSAGES/messages.po → 感应料架_v1.92/smartshelf/app/translations/en/LC_MESSAGES/messages.po
感应料架_v1.91/smartshelf/app/utils/__init__.py → 感应料架_v1.92/smartshelf/app/utils/__init__.py
感应料架_v1.91/smartshelf/app/utils/g.py → 感应料架_v1.92/smartshelf/app/utils/g.py
感应料架_v1.91/smartshelf/app/utils/location.py → 感应料架_v1.92/smartshelf/app/utils/location.py
感应料架_v1.91/smartshelf/app/utils/serial_collection.py → 感应料架_v1.92/smartshelf/app/utils/serial_collection.py
感应料架_v1.91/smartshelf/app/utils/serial_communication.py → 感应料架_v1.92/smartshelf/app/utils/serial_communication.py
感应料架_v1.91/smartshelf/app/utils/server_communication.py → 感应料架_v1.92/smartshelf/app/utils/server_communication.py
感应料架_v1.91/smartshelf/app/utils/tools.py → 感应料架_v1.92/smartshelf/app/utils/tools.py
感应料架_v1.91/smartshelf/config.py → 感应料架_v1.92/smartshelf/config.py
感应料架_v1.91/使用说明.docx → 感应料架_v1.92/使用说明.docx
感应料架_v1.91/感应料架_v1.91.zip
deleted
100644 → 0
查看文件 @
6d35340
此文件太大,无法显示。
感应料架_v1.9
1
/Config/AutoSave.config
→
感应料架_v1.9
2
/Config/AutoSave.config
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/Config/Backup/~AutoSave.config
→
感应料架_v1.9
2
/Config/Backup/~AutoSave.config
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/Config/ControlBoardList.json
→
感应料架_v1.9
2
/Config/ControlBoardList.json
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/ConfigHelper.dll
→
感应料架_v1.9
2
/ConfigHelper.dll
查看文件 @
76cbbaa
此文件类型无法预览
感应料架_v1.9
1
/ConfigHelper.pdb
→
感应料架_v1.9
2
/ConfigHelper.pdb
查看文件 @
76cbbaa
此文件类型无法预览
感应料架_v1.9
1
/ConfigHelper.xml
→
感应料架_v1.9
2
/ConfigHelper.xml
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/Induction_shelf_manager.exe
→
感应料架_v1.9
2
/Induction_shelf_manager.exe
查看文件 @
76cbbaa
此文件类型无法预览
感应料架_v1.9
1
/Induction_shelf_manager.exe.config
→
感应料架_v1.9
2
/Induction_shelf_manager.exe.config
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/Induction_shelf_manager.pdb
→
感应料架_v1.9
2
/Induction_shelf_manager.pdb
查看文件 @
76cbbaa
此文件类型无法预览
感应料架_v1.9
1
/Newtonsoft.Json.dll
→
感应料架_v1.9
2
/Newtonsoft.Json.dll
查看文件 @
76cbbaa
此文件类型无法预览
感应料架_v1.9
1
/Newtonsoft.Json.xml
→
感应料架_v1.9
2
/Newtonsoft.Json.xml
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/Renci.SshNet.dll
→
感应料架_v1.9
2
/Renci.SshNet.dll
查看文件 @
76cbbaa
此文件类型无法预览
感应料架_v1.9
1
/Renci.SshNet.xml
→
感应料架_v1.9
2
/Renci.SshNet.xml
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/WinSCP-5.19.5-Setup.exe
→
感应料架_v1.9
2
/WinSCP-5.19.5-Setup.exe
查看文件 @
76cbbaa
此文件太大,无法显示。
感应料架_v1.9
1
/putty-64bit-0.76-installer.msi
→
感应料架_v1.9
2
/putty-64bit-0.76-installer.msi
查看文件 @
76cbbaa
此文件类型无法预览
感应料架_v1.9
1
/smartshelf/app/__init__.py
→
感应料架_v1.9
2
/smartshelf/app/__init__.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/autoback.py
→
感应料架_v1.9
2
/smartshelf/app/autoback.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/config_ip.py
→
感应料架_v1.9
2
/smartshelf/app/config_ip.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/induction_admin.py
→
感应料架_v1.9
2
/smartshelf/app/induction_admin.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/induction_config.py
→
感应料架_v1.9
2
/smartshelf/app/induction_config.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/induction_post.py
→
感应料架_v1.9
2
/smartshelf/app/induction_post.py
查看文件 @
76cbbaa
...
@@ -815,15 +815,14 @@ logging.warning("LEDTOWER {}, {}, {}".format(RedTWLed,YellowTWLed,GreenTWLed))
...
@@ -815,15 +815,14 @@ logging.warning("LEDTOWER {}, {}, {}".format(RedTWLed,YellowTWLed,GreenTWLed))
def
update_tower
(
blink_status
,
ng_status
):
def
update_tower
(
blink_status
,
ng_status
):
global
tower_state
global
tower_state
global
ServerErrorTimes
global
ServerErrorTimes
print
(
"blink_status"
,
blink_status
[
'status'
])
print
(
"blink_status"
,
blink_status
[
'status'
]
,
blink_status
[
'side'
]
)
thisYellowTWLed
=
YellowTWLed
thisYellowTWLed
=
YellowTWLed
if
blink_status
[
'side'
]
.
lower
()
==
'a'
:
if
blink_status
[
'side'
]
.
lower
()
==
'a'
:
thisYellowTWLed
=
YellowTWLed
.
partition
(
'@'
)[
0
]
thisYellowTWLed
=
YellowTWLed
.
partition
(
'@'
)[
0
]
elif
blink_status
[
'side'
]
.
lower
()
==
'b'
:
elif
blink_status
[
'side'
]
.
lower
()
==
'b'
:
if
YellowTWLed
.
partition
(
'@'
)[
0
]
==
YellowTWLed
.
partition
(
'@'
)[
2
]:
thisYellowTWLed
=
YellowTWLed
.
partition
(
'@'
)[
2
]
thisYellowTWLed
=
YellowTWLed
.
partition
(
'@'
)[
0
]
elif
blink_status
[
'side'
]
.
lower
()
==
'both'
and
YellowTWLed
.
partition
(
'@'
)[
0
]
==
YellowTWLed
.
partition
(
'@'
)[
2
]:
else
:
thisYellowTWLed
=
YellowTWLed
.
partition
(
'@'
)[
0
]
thisYellowTWLed
=
YellowTWLed
.
partition
(
'@'
)[
2
]
if
blink_status
[
'status'
]:
if
blink_status
[
'status'
]:
for
led
in
thisYellowTWLed
.
split
(
'@'
):
for
led
in
thisYellowTWLed
.
split
(
'@'
):
...
...
感应料架_v1.9
1
/smartshelf/app/induction_test.py
→
感应料架_v1.9
2
/smartshelf/app/induction_test.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/netprofile/NEOTEL.nmconnection.bak
→
感应料架_v1.9
2
/smartshelf/app/netprofile/NEOTEL.nmconnection.bak
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/netprofile/dhcpcd.conf.bak
→
感应料架_v1.9
2
/smartshelf/app/netprofile/dhcpcd.conf.bak
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/qr_code.py
→
感应料架_v1.9
2
/smartshelf/app/qr_code.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/scan_collection.py
→
感应料架_v1.9
2
/smartshelf/app/scan_collection.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/templates/head.html
→
感应料架_v1.9
2
/smartshelf/app/templates/head.html
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/templates/induction_admin.html
→
感应料架_v1.9
2
/smartshelf/app/templates/induction_admin.html
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/templates/induction_config.html
→
感应料架_v1.9
2
/smartshelf/app/templates/induction_config.html
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/templates/induction_control.html
→
感应料架_v1.9
2
/smartshelf/app/templates/induction_control.html
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/templates/induction_debug.html
→
感应料架_v1.9
2
/smartshelf/app/templates/induction_debug.html
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/templates/induction_test.html
→
感应料架_v1.9
2
/smartshelf/app/templates/induction_test.html
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/templates/ipconfig.html
→
感应料架_v1.9
2
/smartshelf/app/templates/ipconfig.html
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/translations/en/LC_MESSAGES/messages.po
→
感应料架_v1.9
2
/smartshelf/app/translations/en/LC_MESSAGES/messages.po
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/utils/__init__.py
→
感应料架_v1.9
2
/smartshelf/app/utils/__init__.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/utils/g.py
→
感应料架_v1.9
2
/smartshelf/app/utils/g.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/utils/location.py
→
感应料架_v1.9
2
/smartshelf/app/utils/location.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/utils/serial_collection.py
→
感应料架_v1.9
2
/smartshelf/app/utils/serial_collection.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/utils/serial_communication.py
→
感应料架_v1.9
2
/smartshelf/app/utils/serial_communication.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/utils/server_communication.py
→
感应料架_v1.9
2
/smartshelf/app/utils/server_communication.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/app/utils/tools.py
→
感应料架_v1.9
2
/smartshelf/app/utils/tools.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/smartshelf/config.py
→
感应料架_v1.9
2
/smartshelf/config.py
查看文件 @
76cbbaa
文件被删除
感应料架_v1.9
1
/使用说明.docx
→
感应料架_v1.9
2
/使用说明.docx
查看文件 @
76cbbaa
此文件类型无法预览
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论