Skip to content

董杰 / SmartShelf-raspberry

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

1

1 个父辈 8f02bb21
内嵌 并排
正在显示 64 个修改的文件 包含 107 行增加 和 10 行删除
smartshelf/app/post.py
...@@ -233,8 +233,9 @@ def resolve_data(datajson): ...@@ -233,8 +233,9 @@ def resolve_data(datajson):
channels = set(channels) channels = set(channels)
light_led(channels) light_led(channels)
def light_led(channels,wait=50): def light_led(channels,wait=100):
global strips global strips
for _ in range(3):
for channel in channels: for channel in channels:
strip = strips[channel] strip = strips[channel]
current_leds = post_leds[channel] current_leds = post_leds[channel]
......
smartshelf/app/version.txt
1.51
\ No newline at end of file \ No newline at end of file
1.52
\ No newline at end of file \ No newline at end of file
smartshelf/logs/smart.log
...@@ -863,3 +863,92 @@ AttributeError: 'NoneType' object has no attribute 'split' ...@@ -863,3 +863,92 @@ AttributeError: 'NoneType' object has no attribute 'split'
2024-03-07 15:45:50,869 : 配置界面 2024-03-07 15:45:50,869 : 配置界面
2024-03-07 15:45:50,947 : 127.0.0.1 - - [07/Mar/2024 15:45:50] "GET /shelfconfig HTTP/1.1" 200 - 2024-03-07 15:45:50,947 : 127.0.0.1 - - [07/Mar/2024 15:45:50] "GET /shelfconfig HTTP/1.1" 200 -
2024-03-07 15:45:51,206 : 127.0.0.1 - - [07/Mar/2024 15:45:51] "POST /getstate HTTP/1.1" 200 - 2024-03-07 15:45:51,206 : 127.0.0.1 - - [07/Mar/2024 15:45:51] "POST /getstate HTTP/1.1" 200 -
2024-09-20 13:15:30,768 : 配置文件加载成功...
2024-09-20 13:15:31,071 : ip&cid...:{'post': 'wait', 'ip': ' ', 'cid': '8484'}
2024-09-20 13:15:31,518 : 配置文件加载成功...
2024-09-20 13:15:31,826 : ip&cid...:{'post': 'wait', 'ip': ' ', 'cid': '8484'}
2024-09-20 13:15:33,166 : 无需关闭
2024-09-20 13:15:33,168 : 127.0.0.1 - - [20/Sep/2024 13:15:33] "POST /stoppost HTTP/1.1" 200 -
2024-09-20 13:15:33,898 : 无需关闭
2024-09-20 13:15:33,901 : 127.0.0.1 - - [20/Sep/2024 13:15:33] "POST /stoppost HTTP/1.1" 200 -
2024-09-20 13:15:35,198 : 启动失败,没有服务器地址
2024-09-20 13:15:35,201 : 127.0.0.1 - - [20/Sep/2024 13:15:35] "POST /startpost HTTP/1.1" 200 -
2024-09-20 13:15:35,207 : 启动完成
2024-09-20 13:15:35,930 : 启动失败,没有服务器地址
2024-09-20 13:15:35,933 : 127.0.0.1 - - [20/Sep/2024 13:15:35] "POST /startpost HTTP/1.1" 200 -
2024-09-20 13:15:35,939 : 启动完成
2024-09-20 13:15:49,144 : 控制界面
2024-09-20 13:15:49,206 : 127.0.0.1 - - [20/Sep/2024 13:15:49] "GET / HTTP/1.1" 200 -
2024-09-20 13:15:49,501 : 127.0.0.1 - - [20/Sep/2024 13:15:49] "GET /static/css/bootstrap.min.css HTTP/1.1" 200 -
2024-09-20 13:15:49,510 : 127.0.0.1 - - [20/Sep/2024 13:15:49] "GET /static/js/jquery.min.js HTTP/1.1" 200 -
2024-09-20 13:15:49,513 : 127.0.0.1 - - [20/Sep/2024 13:15:49] "GET /static/js/bootstrap.min.js HTTP/1.1" 200 -
2024-09-20 13:15:49,638 : 127.0.0.1 - - [20/Sep/2024 13:15:49] "POST /getstate HTTP/1.1" 200 -
2024-09-20 13:15:49,681 : 127.0.0.1 - - [20/Sep/2024 13:15:49] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:15:49,935 : 127.0.0.1 - - [20/Sep/2024 13:15:49] "GET /favicon.ico HTTP/1.1" 404 -
2024-09-20 13:15:52,648 : 127.0.0.1 - - [20/Sep/2024 13:15:52] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:15:55,778 : 127.0.0.1 - - [20/Sep/2024 13:15:55] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:15:58,764 : 127.0.0.1 - - [20/Sep/2024 13:15:58] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:01,773 : 127.0.0.1 - - [20/Sep/2024 13:16:01] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:04,774 : 127.0.0.1 - - [20/Sep/2024 13:16:04] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:07,754 : 127.0.0.1 - - [20/Sep/2024 13:16:07] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:10,778 : 127.0.0.1 - - [20/Sep/2024 13:16:10] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:13,737 : 127.0.0.1 - - [20/Sep/2024 13:16:13] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:16,754 : 127.0.0.1 - - [20/Sep/2024 13:16:16] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:19,759 : 127.0.0.1 - - [20/Sep/2024 13:16:19] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:22,769 : 127.0.0.1 - - [20/Sep/2024 13:16:22] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:25,752 : 127.0.0.1 - - [20/Sep/2024 13:16:25] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:28,792 : 127.0.0.1 - - [20/Sep/2024 13:16:28] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:31,768 : 127.0.0.1 - - [20/Sep/2024 13:16:31] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:34,770 : 127.0.0.1 - - [20/Sep/2024 13:16:34] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:37,678 : 127.0.0.1 - - [20/Sep/2024 13:16:37] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:40,184 : 127.0.0.1 - - [20/Sep/2024 13:16:40] "GET /static/css/bootstrap.min.css.map HTTP/1.1" 200 -
2024-09-20 13:16:40,664 : 127.0.0.1 - - [20/Sep/2024 13:16:40] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:43,768 : 127.0.0.1 - - [20/Sep/2024 13:16:43] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:46,770 : 127.0.0.1 - - [20/Sep/2024 13:16:46] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:49,799 : 127.0.0.1 - - [20/Sep/2024 13:16:49] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:52,751 : 127.0.0.1 - - [20/Sep/2024 13:16:52] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:55,761 : 127.0.0.1 - - [20/Sep/2024 13:16:55] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:16:58,770 : 127.0.0.1 - - [20/Sep/2024 13:16:58] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:01,780 : 127.0.0.1 - - [20/Sep/2024 13:17:01] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:04,762 : 127.0.0.1 - - [20/Sep/2024 13:17:04] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:07,782 : 127.0.0.1 - - [20/Sep/2024 13:17:07] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:10,789 : 127.0.0.1 - - [20/Sep/2024 13:17:10] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:13,773 : 127.0.0.1 - - [20/Sep/2024 13:17:13] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:16,762 : 127.0.0.1 - - [20/Sep/2024 13:17:16] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:19,759 : 127.0.0.1 - - [20/Sep/2024 13:17:19] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:22,759 : 127.0.0.1 - - [20/Sep/2024 13:17:22] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:25,749 : 127.0.0.1 - - [20/Sep/2024 13:17:25] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:28,755 : 127.0.0.1 - - [20/Sep/2024 13:17:28] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:31,777 : 127.0.0.1 - - [20/Sep/2024 13:17:31] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:34,770 : 127.0.0.1 - - [20/Sep/2024 13:17:34] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:37,771 : 127.0.0.1 - - [20/Sep/2024 13:17:37] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:17:40,773 : 127.0.0.1 - - [20/Sep/2024 13:17:40] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:18:18,763 : 127.0.0.1 - - [20/Sep/2024 13:18:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:19:18,784 : 127.0.0.1 - - [20/Sep/2024 13:19:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:20:18,770 : 127.0.0.1 - - [20/Sep/2024 13:20:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:21:18,755 : 127.0.0.1 - - [20/Sep/2024 13:21:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:22:18,775 : 127.0.0.1 - - [20/Sep/2024 13:22:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:23:18,785 : 127.0.0.1 - - [20/Sep/2024 13:23:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:24:18,802 : 127.0.0.1 - - [20/Sep/2024 13:24:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:25:18,774 : 127.0.0.1 - - [20/Sep/2024 13:25:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:26:18,804 : 127.0.0.1 - - [20/Sep/2024 13:26:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:27:18,797 : 127.0.0.1 - - [20/Sep/2024 13:27:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:28:18,789 : 127.0.0.1 - - [20/Sep/2024 13:28:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:29:18,765 : 127.0.0.1 - - [20/Sep/2024 13:29:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:30:18,758 : 127.0.0.1 - - [20/Sep/2024 13:30:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:31:18,787 : 127.0.0.1 - - [20/Sep/2024 13:31:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:32:18,788 : 127.0.0.1 - - [20/Sep/2024 13:32:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:33:18,783 : 127.0.0.1 - - [20/Sep/2024 13:33:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:34:18,790 : 127.0.0.1 - - [20/Sep/2024 13:34:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:35:18,780 : 127.0.0.1 - - [20/Sep/2024 13:35:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:36:18,777 : 127.0.0.1 - - [20/Sep/2024 13:36:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:37:18,800 : 127.0.0.1 - - [20/Sep/2024 13:37:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:38:18,756 : 127.0.0.1 - - [20/Sep/2024 13:38:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:39:18,765 : 127.0.0.1 - - [20/Sep/2024 13:39:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:40:18,772 : 127.0.0.1 - - [20/Sep/2024 13:40:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:41:18,807 : 127.0.0.1 - - [20/Sep/2024 13:41:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:42:18,756 : 127.0.0.1 - - [20/Sep/2024 13:42:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:43:18,795 : 127.0.0.1 - - [20/Sep/2024 13:43:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:44:18,773 : 127.0.0.1 - - [20/Sep/2024 13:44:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:45:18,747 : 127.0.0.1 - - [20/Sep/2024 13:45:18] "POST /taillog HTTP/1.1" 200 -
2024-09-20 13:46:18,768 : 127.0.0.1 - - [20/Sep/2024 13:46:18] "POST /taillog HTTP/1.1" 200 -
亮灯料架v1.51/smartshelf/app/version.txt deleted 100644 → 0
1.51
\ No newline at end of file \ No newline at end of file
亮灯料架v1.52/ConfigHelper.dll 0 → 100644
此文件类型无法预览
亮灯料架v1.51/ConfigHelper.xml → 亮灯料架v1.52/ConfigHelper.xml
...@@ -57,6 +57,17 @@ ...@@ -57,6 +57,17 @@
the contents of this method with the code editor. the contents of this method with the code editor.
</summary> </summary>
</member> </member>
<member name="P:ConfigHelper.CheckedListBoxEx.DataSource">
<summary>
绑定数据源
</summary>
<param name="data"></param>
</member>
<member name="T:ConfigHelper.CheckItem">
<summary>
Represents an item in the checklistbox
</summary>
</member>
<member name="T:ConfigHelper.Config"> <member name="T:ConfigHelper.Config">
<summary> <summary>
自定义配置存取 自定义配置存取
......
亮灯料架v1.51/smartshelf/app/post.py → 亮灯料架v1.52/smartshelf/app/post.py
...@@ -233,8 +233,9 @@ def resolve_data(datajson): ...@@ -233,8 +233,9 @@ def resolve_data(datajson):
channels = set(channels) channels = set(channels)
light_led(channels) light_led(channels)
def light_led(channels,wait=50): def light_led(channels,wait=100):
global strips global strips
for _ in range(3):
for channel in channels: for channel in channels:
strip = strips[channel] strip = strips[channel]
current_leds = post_leds[channel] current_leds = post_leds[channel]
...@@ -448,9 +449,3 @@ threads.append(threading.Thread(target=serverpost)) ...@@ -448,9 +449,3 @@ threads.append(threading.Thread(target=serverpost))
for t in threads: for t in threads:
t.start() t.start()
''' '''
亮灯料架v1.51/smartshelf/app/routes.py → 亮灯料架v1.52/smartshelf/app/routes.py
...@@ -580,6 +580,7 @@ def rest_api_v1_shelf_posOn(): ...@@ -580,6 +580,7 @@ def rest_api_v1_shelf_posOn():
#/rest/api/v1/shelf/posOff?posId=1_3_1;1_3_2;1_3_4 #/rest/api/v1/shelf/posOff?posId=1_3_1;1_3_2;1_3_4
#posOff OK 或 posOff FAIL #posOff OK 或 posOff FAIL
@app.route('/rest/api/v1/shelf/posOff', methods=['Get'])
def rest_api_v1_shelf_posOff(): def rest_api_v1_shelf_posOff():
strip1 = get_strip(SET_LED_CHANNEL['1']) strip1 = get_strip(SET_LED_CHANNEL['1'])
strip2 = get_strip(SET_LED_CHANNEL['2']) strip2 = get_strip(SET_LED_CHANNEL['2'])
......
亮灯料架v1.52/smartshelf/app/version.txt 0 → 100644
1.52
\ No newline at end of file \ No newline at end of file
亮灯料架v1.52/亮灯料架v1.52灯塔AB反.7z 0 → 100644
此文件太大，无法显示。
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!