mirror of
https://github.com/oopuuu/zTC1.git
synced 2026-03-23 20:49:55 +08:00
Compare commits
122 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
3f5078294f | ||
|
d7e2243a86 | ||
|
|
4e1b376b6a | ||
|
|
393af288ec | ||
|
e9f1448a69 | ||
|
|
004eaf28dd | ||
|
|
0e361111a5 | ||
|
|
026e058934 | ||
|
|
5623b632c7 | ||
|
|
34e1cabc53 | ||
|
|
e6d430c37c | ||
|
7c77be5455 | ||
|
|
6598250af1 | ||
|
|
60977f0327 | ||
|
|
f1ba19554e | ||
|
|
2b1577998c | ||
|
|
a5c9211fb6 | ||
|
|
e735afc6c5 | ||
|
|
f8d2b25d1e | ||
|
|
a342d4552a | ||
|
|
759a5ec5cc | ||
|
|
0ba50e9a52 | ||
|
|
f8fba89793 | ||
|
|
30a353c035 | ||
|
|
b470b0f8a0 | ||
|
|
76e8612007 | ||
|
|
6cf213a1b9 | ||
|
|
c214f0de30 | ||
|
|
bf7c8dd7fe | ||
|
|
b2bd368b2d | ||
|
|
56c9923336 | ||
|
|
2d34767cde | ||
|
|
2258158a0d | ||
|
|
f7b6b8ae0a | ||
|
|
b38f9f91d8 | ||
|
|
84cf4bfc06 | ||
|
|
542e5daf8a | ||
|
|
ceb208813a | ||
|
|
fe4d037390 | ||
|
|
8e083fe175 | ||
|
|
9ac9e5e2f1 | ||
|
|
36d8330ee3 | ||
|
|
a51c7a8eb2 | ||
|
|
6ef875879f | ||
|
|
2b2a77b5f5 | ||
|
|
787e57439e | ||
|
|
fd157172e3 | ||
|
|
989fd0a1ed | ||
|
|
a76afc6ccb | ||
|
|
23fcd56109 | ||
|
a6bb74f906 | ||
|
|
fd5d190096 | ||
|
|
997eda3ef2 | ||
|
|
e4e0ca969e | ||
|
|
4ea9df172b | ||
|
|
d0a71fe216 | ||
|
|
c8dd3d513d | ||
|
|
dd5b282c85 | ||
|
|
8acef18406 | ||
|
13df06e546 | ||
|
|
9df4b8358b | ||
|
|
bdfed87f1e | ||
|
|
7ea87ae4c9 | ||
|
|
a87d894c4d | ||
|
|
d7e695e37e | ||
|
|
40bdb50a8d | ||
|
|
caffddfb43 | ||
|
|
11d3d50265 | ||
|
|
66d2863fa4 | ||
|
|
56395f62bc | ||
|
|
0d5ba4a7d3 | ||
|
|
d925c7d805 | ||
|
|
b40bb1a022 | ||
|
|
981c33e3ad | ||
|
|
fc631ac9f5 | ||
|
|
840b0eb374 | ||
|
|
f2f63625cc | ||
|
|
78dbc6209b | ||
|
|
2896243e24 | ||
|
|
9d80970e9e | ||
|
|
7bac9096f5 | ||
|
|
5f81f2ca71 | ||
|
|
57dbe17175 | ||
|
|
a8d5319d52 | ||
|
|
f41a20f8d0 | ||
|
|
52da5983b5 | ||
|
|
758abf123b | ||
|
|
e3de06437b | ||
|
|
7f0e5d15c8 | ||
|
|
7656ae998c | ||
|
|
3aec445e57 | ||
|
|
7048333ebc | ||
|
|
bfae22ddd6 | ||
|
|
520a245ef3 | ||
|
|
1f92b30ea0 | ||
|
|
4a20713693 | ||
|
|
b36fce48f5 | ||
|
|
1b7d86f1f7 | ||
|
|
d7c83fa125 | ||
|
|
44ed1d2604 | ||
|
|
f17ca68404 | ||
|
|
b5cb7b8218 | ||
|
|
b099618b91 | ||
|
|
160f4f5b7f | ||
|
|
168f89cc82 | ||
|
|
713dd1a907 | ||
|
|
8537240bbd | ||
|
|
5a1b82b728 | ||
|
|
9caeec8611 | ||
|
|
8a28029940 | ||
|
|
3964703152 | ||
|
|
4b000d109c | ||
|
|
90ba74b401 | ||
|
|
208a7b3ef9 | ||
|
|
ba943fe6ae | ||
|
|
3fca5b51aa | ||
|
|
daa3415717 | ||
|
|
e7d380bf4c | ||
|
|
eb7241e235 | ||
|
|
3350aa5446 | ||
|
|
c94e8fcd12 | ||
|
|
4ed9dbd435 |
125
.cproject
Normal file
125
.cproject
Normal file
@@ -0,0 +1,125 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
|
||||
<storageModule moduleId="org.eclipse.cdt.core.settings">
|
||||
<cconfiguration id="0.2123886510">
|
||||
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.2123886510" moduleId="org.eclipse.cdt.core.settings" name="Default">
|
||||
<externalSettings/>
|
||||
<extensions>
|
||||
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||
<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||
</extensions>
|
||||
</storageModule>
|
||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||
<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.2123886510" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
|
||||
<folderInfo id="0.2123886510." name="/" resourcePath="">
|
||||
<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1020810961" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
|
||||
<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1020810961.1245561758" name=""/>
|
||||
<builder buildPath="${ProjDirPath}/" command="${ProjDirPath}/make.exe" id="org.eclipse.cdt.build.core.settings.default.builder.1574076724" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
|
||||
<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1419411456" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
|
||||
<tool id="org.eclipse.cdt.build.core.settings.holder.1269034716" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
|
||||
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2077730760" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
|
||||
</tool>
|
||||
<tool id="org.eclipse.cdt.build.core.settings.holder.416463984" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
|
||||
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1802293645" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
|
||||
</tool>
|
||||
<tool id="org.eclipse.cdt.build.core.settings.holder.545607982" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
|
||||
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1775218918" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
|
||||
</tool>
|
||||
</toolChain>
|
||||
</folderInfo>
|
||||
</configuration>
|
||||
</storageModule>
|
||||
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
||||
<storageModule moduleId="ilg.gnuarmeclipse.managedbuild.packs"/>
|
||||
</cconfiguration>
|
||||
</storageModule>
|
||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||
<project id="MiCO-3-0.null.804040427" name="MiCO-3-0"/>
|
||||
</storageModule>
|
||||
<storageModule moduleId="scannerConfiguration">
|
||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
||||
<scannerConfigBuildInfo instanceId="0.2123886510">
|
||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
||||
</scannerConfigBuildInfo>
|
||||
<scannerConfigBuildInfo instanceId="0.1826818492">
|
||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
||||
</scannerConfigBuildInfo>
|
||||
</storageModule>
|
||||
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
|
||||
<storageModule moduleId="refreshScope" versionNumber="2">
|
||||
<configuration configurationName="Default">
|
||||
<resource resourceType="PROJECT" workspacePath="/MiCO-3-0"/>
|
||||
</configuration>
|
||||
</storageModule>
|
||||
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
|
||||
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
|
||||
<buildTargets>
|
||||
<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
|
||||
<buildCommand>make</buildCommand>
|
||||
<buildTarget>clean</buildTarget>
|
||||
<stopOnError>true</stopOnError>
|
||||
<useDefaultCommand>true</useDefaultCommand>
|
||||
<runAllBuilders>true</runAllBuilders>
|
||||
</target>
|
||||
<target name="helloworld@MK3165 total download" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
|
||||
<buildCommand>${ProjDirPath}/make.exe</buildCommand>
|
||||
<buildArguments/>
|
||||
<buildTarget>helloworld@MK3165 total download</buildTarget>
|
||||
<stopOnError>true</stopOnError>
|
||||
<useDefaultCommand>true</useDefaultCommand>
|
||||
<runAllBuilders>true</runAllBuilders>
|
||||
</target>
|
||||
<target name="helloworld@MK3165" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
|
||||
<buildCommand>${ProjDirPath}/make</buildCommand>
|
||||
<buildArguments/>
|
||||
<buildTarget>helloworld@MK3165</buildTarget>
|
||||
<stopOnError>true</stopOnError>
|
||||
<useDefaultCommand>true</useDefaultCommand>
|
||||
<runAllBuilders>true</runAllBuilders>
|
||||
</target>
|
||||
<target name="standard release" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
|
||||
<buildCommand>${ProjDirPath}/make.exe</buildCommand>
|
||||
<buildTarget>standard release</buildTarget>
|
||||
<stopOnError>true</stopOnError>
|
||||
<useDefaultCommand>true</useDefaultCommand>
|
||||
<runAllBuilders>true</runAllBuilders>
|
||||
</target>
|
||||
<target name="helloworld@MK3165 total" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
|
||||
<buildCommand>${ProjDirPath}/make.exe</buildCommand>
|
||||
<buildArguments/>
|
||||
<buildTarget>helloworld@MK3165 total</buildTarget>
|
||||
<stopOnError>true</stopOnError>
|
||||
<useDefaultCommand>true</useDefaultCommand>
|
||||
<runAllBuilders>true</runAllBuilders>
|
||||
</target>
|
||||
<target name="bluetooth.ble_hello_sensor@MK3238" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
|
||||
<buildCommand>${ProjDirPath}/make.exe</buildCommand>
|
||||
<buildArguments/>
|
||||
<buildTarget>bluetooth.ble_hello_sensor@MK3238</buildTarget>
|
||||
<stopOnError>true</stopOnError>
|
||||
<useDefaultCommand>true</useDefaultCommand>
|
||||
<runAllBuilders>true</runAllBuilders>
|
||||
</target>
|
||||
<target name="bluetooth.ble_hello_sensor@MK3238 total" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
|
||||
<buildCommand>${ProjDirPath}/make.exe</buildCommand>
|
||||
<buildArguments/>
|
||||
<buildTarget>bluetooth.ble_hello_sensor@MK3238 total</buildTarget>
|
||||
<stopOnError>true</stopOnError>
|
||||
<useDefaultCommand>true</useDefaultCommand>
|
||||
<runAllBuilders>true</runAllBuilders>
|
||||
</target>
|
||||
<target name="bluetooth.ble_hello_sensor@MK3238 total download" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
|
||||
<buildCommand>${ProjDirPath}/make.exe</buildCommand>
|
||||
<buildArguments/>
|
||||
<buildTarget>bluetooth.ble_hello_sensor@MK3238 total download</buildTarget>
|
||||
<stopOnError>true</stopOnError>
|
||||
<useDefaultCommand>true</useDefaultCommand>
|
||||
<runAllBuilders>true</runAllBuilders>
|
||||
</target>
|
||||
</buildTargets>
|
||||
</storageModule>
|
||||
</cproject>
|
||||
2
.gdbinit
Normal file
2
.gdbinit
Normal file
@@ -0,0 +1,2 @@
|
||||
set remotetimeout 20
|
||||
shell start /B F:\TC1\MiCoder_v1.3_Win32-64\MiCoder/OpenOCD/Win32/openocd_mico.exe -s ./ -f ./mico-os/makefiles/OpenOCD/interface/jlink_swd.cfg -f ./mico-os/makefiles/OpenOCD/mw3xx/mw3xx.cfg -f ./mico-os/makefiles/OpenOCD/mw3xx/mw3xx_gdb_jtag.cfg -l ./build/openocd_log.txt
|
||||
3
.openocd_cfg
Normal file
3
.openocd_cfg
Normal file
@@ -0,0 +1,3 @@
|
||||
source [find F:\TC1\MiCoder_v1.3_Win32-64\MiCoder/OpenOCD/jlink_swd.cfg]
|
||||
source [find F:\TC1\MiCoder_v1.3_Win32-64\MiCoder/OpenOCD/mw3xx.cfg]
|
||||
source [find F:\TC1\MiCoder_v1.3_Win32-64\MiCoder/OpenOCD/mw3xx_gdb_jtag.cfg]
|
||||
27
.project
Normal file
27
.project
Normal file
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>zTC1</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
|
||||
<triggers>cleanfullincremental</triggers>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
|
||||
<triggers>fullincremental</triggers>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.cdt.core.cnature</nature>
|
||||
<nature>org.eclipse.cdt.core.ccnature</nature>
|
||||
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
|
||||
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
18
.vscode/c_cpp_properties.json
vendored
Normal file
18
.vscode/c_cpp_properties.json
vendored
Normal file
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"configurations": [
|
||||
{
|
||||
"name": "windows-gcc-x64",
|
||||
"includePath": [
|
||||
"${workspaceFolder}/**"
|
||||
],
|
||||
"compilerPath": "gcc",
|
||||
"cStandard": "${default}",
|
||||
"cppStandard": "${default}",
|
||||
"intelliSenseMode": "windows-gcc-x64",
|
||||
"compilerArgs": [
|
||||
""
|
||||
]
|
||||
}
|
||||
],
|
||||
"version": 4
|
||||
}
|
||||
24
.vscode/launch.json
vendored
Normal file
24
.vscode/launch.json
vendored
Normal file
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "C/C++ Runner: Debug Session",
|
||||
"type": "cppdbg",
|
||||
"request": "launch",
|
||||
"args": [],
|
||||
"stopAtEntry": false,
|
||||
"externalConsole": true,
|
||||
"cwd": "e:/15_GitHub/TC1/zTC1/TC1",
|
||||
"program": "e:/15_GitHub/TC1/zTC1/TC1/build/Debug/outDebug",
|
||||
"MIMode": "gdb",
|
||||
"miDebuggerPath": "gdb",
|
||||
"setupCommands": [
|
||||
{
|
||||
"description": "Enable pretty-printing for gdb",
|
||||
"text": "-enable-pretty-printing",
|
||||
"ignoreFailures": true
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
59
.vscode/settings.json
vendored
Normal file
59
.vscode/settings.json
vendored
Normal file
@@ -0,0 +1,59 @@
|
||||
{
|
||||
"C_Cpp_Runner.cCompilerPath": "gcc",
|
||||
"C_Cpp_Runner.cppCompilerPath": "g++",
|
||||
"C_Cpp_Runner.debuggerPath": "gdb",
|
||||
"C_Cpp_Runner.cStandard": "",
|
||||
"C_Cpp_Runner.cppStandard": "",
|
||||
"C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/VR_NR/Community/VC/Auxiliary/Build/vcvarsall.bat",
|
||||
"C_Cpp_Runner.useMsvc": false,
|
||||
"C_Cpp_Runner.warnings": [
|
||||
"-Wall",
|
||||
"-Wextra",
|
||||
"-Wpedantic",
|
||||
"-Wshadow",
|
||||
"-Wformat=2",
|
||||
"-Wcast-align",
|
||||
"-Wconversion",
|
||||
"-Wsign-conversion",
|
||||
"-Wnull-dereference"
|
||||
],
|
||||
"C_Cpp_Runner.msvcWarnings": [
|
||||
"/W4",
|
||||
"/permissive-",
|
||||
"/w14242",
|
||||
"/w14287",
|
||||
"/w14296",
|
||||
"/w14311",
|
||||
"/w14826",
|
||||
"/w44062",
|
||||
"/w44242",
|
||||
"/w14905",
|
||||
"/w14906",
|
||||
"/w14263",
|
||||
"/w44265",
|
||||
"/w14928"
|
||||
],
|
||||
"C_Cpp_Runner.enableWarnings": true,
|
||||
"C_Cpp_Runner.warningsAsError": false,
|
||||
"C_Cpp_Runner.compilerArgs": [],
|
||||
"C_Cpp_Runner.linkerArgs": [],
|
||||
"C_Cpp_Runner.includePaths": [],
|
||||
"C_Cpp_Runner.includeSearch": [
|
||||
"*",
|
||||
"**/*"
|
||||
],
|
||||
"C_Cpp_Runner.excludeSearch": [
|
||||
"**/build",
|
||||
"**/build/**",
|
||||
"**/.*",
|
||||
"**/.*/**",
|
||||
"**/.vscode",
|
||||
"**/.vscode/**"
|
||||
],
|
||||
"C_Cpp_Runner.useAddressSanitizer": false,
|
||||
"C_Cpp_Runner.useUndefinedSanitizer": false,
|
||||
"C_Cpp_Runner.useLeakSanitizer": false,
|
||||
"C_Cpp_Runner.showCompilationTime": false,
|
||||
"C_Cpp_Runner.useLinkTimeOptimization": false,
|
||||
"C_Cpp_Runner.msvcSecureNoWarnings": false
|
||||
}
|
||||
17
README.md
17
README.md
@@ -8,10 +8,10 @@
|
||||
|
||||
# 固件web界面
|
||||
|
||||
<img src="doc/2.png"><img src="doc/1.png">
|
||||
<img src="doc/IMG_0863.png"><img src="doc/1.png"><img src="doc/IMG_0887.png">
|
||||
|
||||
# HASS接入效果
|
||||
<img src="doc/3.png">
|
||||
<img src="doc/IMG_0888.png">
|
||||
|
||||
固件启动后, 会开启一个热点 TC1-AP-XXXXXX，连接热点后, 直接用浏览器访问: http://192.168.0.1 即可看到如上web界面.
|
||||
|
||||
@@ -53,6 +53,13 @@ TC1 排插硬件分 A1 A2 两个版本, 本固件仅支持 **A1 版本**. A1 A2
|
||||
- [x] HomeAssistant中增加总耗电量传感器，今日耗电量传感器，昨日耗电量传感器，数据来自于插座历史统计
|
||||
- [x] 可以设置mqtt数据上报频率，默认2秒
|
||||
- [x] 可以设置电源 led 是否打开，默认打开（系统自检以及错误指示灯仍会工作）
|
||||
- [x] 后台和ha mqtt增加总开关控制
|
||||
- [x] 后台可以自定义6个插座的名称，名称将会自动同步到ha mqtt
|
||||
- [x] 修复了原代码中电源按钮长按 (现在是5秒)重新配网和(10秒)恢复出厂的逻辑错误
|
||||
- [x] 后台和ha mqtt中增加了童锁开关，开启童锁则上电以后不再响应任何电源按钮的事件，**上电时同时按住按钮的话会开启配网热点**（防止开了童锁，wifi又嗝屁，导致插座功能暴毙的救命逻辑）
|
||||
- [x] 后台可自定义设备名称，此名称将会同至ha mqtt作为mqtt中插座名称的前缀
|
||||
- [x] 后台可自定义按键连击，长按等功能
|
||||
- [x] 定时开关现在支持更多操作项，与按键功能自定义一样
|
||||
|
||||
# 编译固件
|
||||
|
||||
@@ -62,8 +69,10 @@ TC1 排插硬件分 A1 A2 两个版本, 本固件仅支持 **A1 版本**. A1 A2
|
||||
- 安装完成后添加micoder路径 mico config --global MICODER (micoder所在路径)/MiCoder
|
||||
- 最后切换到此项目根目录执行build.sh即可编译固件
|
||||
|
||||
|
||||
|
||||
# 注意事项
|
||||
- 使用pip安装mico-cube失败，请使用下列命令安装（执行命令时注意路径位置）
|
||||
|
||||
- `python -m pip install mico-cube-1.0.0.tar.gz`
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
|
||||
# IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
###############################################################################
|
||||
###############################################################################
|
||||
|
||||
|
||||
NAME := App_TC1
|
||||
|
||||
@@ -52,8 +52,11 @@
|
||||
static bool is_http_init;
|
||||
static bool is_handlers_registered;
|
||||
const struct httpd_wsgi_call g_app_handlers[];
|
||||
char power_info_json[1552] = {0};
|
||||
char power_info_json[2560] = {0};
|
||||
char up_time[16] = "00:00:00";
|
||||
#define CHUNK_SIZE 512 // 每次发送 512 字节，避免 buffer 太大
|
||||
#define OTA_BUFFER_SIZE 512
|
||||
#define MAX_OTA_SIZE 1024*1024
|
||||
|
||||
/*
|
||||
void GetPraFromUrl(char* url, char* pra, char* val)
|
||||
@@ -90,27 +93,30 @@ void GetPraFromUrl(char* url, char* pra, char* val)
|
||||
}
|
||||
*/
|
||||
|
||||
static int HttpGetIndexPage(httpd_request_t *req) {
|
||||
|
||||
static OSStatus send_in_chunks(int sock, const uint8_t *data, int total_len) {
|
||||
OSStatus err = kNoErr;
|
||||
|
||||
err = httpd_send_all_header(req, HTTP_RES_200, sizeof(web_index_html), HTTP_CONTENT_HTML_ZIP);
|
||||
require_noerr_action(err, exit, http_log("ERROR: Unable to send http index headers."));
|
||||
|
||||
err = httpd_send_body(req->sock, web_index_html, sizeof(web_index_html));
|
||||
require_noerr_action(err, exit, http_log("ERROR: Unable to send http index body."));
|
||||
|
||||
exit:
|
||||
for (int offset = 0; offset < total_len; offset += CHUNK_SIZE) {
|
||||
int chunk_len = (total_len - offset > CHUNK_SIZE) ? CHUNK_SIZE : (total_len - offset);
|
||||
err = httpd_send_body(sock, data + offset, chunk_len);
|
||||
require_noerr_action(err, exit, http_log("ERROR: Send chunk failed at offset %d", offset));
|
||||
}
|
||||
exit:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int HttpGetDemoPage(httpd_request_t *req) {
|
||||
static int HttpGetIndexPage(httpd_request_t *req) {
|
||||
OSStatus err = kNoErr;
|
||||
err = httpd_send_all_header(req, HTTP_RES_200, sizeof(web_index_html), HTTP_CONTENT_HTML_ZIP);
|
||||
require_noerr_action(err, exit, http_log("ERROR: Unable to send http demo headers."));
|
||||
int total_sz = sizeof(web_index_html);
|
||||
|
||||
err = httpd_send_body(req->sock, web_index_html, sizeof(web_index_html));
|
||||
require_noerr_action(err, exit, http_log("ERROR: Unable to send http demo body."));
|
||||
exit:
|
||||
|
||||
err = httpd_send_all_header(req, HTTP_RES_200, total_sz, HTTP_CONTENT_HTML_ZIP);
|
||||
require_noerr_action(err, exit, http_log("ERROR: Unable to send index headers."));
|
||||
|
||||
err = send_in_chunks(req->sock, web_index_html, total_sz);
|
||||
require_noerr_action(err, exit, http_log("ERROR: Unable to send index body."));
|
||||
|
||||
exit:
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -118,14 +124,15 @@ static int HttpGetAssets(httpd_request_t *req) {
|
||||
OSStatus err = kNoErr;
|
||||
|
||||
char *file_name = strstr(req->filename, "/assets/");
|
||||
if (!file_name) { http_log("HttpGetAssets url[%s] err", req->filename);
|
||||
if (!file_name) {
|
||||
http_log("HttpGetAssets url[%s] err", req->filename);
|
||||
return err;
|
||||
}
|
||||
//http_log("HttpGetAssets url[%s] file_name[%s]", req->filename, file_name);
|
||||
|
||||
int total_sz = 0;
|
||||
const unsigned char *file_data = NULL;
|
||||
const char *content_type = HTTP_CONTENT_JS_ZIP;
|
||||
|
||||
if (strcmp(file_name + 8, "js_pack.js") == 0) {
|
||||
total_sz = sizeof(js_pack);
|
||||
file_data = js_pack;
|
||||
@@ -133,34 +140,53 @@ static int HttpGetAssets(httpd_request_t *req) {
|
||||
total_sz = sizeof(css_pack);
|
||||
file_data = css_pack;
|
||||
content_type = HTTP_CONTENT_CSS_ZIP;
|
||||
} else if (strcmp(file_name + 8, "index.html") == 0) {
|
||||
total_sz = sizeof(web_index_html);
|
||||
file_data = web_index_html;
|
||||
content_type = HTTP_CONTENT_HTML_ZIP;
|
||||
}
|
||||
|
||||
if (total_sz == 0 || file_data == NULL) {
|
||||
http_log("File not found: %s", req->filename);
|
||||
return err;
|
||||
}
|
||||
|
||||
if (total_sz == 0) return err;
|
||||
|
||||
err = httpd_send_all_header(req, HTTP_RES_200, total_sz, content_type);
|
||||
require_noerr_action(err, exit, http_log("ERROR: Unable to send http assets headers."));
|
||||
require_noerr_action(err, exit, http_log("ERROR: Unable to send asset headers."));
|
||||
|
||||
err = httpd_send_body(req->sock, file_data, total_sz);
|
||||
require_noerr_action(err, exit, http_log("ERROR: Unable to send http assets body."));
|
||||
err = send_in_chunks(req->sock, file_data, total_sz);
|
||||
require_noerr_action(err, exit, http_log("ERROR: Unable to send asset body."));
|
||||
|
||||
exit:
|
||||
exit:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int HttpGetTc1Status(httpd_request_t *req) {
|
||||
char *sockets = GetSocketStatus();
|
||||
char *tc1_status = malloc(512);
|
||||
char *short_click_config = GetButtonClickConfig();
|
||||
char *tc1_status = malloc(1500);
|
||||
char *socket_names = malloc(512);
|
||||
sprintf(socket_names, "%s,%s,%s,%s,%s,%s",
|
||||
user_config->socket_names[0],
|
||||
user_config->socket_names[1],
|
||||
user_config->socket_names[2],
|
||||
user_config->socket_names[3],
|
||||
user_config->socket_names[4],
|
||||
user_config->socket_names[5]);
|
||||
sprintf(tc1_status, TC1_STATUS_JSON, sockets, ip_status.mode,
|
||||
sys_config->micoSystemConfig.ssid, sys_config->micoSystemConfig.user_key,
|
||||
user_config->ap_name, user_config->ap_key, MQTT_SERVER, MQTT_SERVER_PORT,
|
||||
MQTT_SERVER_USR, MQTT_SERVER_PWD,
|
||||
VERSION, ip_status.ip, ip_status.mask, ip_status.gateway, user_config->mqtt_report_freq,
|
||||
user_config->power_led_enabled, 0L);
|
||||
user_config->power_led_enabled, 0L, socket_names, childLockEnabled,
|
||||
sys_config->micoSystemConfig.name, short_click_config);
|
||||
|
||||
OSStatus err = kNoErr;
|
||||
send_http(tc1_status, strlen(tc1_status), exit, &err);
|
||||
|
||||
exit:
|
||||
if (socket_names) free(socket_names);
|
||||
if (tc1_status) free(tc1_status);
|
||||
return err;
|
||||
}
|
||||
@@ -183,6 +209,179 @@ static int HttpSetSocketStatus(httpd_request_t *req) {
|
||||
return err;
|
||||
}
|
||||
|
||||
static int HttpSetSocketName(httpd_request_t *req) {
|
||||
OSStatus err = kNoErr;
|
||||
|
||||
int buf_size = 70;
|
||||
char *buf = malloc(buf_size);
|
||||
|
||||
err = httpd_get_data(req, buf, buf_size);
|
||||
require_noerr(err, exit);
|
||||
int index;
|
||||
char name[64];
|
||||
sscanf(buf, "%d %s", &index, name);
|
||||
strcpy(user_config->socket_names[index], name);
|
||||
mico_system_context_update(sys_config);
|
||||
registerMqttEvents();
|
||||
send_http("OK", 2, exit, &err);
|
||||
|
||||
exit:
|
||||
if (buf) free(buf);
|
||||
return err;
|
||||
}
|
||||
|
||||
static int HttpSetButtonEvent(httpd_request_t *req) {
|
||||
OSStatus err = kNoErr;
|
||||
|
||||
int buf_size = 10;
|
||||
char *buf = malloc(buf_size);
|
||||
|
||||
err = httpd_get_data(req, buf, buf_size);
|
||||
require_noerr(err, exit);
|
||||
int index;
|
||||
int func;
|
||||
int longPress;
|
||||
sscanf(buf, "%d %d %d", &index, &func, &longPress);
|
||||
if (longPress == 1) {
|
||||
set_key_map(user_config->user,index, get_short_func(user_config->user[index]), func == -1 ? NO_FUNCTION : func);
|
||||
} else {
|
||||
set_key_map(user_config->user,index, func == -1 ? NO_FUNCTION : func, get_long_func(user_config->user[index]));
|
||||
}
|
||||
key_log("WARNGIN:set KEY func %d %d %d", index,get_short_func(user_config->user[index]),get_long_func(user_config->user[index]));
|
||||
mico_system_context_update(sys_config);
|
||||
|
||||
send_http("OK", 2, exit, &err);
|
||||
|
||||
exit:
|
||||
if (buf) free(buf);
|
||||
return err;
|
||||
}
|
||||
|
||||
#define OTA_BUF_SIZE 5120
|
||||
|
||||
static int HttpSetOTAFile(httpd_request_t *req)
|
||||
{
|
||||
tc1_log("[OTA] hdr_parsed=%d, remaining=%d, body_nbytes=%d, req.chunked=%d",
|
||||
req->hdr_parsed, req->remaining_bytes, req->body_nbytes, req->chunked);
|
||||
OSStatus err = kNoErr;
|
||||
|
||||
int total = 0;
|
||||
int ret = 0;
|
||||
|
||||
// req->chunked = 1;
|
||||
|
||||
int total1 = req->remaining_bytes;
|
||||
char *buffer = malloc(OTA_BUF_SIZE);
|
||||
if (!buffer) return kNoMemoryErr;
|
||||
uint32_t offset = 0;
|
||||
|
||||
mico_logic_partition_t* ota_partition = MicoFlashGetInfo(MICO_PARTITION_OTA_TEMP);
|
||||
MicoFlashErase(MICO_PARTITION_OTA_TEMP, 0x0, ota_partition->partition_length);
|
||||
CRC16_Context crc_context;
|
||||
CRC16_Init(&crc_context);
|
||||
// 尝试读取全部 POST 数据
|
||||
while (1) {
|
||||
ret = httpd_get_data2(req, buffer,OTA_BUF_SIZE);
|
||||
|
||||
// ret = httpd_recv(req->sock, buffer, 128, 0);
|
||||
total += ret;
|
||||
// req->remaining_bytes -= ret;
|
||||
|
||||
if (ret > 0) {
|
||||
CRC16_Update(&crc_context, buffer, ret);
|
||||
err = MicoFlashWrite(MICO_PARTITION_OTA_TEMP, &offset, (uint8_t *)buffer, ret);
|
||||
require_noerr_quiet(err, exit);
|
||||
tc1_log("[OTA] 本次读取 %d 字节，累计 %d 字节", ret, total);
|
||||
}
|
||||
|
||||
if (ret == 0 || req->remaining_bytes <= 0) {
|
||||
// 读取完毕
|
||||
tc1_log("[OTA] 数据读取完成, 总计 %d 字节", total);
|
||||
break;
|
||||
} else if (ret < 0) {
|
||||
tc1_log("[OTA] 数据读取失败, ret=%d", ret);
|
||||
err = kConnectionErr;
|
||||
break;
|
||||
}
|
||||
|
||||
mico_rtos_thread_msleep(100);
|
||||
|
||||
// tc1_log("[OTA] %x", buffer);
|
||||
// tc1_log("[OTA] hdr_parsed=%d, remaining=%d, body_nbytes=%d",
|
||||
// req->hdr_parsed, req->remaining_bytes, req->body_nbytes);
|
||||
}
|
||||
// if (buffer) free(buffer);
|
||||
uint16_t crc16;
|
||||
CRC16_Final(&crc_context, &crc16);
|
||||
|
||||
|
||||
err = mico_ota_switch_to_new_fw(total, crc16);
|
||||
tc1_log("[OTA] mico_ota_switch_to_new_fw err=%d", err);
|
||||
require_noerr(err, exit);
|
||||
|
||||
char resp[128];
|
||||
snprintf(resp, sizeof(resp), "OK, total: %d bytes, req %d %d", total, req->body_nbytes, total1);
|
||||
send_http(resp, strlen(resp), exit, &err);
|
||||
|
||||
mico_system_power_perform(mico_system_context_get(), eState_Software_Reset);
|
||||
exit:
|
||||
if (buffer) free(buffer);
|
||||
return err;
|
||||
|
||||
// ota_file_req = req;
|
||||
|
||||
// OSStatus err = kNoErr;
|
||||
// err = mico_rtos_create_thread(NULL, MICO_APPLICATION_PRIORITY, "OtaFileThread", OtaFileThread, 0x1000, 0);
|
||||
// char buf[16] = {0};
|
||||
// sprintf(buf, "%d", sizeof(ota_file_req));
|
||||
// send_http(buf, strlen(buf), exit, &err);
|
||||
|
||||
// exit:
|
||||
// if (buf) free(buf);
|
||||
// return err;
|
||||
}
|
||||
|
||||
static int HttpSetDeviceName(httpd_request_t *req) {
|
||||
OSStatus err = kNoErr;
|
||||
|
||||
int buf_size = 70;
|
||||
char *buf = malloc(buf_size);
|
||||
|
||||
err = httpd_get_data(req, buf, buf_size);
|
||||
require_noerr(err, exit);
|
||||
char name[64];
|
||||
sscanf(buf, "%s", name);
|
||||
strcpy(sys_config->micoSystemConfig.name, name);
|
||||
mico_system_context_update(sys_config);
|
||||
registerMqttEvents();
|
||||
send_http("OK", 2, exit, &err);
|
||||
|
||||
exit:
|
||||
if (buf) free(buf);
|
||||
return err;
|
||||
}
|
||||
|
||||
static int HttpSetChildLock(httpd_request_t *req) {
|
||||
OSStatus err = kNoErr;
|
||||
|
||||
int buf_size = 32;
|
||||
char *buf = malloc(buf_size);
|
||||
|
||||
err = httpd_get_data(req, buf, buf_size);
|
||||
require_noerr(err, exit);
|
||||
int enableLock;
|
||||
sscanf(buf, "%d", &enableLock);
|
||||
user_config->user[0] = enableLock;
|
||||
childLockEnabled = enableLock;
|
||||
mico_system_context_update(sys_config);
|
||||
UserMqttSendChildLockState();
|
||||
send_http("OK", 2, exit, &err);
|
||||
|
||||
exit:
|
||||
if (buf) free(buf);
|
||||
return err;
|
||||
}
|
||||
|
||||
static int HttpGetPowerInfo(httpd_request_t *req) {
|
||||
OSStatus err = kNoErr;
|
||||
char buf[16];
|
||||
@@ -204,9 +403,21 @@ static int HttpGetPowerInfo(httpd_request_t *req) {
|
||||
|
||||
char *powers = GetPowerRecord(idx);
|
||||
char *sockets = GetSocketStatus();
|
||||
char *short_click_config = GetButtonClickConfig();
|
||||
char *socket_names = malloc(512);
|
||||
sprintf(socket_names, "%s,%s,%s,%s,%s,%s",
|
||||
user_config->socket_names[0],
|
||||
user_config->socket_names[1],
|
||||
user_config->socket_names[2],
|
||||
user_config->socket_names[3],
|
||||
user_config->socket_names[4],
|
||||
user_config->socket_names[5]);
|
||||
sprintf(power_info_json, POWER_INFO_JSON, sockets, power_record.idx, PW_NUM, p_count, powers,
|
||||
up_time,user_config->power_led_enabled,RelayOut()?1:0);
|
||||
up_time, user_config->power_led_enabled, RelayOut() ? 1 : 0, socket_names,
|
||||
user_config->p_count_1_day_ago, user_config->p_count_2_days_ago, childLockEnabled,
|
||||
sys_config->micoSystemConfig.name, short_click_config);
|
||||
send_http(power_info_json, strlen(power_info_json), exit, &err);
|
||||
if (socket_names) free(socket_names);
|
||||
exit:
|
||||
return err;
|
||||
}
|
||||
@@ -291,7 +502,10 @@ static int HttpSetMqttConfig(httpd_request_t *req) {
|
||||
|
||||
sscanf(buf, "%s %d %s %s", MQTT_SERVER, &MQTT_SERVER_PORT, MQTT_SERVER_USR, MQTT_SERVER_PWD);
|
||||
mico_system_context_update(sys_config);
|
||||
|
||||
if (!(MQTT_SERVER[0] < 0x20 || MQTT_SERVER[0] > 0x7f || MQTT_SERVER_PORT < 1)){
|
||||
err = UserMqttInit();
|
||||
require_noerr(err, exit);
|
||||
}
|
||||
send_http("OK", 2, exit, &err);
|
||||
|
||||
exit:
|
||||
@@ -328,6 +542,7 @@ static int HttpGetMqttReportFreq(httpd_request_t *req) {
|
||||
send_http(freq, strlen(freq), exit, &err);
|
||||
|
||||
exit:
|
||||
if (freq) free(freq);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -350,12 +565,21 @@ static int HttpGetTasks(httpd_request_t *req) {
|
||||
return err;
|
||||
}
|
||||
|
||||
static int HttpGetButtonEvents(httpd_request_t *req) {
|
||||
OSStatus err = kNoErr;
|
||||
char *clicks = GetButtonClickConfig();
|
||||
send_http(clicks, strlen(clicks), exit, &err);
|
||||
|
||||
exit:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int HttpAddTask(httpd_request_t *req) {
|
||||
OSStatus err = kNoErr;
|
||||
|
||||
//1577369623 4 0
|
||||
char buf[16] = {0};
|
||||
err = httpd_get_data(req, buf, 16);
|
||||
char buf[20] = {0};
|
||||
err = httpd_get_data(req, buf, 20);
|
||||
require_noerr(err, exit);
|
||||
|
||||
pTimedTask task = NewTask();
|
||||
@@ -364,20 +588,19 @@ static int HttpAddTask(httpd_request_t *req) {
|
||||
send_http(mess, strlen(mess), exit, &err);
|
||||
return err;
|
||||
}
|
||||
int re = sscanf(buf, "%ld %d %d %d", &task->prs_time, &task->socket_idx, &task->on,
|
||||
int re = sscanf(buf, "%ld %d %d %d", &task->prs_time, &task->operation, &task->on,
|
||||
&task->weekday);http_log("AddTask buf[%s] re[%d] (%ld %d %d %d)",
|
||||
buf, re, task->prs_time, task->socket_idx, task->on,
|
||||
buf, re, task->prs_time, task->operation, task->on,
|
||||
task->weekday);
|
||||
task->socket_idx--;
|
||||
if (task->prs_time < 1577428136 || task->prs_time > 9577428136
|
||||
|| task->socket_idx < 0 || task->socket_idx > 5
|
||||
|| (task->on != 0 && task->on != 1)) { http_log("AddTask Error!");
|
||||
|| task->operation < 0 || task->operation > 11) { http_log("AddTask Error!");
|
||||
re = 0;
|
||||
}
|
||||
|
||||
char *mess = (re == 4 && AddTask(task)) ? "OK" : "NO";
|
||||
|
||||
send_http(mess, strlen(mess), exit, &err);
|
||||
|
||||
exit:
|
||||
return err;
|
||||
}
|
||||
@@ -409,6 +632,7 @@ static int LedStatus(httpd_request_t *req) {
|
||||
send_http(led, strlen(led), exit, &err);
|
||||
|
||||
exit:
|
||||
if (led) free(led);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -437,7 +661,7 @@ static int LedSetEnabled(httpd_request_t *req) {
|
||||
return err;
|
||||
}
|
||||
|
||||
static int TotalSocketSetEnabled(httpd_request_t *req){
|
||||
static int TotalSocketSetEnabled(httpd_request_t *req) {
|
||||
OSStatus err = kNoErr;
|
||||
|
||||
int buf_size = 97;
|
||||
@@ -486,7 +710,6 @@ static int OtaStart(httpd_request_t *req) {
|
||||
|
||||
const struct httpd_wsgi_call g_app_handlers[] = {
|
||||
{"/", HTTPD_HDR_DEFORT, 0, HttpGetIndexPage, NULL, NULL, NULL},
|
||||
{"/demo", HTTPD_HDR_DEFORT, 0, HttpGetDemoPage, NULL, NULL, NULL},
|
||||
{"/assets", HTTPD_HDR_ADD_SERVER |
|
||||
HTTPD_HDR_ADD_CONN_CLOSE, APP_HTTP_FLAGS_NO_EXACT_MATCH, HttpGetAssets, NULL, NULL, NULL},
|
||||
{"/socket", HTTPD_HDR_DEFORT, 0, NULL, HttpSetSocketStatus, NULL, NULL},
|
||||
@@ -501,7 +724,12 @@ const struct httpd_wsgi_call g_app_handlers[] = {
|
||||
{"/task", HTTPD_HDR_DEFORT, APP_HTTP_FLAGS_NO_EXACT_MATCH, HttpGetTasks, HttpAddTask, NULL, HttpDelTask},
|
||||
{"/ota", HTTPD_HDR_DEFORT, 0, Otastatus, OtaStart, NULL, NULL},
|
||||
{"/led", HTTPD_HDR_DEFORT, 0, LedStatus, LedSetEnabled, NULL, NULL},
|
||||
{"/socketAll", HTTPD_HDR_DEFORT, 0, NULL, TotalSocketSetEnabled, NULL, NULL},
|
||||
{"/socketAll", HTTPD_HDR_DEFORT, 0, NULL, TotalSocketSetEnabled, NULL, NULL},
|
||||
{"/socketNames", HTTPD_HDR_DEFORT, 0, NULL, HttpSetSocketName, NULL, NULL},
|
||||
{"/childLock", HTTPD_HDR_DEFORT, 0, NULL, HttpSetChildLock, NULL, NULL},
|
||||
{"/deviceName", HTTPD_HDR_DEFORT, 0, NULL, HttpSetDeviceName, NULL, NULL},
|
||||
{"/buttonEvents", HTTPD_HDR_DEFORT, 0, HttpGetButtonEvents, HttpSetButtonEvent, NULL, NULL},
|
||||
{"/ota/fileUpload", HTTPD_HDR_DEFORT, 0, NULL, HttpSetOTAFile, NULL, NULL},
|
||||
};
|
||||
|
||||
static int g_app_handlers_no = sizeof(g_app_handlers) / sizeof(struct httpd_wsgi_call);
|
||||
|
||||
@@ -64,10 +64,14 @@
|
||||
'gateway':'%s',\
|
||||
'reportFreq':'%d',\
|
||||
'ledEnabled':%d,\
|
||||
'up_time':%ld\
|
||||
'up_time':%ld,\
|
||||
'socketNames':'%s',\
|
||||
'child_lock_enabled':%d,\
|
||||
'deviceName':'%s',\
|
||||
'btnClicks':%s\
|
||||
}"
|
||||
|
||||
#define POWER_INFO_JSON "{'sockets':'%s','idx':%d,'len':%d,'p_count':%ld,'powers':[%s],'up_time':'%s','led_enabled':%d,'total_switch_on':%d}"
|
||||
#define POWER_INFO_JSON "{'sockets':'%s','idx':%d,'len':%d,'p_count':%ld,'powers':[%s],'up_time':'%s','led_enabled':%d,'total_switch_on':%d,'socketNames':'%s','p_count_1_day_ago':%d,'p_count_2_days_ago':%d,'child_lock_enabled':%d,'deviceName':'%s','btnClicks':%s}"
|
||||
|
||||
int AppHttpdStart(void);
|
||||
|
||||
|
||||
@@ -20,27 +20,40 @@
|
||||
<meta name="msapplication-TileColor" content="#3372DF">
|
||||
<link rel="shortcut icon" href="http://yuntong.icu/tc1/images/favicon.png">
|
||||
<link rel="stylesheet" href="assets/css_pack.css">
|
||||
<style>
|
||||
.mdl-menu {
|
||||
max-height: 300px !important;
|
||||
overflow-y: auto !important;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="demo-layout mdl-layout mdl-js-layout mdl-layout--fixed-drawer mdl-layout--fixed-header">
|
||||
<header class="demo-header mdl-layout__header">
|
||||
<div class="mdl-layout__header-row">
|
||||
<span class="mdl-layout-title">TC1智能插座</span>
|
||||
<div class="mdl-layout-spacer"></div>
|
||||
<button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon"
|
||||
id="hdrbtn">
|
||||
<button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-device-name">
|
||||
<i class="material-icons">
|
||||
<svg>
|
||||
<use xlink:href="#icon-translate"/>
|
||||
<use xlink:href="#icon-edit"/>
|
||||
</svg>
|
||||
</i>
|
||||
</button>
|
||||
<ul class="mdl-menu mdl-js-menu mdl-js-ripple-effect mdl-menu--bottom-right"
|
||||
for="hdrbtn">
|
||||
<li class="mdl-menu__item" onclick="ChangeLanguage('en')">English</li>
|
||||
<li class="mdl-menu__item" onclick="ChangeLanguage('cn')">中文</li>
|
||||
<li class="mdl-menu__item" onclick="ChangeLanguage('jp')">日本語</li>
|
||||
</ul>
|
||||
<span class="mdl-layout-title">TC1智能插座</span>
|
||||
<div class="mdl-layout-spacer"></div>
|
||||
<!-- <button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon"-->
|
||||
<!-- id="hdrbtn">-->
|
||||
<!-- <i class="material-icons">-->
|
||||
<!-- <svg>-->
|
||||
<!-- <use xlink:href="#icon-translate"/>-->
|
||||
<!-- </svg>-->
|
||||
<!-- </i>-->
|
||||
<!-- </button>-->
|
||||
<!-- <ul class="mdl-menu mdl-js-menu mdl-js-ripple-effect mdl-menu--bottom-right"-->
|
||||
<!-- for="hdrbtn">-->
|
||||
<!-- <li class="mdl-menu__item" onclick="ChangeLanguage('en')">English</li>-->
|
||||
<!-- <li class="mdl-menu__item" onclick="ChangeLanguage('cn')">中文</li>-->
|
||||
<!-- <li class="mdl-menu__item" onclick="ChangeLanguage('jp')">日本語</li>-->
|
||||
<!-- </ul>-->
|
||||
<button onclick="reboot()"
|
||||
class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon"
|
||||
id="rebootbtn">
|
||||
@@ -79,6 +92,14 @@
|
||||
<span class="lang" langKey="TimedTask">定时任务</span>
|
||||
</a>
|
||||
<a class="mdl-navigation__link" href="javascript:ShowPage(4);">
|
||||
<i class="mdl-color-text--blue-grey-400 material-icons" role="presentation">
|
||||
<svg>
|
||||
<use xlink:href="#icon-click"/>
|
||||
</svg>
|
||||
</i>
|
||||
<span class="lang" langKey="TimedTask">按键自定义</span>
|
||||
</a>
|
||||
<a class="mdl-navigation__link" href="javascript:ShowPage(5);">
|
||||
<i class="mdl-color-text--blue-grey-400 material-icons" role="presentation">
|
||||
<svg>
|
||||
<use xlink:href="#icon-info"/>
|
||||
@@ -86,15 +107,15 @@
|
||||
</i>
|
||||
<span class="lang" langKey="SystemStatus">系统状态</span>
|
||||
</a>
|
||||
<a class="mdl-navigation__link" href="javascript:ShowPage(5);">
|
||||
<a class="mdl-navigation__link" href="javascript:ShowPage(6);">
|
||||
<i class="mdl-color-text--blue-grey-400 material-icons" role="presentation">
|
||||
<svg>
|
||||
<use xlink:href="#icon-cloud_download"/>
|
||||
</svg>
|
||||
</i>
|
||||
<span class="lang" langKey="OTA">在线升级</span>
|
||||
<span class="lang" langKey="OTA">固件升级</span>
|
||||
</a>
|
||||
<a class="mdl-navigation__link" href="javascript:ShowPage(6);">
|
||||
<a class="mdl-navigation__link" href="javascript:ShowPage(7);">
|
||||
<i class="mdl-color-text--blue-grey-400 material-icons" role="presentation">
|
||||
<svg>
|
||||
<use xlink:href="#icon-notes"/>
|
||||
@@ -108,20 +129,28 @@
|
||||
<div class="mdl-grid demo-content">
|
||||
|
||||
|
||||
<div class="page page1 demo-cards mdl-cell mdl-cell--4-col mdl-cell--8-col-tablet mdl-grid mdl-grid--no-spacing">
|
||||
|
||||
<div class="page page1 mdl-cell mdl-cell--4-col mdl-cell--8-col-tablet mdl-grid mdl-grid--no-spacing">
|
||||
<div class="demo-options mdl-card mdl-shadow--2dp mdl-cell mdl-cell--4-col mdl-cell--3-col-tablet mdl-cell--12-col-desktop">
|
||||
<div class="mdl-card__supporting-text">
|
||||
|
||||
<h3>插座控制</h3>
|
||||
<!--
|
||||
<span class="mdl-list__item-secondary-action">
|
||||
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="list-switch-0">
|
||||
<input type="checkbox" id="list-switch-0" class="mdl-switch__input" checked />
|
||||
</label>
|
||||
</span>
|
||||
-->
|
||||
<div class="mdl-card__title mdl-card--expand">
|
||||
<h2 class="mdl-card__title-text">插座控制</h2>
|
||||
</div>
|
||||
<ul id="socket_ul" class="demo-list-control mdl-list">
|
||||
<li class="mdl-list__item">
|
||||
<span class="mdl-list__item-primary-content">
|
||||
<span class="lang" langKey="ChildLock">启用童锁</span>
|
||||
</span>
|
||||
<span class="mdl-list__item-secondary-action">
|
||||
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
|
||||
for="list-switch-child-lock">
|
||||
<input type="checkbox" id="list-switch-child-lock" class="mdl-switch__input"
|
||||
checked/>
|
||||
</label>
|
||||
</span>
|
||||
</li>
|
||||
<li class="mdl-list__item">
|
||||
<span class="mdl-list__item-primary-content">
|
||||
<span class="lang" langKey="Led">电源指示灯</span>
|
||||
</span>
|
||||
@@ -147,7 +176,14 @@
|
||||
</li>
|
||||
<li class="mdl-list__item">
|
||||
<span class="mdl-list__item-primary-content">
|
||||
<span class="lang" langKey="Socket">插座</span>-1
|
||||
<button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-socket-name">
|
||||
<i class="material-icons">
|
||||
<svg>
|
||||
<use xlink:href="#icon-edit"/>
|
||||
</svg>
|
||||
</i>
|
||||
</button>
|
||||
<span class="lang" langKey="Socket">插座</span><span class="socket-index">-1</span>
|
||||
</span>
|
||||
<span class="mdl-list__item-secondary-action">
|
||||
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
|
||||
@@ -159,7 +195,14 @@
|
||||
</li>
|
||||
<li class="mdl-list__item">
|
||||
<span class="mdl-list__item-primary-content">
|
||||
<span class="lang" langKey="Socket">插座</span>-2
|
||||
<button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-socket-name">
|
||||
<i class="material-icons">
|
||||
<svg>
|
||||
<use xlink:href="#icon-edit"/>
|
||||
</svg>
|
||||
</i>
|
||||
</button>
|
||||
<span class="lang" langKey="Socket">插座</span><span class="socket-index">-2</span>
|
||||
</span>
|
||||
<span class="mdl-list__item-secondary-action">
|
||||
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
|
||||
@@ -171,7 +214,14 @@
|
||||
</li>
|
||||
<li class="mdl-list__item">
|
||||
<span class="mdl-list__item-primary-content">
|
||||
<span class="lang" langKey="Socket">插座</span>-3
|
||||
<button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-socket-name">
|
||||
<i class="material-icons">
|
||||
<svg>
|
||||
<use xlink:href="#icon-edit"/>
|
||||
</svg>
|
||||
</i>
|
||||
</button>
|
||||
<span class="lang" langKey="Socket">插座</span><span class="socket-index">-3</span>
|
||||
</span>
|
||||
<span class="mdl-list__item-secondary-action">
|
||||
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
|
||||
@@ -183,7 +233,14 @@
|
||||
</li>
|
||||
<li class="mdl-list__item">
|
||||
<span class="mdl-list__item-primary-content">
|
||||
<span class="lang" langKey="Socket">插座</span>-4
|
||||
<button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-socket-name">
|
||||
<i class="material-icons">
|
||||
<svg>
|
||||
<use xlink:href="#icon-edit"/>
|
||||
</svg>
|
||||
</i>
|
||||
</button>
|
||||
<span class="lang" langKey="Socket">插座</span><span class="socket-index">-4</span>
|
||||
</span>
|
||||
<span class="mdl-list__item-secondary-action">
|
||||
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
|
||||
@@ -195,7 +252,14 @@
|
||||
</li>
|
||||
<li class="mdl-list__item">
|
||||
<span class="mdl-list__item-primary-content">
|
||||
<span class="lang" langKey="Socket">插座</span>-5
|
||||
<button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-socket-name">
|
||||
<i class="material-icons">
|
||||
<svg>
|
||||
<use xlink:href="#icon-edit"/>
|
||||
</svg>
|
||||
</i>
|
||||
</button>
|
||||
<span class="lang" langKey="Socket">插座</span><span class="socket-index">-5</span>
|
||||
</span>
|
||||
<span class="mdl-list__item-secondary-action">
|
||||
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
|
||||
@@ -207,7 +271,14 @@
|
||||
</li>
|
||||
<li class="mdl-list__item">
|
||||
<span class="mdl-list__item-primary-content">
|
||||
<span class="lang" langKey="Socket">插座</span>-6
|
||||
<button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-socket-name">
|
||||
<i class="material-icons">
|
||||
<svg>
|
||||
<use xlink:href="#icon-edit"/>
|
||||
</svg>
|
||||
</i>
|
||||
</button>
|
||||
<span class="lang" langKey="Socket">插座</span><span class="socket-index">-6</span>
|
||||
</span>
|
||||
<span class="mdl-list__item-secondary-action">
|
||||
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
|
||||
@@ -218,22 +289,33 @@
|
||||
</span>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="ct-chart-par"
|
||||
class="page page1 mdl-card__supporting-text mdl-shadow--2dp mdl-cell mdl-cell--6-col"
|
||||
style="height:315px;overflow-x:scroll;overflow-y:hidden;">
|
||||
<table class="pw">
|
||||
<tr>
|
||||
<td>P: <span id="p" class="success">0</span> W</td>
|
||||
<td>W: <span id="w" class="error">0</span> kW·h</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div id="ct-chart" class="ct-chart ct-perfect-fourth"
|
||||
style="height:280px;margin-top:20px;"></div>
|
||||
<div class="page page1 mdl-cell mdl-cell--4-col mdl-cell--8-col-tablet mdl-grid mdl-grid--no-spacing">
|
||||
<div class="demo-options mdl-card mdl-shadow--2dp mdl-cell mdl-cell--4-col mdl-cell--3-col-tablet mdl-cell--12-col-desktop">
|
||||
<div class="mdl-card__supporting-text">
|
||||
<div class="mdl-card__title mdl-card--expand">
|
||||
<h2 class="mdl-card__title-text">功率图</h2>
|
||||
</div>
|
||||
|
||||
<div id="ct-chart-par"
|
||||
class="page page1 mdl-card__supporting-text mdl-shadow--2dp"
|
||||
style="height:315px;overflow-x:scroll;overflow-y:hidden;">
|
||||
<table class="pw">
|
||||
<tr>
|
||||
<td>当前功率: <span id="p" class="success">0</span> W</td>
|
||||
<td>今日电量: <span id="w_t" class="error">0</span> kW·h</td>
|
||||
<td>昨日电量: <span id="w_y" class="error">0</span> kW·h</td>
|
||||
<td>总电量: <span id="w" class="error">0</span> kW·h</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div id="ct-chart" class="ct-chart ct-perfect-fourth"
|
||||
style="height:280px;margin-top:40px;"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="page page2 mdl-cell mdl-cell--5-col demo-card-square mdl-card mdl-shadow--2dp"
|
||||
@@ -413,17 +495,9 @@
|
||||
<use xlink:href="#icon-keyboard_arrow_down"/>
|
||||
</svg>
|
||||
</i>
|
||||
<label for="task_skt_idx" class="mdl-textfield__label">插座</label>
|
||||
<label for="task_skt_idx" class="mdl-textfield__label">操作</label>
|
||||
<ul for="task_skt_idx"
|
||||
class="mdl-menu mdl-menu--bottom-left mdl-js-menu">
|
||||
<li class="mdl-menu__item" data-val="1" data-selected='true'>
|
||||
插座-1
|
||||
</li>
|
||||
<li class="mdl-menu__item" data-val="2">插座-2</li>
|
||||
<li class="mdl-menu__item" data-val="3">插座-3</li>
|
||||
<li class="mdl-menu__item" data-val="4">插座-4</li>
|
||||
<li class="mdl-menu__item" data-val="5">插座-5</li>
|
||||
<li class="mdl-menu__item" data-val="6">插座-6</li>
|
||||
class="mdl-menu mdl-menu--bottom-left mdl-js-menu" id="operations_list">
|
||||
</ul>
|
||||
</div>
|
||||
<div class="mdl-textfield mdl-js-textfield">
|
||||
@@ -453,7 +527,86 @@
|
||||
</div>
|
||||
|
||||
|
||||
<div class="page page4 mdl-cell mdl-cell--12-col demo-card-event mdl-card mdl-shadow--2dp">
|
||||
<div class="page page4 over-unset mdl-cell mdl-cell--5-col demo-card-square mdl-card mdl-shadow--2dp"
|
||||
style="z-index: unset;">
|
||||
<div class="mdl-card__title mdl-card--expand">
|
||||
<h2 class="mdl-card__title-text">按键自定义</h2>
|
||||
</div>
|
||||
<table id="short_click_events_tb" class="mdl-data-table mdl-js-data-table">
|
||||
<tr>
|
||||
<th>按键类型</th>
|
||||
<th>执行操作</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="page page4 over-unset mdl-cell mdl-cell--5-col demo-card-square mdl-card mdl-shadow--2dp"
|
||||
style="z-index: unset;">
|
||||
<div class="mdl-card__title mdl-card--expand">
|
||||
<h2 class="mdl-card__title-text">添加按键操作</h2>
|
||||
</div>
|
||||
<div class="over-unset mdl-card__supporting-text">
|
||||
<form action="#">
|
||||
<div class="mdl-textfield mdl-js-textfield getmdl-select">
|
||||
<input type="text" value=""
|
||||
class="mdl-textfield__input" readonly>
|
||||
<input type="hidden" value="0" name="button_type" id="button_type">
|
||||
<i class="mdl-icon-toggle__label material-icons">
|
||||
<svg>
|
||||
<use xlink:href="#icon-keyboard_arrow_down"/>
|
||||
</svg>
|
||||
</i>
|
||||
<label for="button_type" class="mdl-textfield__label">按钮触发方式</label>
|
||||
<ul for="button_type"
|
||||
class="mdl-menu mdl-menu--bottom-left mdl-js-menu">
|
||||
<li class="mdl-menu__item" data-val="0" data-selected='true'>
|
||||
单/多击
|
||||
</li>
|
||||
<li class="mdl-menu__item" data-val="1">长按</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="mdl-textfield mdl-js-textfield getmdl-select">
|
||||
<input type="text" value=""
|
||||
class="mdl-textfield__input" readonly>
|
||||
<input type="hidden" value="1" name="click_times_press_time" id="click_times_press_time">
|
||||
<i class="mdl-icon-toggle__label material-icons">
|
||||
<svg>
|
||||
<use xlink:href="#icon-keyboard_arrow_down"/>
|
||||
</svg>
|
||||
</i>
|
||||
<label for="click_times_press_time" class="mdl-textfield__label" id="click_times_press_time_label">连击次数</label>
|
||||
<ul for="click_times_press_time"
|
||||
class="mdl-menu mdl-menu--bottom-left mdl-js-menu" id="click_times_press_time_selector" style="">
|
||||
</ul>
|
||||
</div>
|
||||
<div class="mdl-textfield mdl-js-textfield getmdl-select">
|
||||
<input type="text" value=""
|
||||
class="mdl-textfield__input" readonly>
|
||||
<input type="hidden" value="-1" name="action_type" id="action_type">
|
||||
<i class="mdl-icon-toggle__label material-icons">
|
||||
<svg>
|
||||
<use xlink:href="#icon-keyboard_arrow_down"/>
|
||||
</svg>
|
||||
</i>
|
||||
<label for="action_type" class="mdl-textfield__label">执行的操作</label>
|
||||
<ul for="action_type"
|
||||
class="mdl-menu mdl-menu--bottom-left mdl-js-menu" id="btn_action_selector">
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
<div class="mdl-card__actions mdl-card--border">
|
||||
<a href="javascript:addButtonEvent();"
|
||||
class="mdl-button mdl-button--colored mdl-js-button mdl-js-ripple-effect">
|
||||
添加
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="page page5 mdl-cell mdl-cell--12-col demo-card-event mdl-card mdl-shadow--2dp">
|
||||
<table class="mdl-data-table mdl-js-data-table">
|
||||
<tr>
|
||||
<th>版本</th>
|
||||
@@ -476,7 +629,8 @@
|
||||
<td id="uptime">10:13:43</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div class="mdl-card__actions mdl-card--border">
|
||||
<div class="mdl-card__actions mdl-card--border" style="display: flex; align-items: center; flex-wrap: wrap;">
|
||||
<span style="font-size:0.8em;">提示：长按电源按钮5s，指示灯闪烁3次可开启热点重新配网，10s指示灯保持闪烁恢复出厂设置</span>
|
||||
<div class="mdl-layout-spacer"></div>
|
||||
<i class="material-icons">
|
||||
<svg>
|
||||
@@ -488,7 +642,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="page page5 mdl-cell mdl-cell--12-col demo-card-square mdl-card mdl-shadow--2dp">
|
||||
<div class="page page6 mdl-cell mdl-cell--12-col demo-card-square mdl-card mdl-shadow--2dp">
|
||||
<div class="mdl-card__title mdl-card--expand">
|
||||
<h2 class="mdl-card__title-text">在线升级</h2>
|
||||
</div>
|
||||
@@ -510,6 +664,24 @@
|
||||
</div>
|
||||
|
||||
<div class="page page6 mdl-cell mdl-cell--12-col demo-card-square mdl-card mdl-shadow--2dp">
|
||||
<div class="mdl-card__title mdl-card--expand">
|
||||
<h2 class="mdl-card__title-text">本地升级</h2>
|
||||
</div>
|
||||
<div class="mdl-card__supporting-text">
|
||||
<form id="otaForm" action="/ota/fileUpload" method="post" enctype="multipart/form-data">
|
||||
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
|
||||
<input class="mdl-textfield__input" type="file" id="ota_file" name="ota_file">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="mdl-card__actions mdl-card--border">
|
||||
<a href="javascript:OtaFileUpload();" class="mdl-button mdl-button--colored mdl-js-button mdl-js-ripple-effect">
|
||||
上传 OTA 文件
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="page page7 mdl-cell mdl-cell--12-col demo-card-square mdl-card mdl-shadow--2dp">
|
||||
<div class="mdl-card__title mdl-card--expand">
|
||||
<h2 class="mdl-card__title-text">系统日志</h2>
|
||||
</div>
|
||||
@@ -544,6 +716,14 @@
|
||||
<path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
|
||||
<path d="M0 0h24v24H0z" fill="none"/>
|
||||
</g>
|
||||
<g id="icon-edit">
|
||||
<path d="M5,3C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19H5V5H12V3H5M17.78,4C17.61,4 17.43,4.07 17.3,4.2L16.08,5.41L18.58,7.91L19.8,6.7C20.06,6.44 20.06,6 19.8,5.75L18.25,4.2C18.12,4.07 17.95,4 17.78,4M15.37,6.12L8,13.5V16H10.5L17.87,8.62L15.37,6.12Z" />
|
||||
<path d="M0 0h24v24H0z" fill="none"/>
|
||||
</g>
|
||||
<g id ="icon-click">
|
||||
<path d="M0 0h24v24H0z" fill="none"/>
|
||||
<path d="M13 5C15.21 5 17 6.79 17 9C17 10.5 16.2 11.77 15 12.46V11.24C15.61 10.69 16 9.89 16 9C16 7.34 14.66 6 13 6S10 7.34 10 9C10 9.89 10.39 10.69 11 11.24V12.46C9.8 11.77 9 10.5 9 9C9 6.79 10.79 5 13 5M20 20.5C19.97 21.32 19.32 21.97 18.5 22H13C12.62 22 12.26 21.85 12 21.57L8 17.37L8.74 16.6C8.93 16.39 9.2 16.28 9.5 16.28H9.7L12 18V9C12 8.45 12.45 8 13 8S14 8.45 14 9V13.47L15.21 13.6L19.15 15.79C19.68 16.03 20 16.56 20 17.14V20.5M20 2H4C2.9 2 2 2.9 2 4V12C2 13.11 2.9 14 4 14H8V12L4 12L4 4H20L20 12H18V14H20V13.96L20.04 14C21.13 14 22 13.09 22 12V4C22 2.9 21.11 2 20 2Z" />
|
||||
</g>
|
||||
<g id="icon-translate">
|
||||
<path d="M0 0h24v24H0z" fill="none"/>
|
||||
<path d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z"/>
|
||||
@@ -600,32 +780,6 @@
|
||||
<path d="M0,0h24v24H0V0z" fill="none"/>
|
||||
<path d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z"/>
|
||||
</g>
|
||||
<g id="img-user">
|
||||
<g id="#45d0e3ff">
|
||||
<path fill="#45d0e3" opacity="1.00"
|
||||
d=" M 53.37 0.00 L 58.72 0.00 C 75.08 0.90 90.91 9.14 100.69 22.33 C 107.50 31.24 111.31 42.21 112.00 53.37 L 112.00 58.70 C 111.04 78.61 98.79 97.47 80.82 106.17 C 79.54 103.27 78.19 100.38 77.13 97.38 C 75.96 93.10 74.50 88.08 76.95 83.97 C 78.90 80.30 84.37 81.15 86.26 77.47 C 87.78 74.72 88.75 71.72 89.88 68.80 C 86.87 67.57 83.95 65.94 82.84 62.67 C 85.41 62.55 87.97 62.56 90.54 62.54 C 90.73 60.46 90.80 58.37 90.97 56.28 C 92.50 56.26 94.04 56.25 95.57 56.24 C 94.14 51.38 93.20 46.39 92.61 41.36 C 91.85 37.14 91.80 32.46 89.06 28.93 C 85.66 24.42 80.36 21.79 75.00 20.42 C 66.49 18.22 57.44 19.54 49.32 22.59 C 48.22 21.70 47.13 20.79 46.00 19.93 C 45.67 19.83 45.02 19.63 44.70 19.53 C 38.54 17.36 31.82 18.95 26.65 22.71 C 21.75 25.72 19.50 31.39 18.56 36.82 C 16.07 51.25 18.52 66.10 15.49 80.46 C 14.80 83.83 13.17 86.89 11.40 89.80 C 4.55 80.87 0.71 69.87 0.00 58.67 L 0.00 53.27 C 0.72 42.15 4.52 31.22 11.31 22.34 C 21.10 9.12 36.98 0.86 53.37 0.00 Z"/>
|
||||
<path fill="#45d0e3" opacity="1.00"
|
||||
d=" M 46.81 58.85 C 48.67 60.66 50.63 62.36 52.52 64.14 C 53.51 65.97 54.72 67.81 54.84 69.95 C 55.32 75.99 54.64 82.26 51.85 87.72 C 47.89 95.43 41.52 101.46 36.56 108.49 C 29.02 105.67 22.14 101.21 16.39 95.59 C 21.92 95.26 27.23 93.08 31.33 89.33 C 40.12 81.50 43.93 69.90 46.81 58.85 Z"/>
|
||||
</g>
|
||||
<g id="#3e3e3eff">
|
||||
<path fill="#3e3e3e" opacity="1.00"
|
||||
d=" M 26.65 22.71 C 31.82 18.95 38.54 17.36 44.70 19.53 C 41.86 22.16 39.20 24.96 36.55 27.77 C 37.72 29.05 38.91 30.31 40.10 31.58 C 42.67 28.12 45.54 24.77 49.32 22.59 C 57.44 19.54 66.49 18.22 75.00 20.42 C 80.36 21.79 85.66 24.42 89.06 28.93 C 91.80 32.46 91.85 37.14 92.61 41.36 C 82.53 41.64 72.25 40.50 62.86 36.65 C 62.81 40.15 63.08 43.92 61.22 47.05 C 60.19 49.27 58.12 50.64 56.32 52.18 C 54.94 50.22 54.14 47.28 51.44 46.79 C 48.33 45.98 45.15 49.54 46.48 52.54 C 48.16 56.57 50.50 60.28 52.52 64.14 C 50.63 62.36 48.67 60.66 46.81 58.85 C 43.93 69.90 40.12 81.50 31.33 89.33 C 27.23 93.08 21.92 95.26 16.39 95.59 C 14.64 93.73 12.95 91.82 11.40 89.80 C 13.17 86.89 14.80 83.83 15.49 80.46 C 18.52 66.10 16.07 51.25 18.56 36.82 C 19.50 31.39 21.75 25.72 26.65 22.71 Z"/>
|
||||
<path fill="#3e3e3e" opacity="1.00"
|
||||
d=" M 83.41 50.49 C 84.92 48.75 86.28 50.47 85.90 52.21 C 84.56 52.87 82.99 52.19 83.41 50.49 Z"/>
|
||||
</g>
|
||||
<g id="#049d56ff">
|
||||
<path fill="#049d56" opacity="1.00"
|
||||
d=" M 44.70 19.53 C 45.02 19.63 45.67 19.83 46.00 19.93 C 47.13 20.79 48.22 21.70 49.32 22.59 C 45.54 24.77 42.67 28.12 40.10 31.58 C 38.91 30.31 37.72 29.05 36.55 27.77 C 39.20 24.96 41.86 22.16 44.70 19.53 Z"/>
|
||||
</g>
|
||||
<g id="#ffe1afff">
|
||||
<path fill="#ffe1af" opacity="1.00"
|
||||
d=" M 62.86 36.65 C 72.25 40.50 82.53 41.64 92.61 41.36 C 93.20 46.39 94.14 51.38 95.57 56.24 C 94.04 56.25 92.50 56.26 90.97 56.28 C 90.80 58.37 90.73 60.46 90.54 62.54 C 87.97 62.56 85.41 62.55 82.84 62.67 C 83.95 65.94 86.87 67.57 89.88 68.80 C 88.75 71.72 87.78 74.72 86.26 77.47 C 84.37 81.15 78.90 80.30 76.95 83.97 C 74.50 88.08 75.96 93.10 77.13 97.38 C 67.78 97.97 58.22 94.74 51.85 87.72 C 54.64 82.26 55.32 75.99 54.84 69.95 C 54.72 67.81 53.51 65.97 52.52 64.14 C 50.50 60.28 48.16 56.57 46.48 52.54 C 45.15 49.54 48.33 45.98 51.44 46.79 C 54.14 47.28 54.94 50.22 56.32 52.18 C 58.12 50.64 60.19 49.27 61.22 47.05 C 63.08 43.92 62.81 40.15 62.86 36.65 M 83.41 50.49 C 82.99 52.19 84.56 52.87 85.90 52.21 C 86.28 50.47 84.92 48.75 83.41 50.49 Z"/>
|
||||
</g>
|
||||
<g id="#fe5606ff">
|
||||
<path fill="#fe5606" opacity="1.00"
|
||||
d=" M 36.56 108.49 C 41.52 101.46 47.89 95.43 51.85 87.72 C 58.22 94.74 67.78 97.97 77.13 97.38 C 78.19 100.38 79.54 103.27 80.82 106.17 C 73.65 109.79 65.69 111.59 57.70 112.00 L 54.26 112.00 C 48.24 111.64 42.22 110.63 36.56 108.49 Z"/>
|
||||
</g>
|
||||
</g>
|
||||
</defs>
|
||||
</svg>
|
||||
|
||||
@@ -641,13 +795,14 @@
|
||||
Config: {en: "Config", cn: "设置"},
|
||||
TimedTask: {en: "Timed Task", cn: "定时任务"},
|
||||
SystemStatus: {en: "System Status", cn: "系统状态"},
|
||||
OTA: {en: "OTA", cn: "在线升级"},
|
||||
OTA: {en: "OTA", cn: "固件升级"},
|
||||
SystemLog: {en: "System Log", cn: "系统日志"},
|
||||
About: {en: "About", cn: "关于"},
|
||||
//主页
|
||||
Socket: {en: "Socket", cn: "插座"},
|
||||
Led:{en: "PowerLed", cn: "电源指示灯"},
|
||||
SocketAll:{en: "Total switch", cn: "总开关"}
|
||||
SocketAll:{en: "Total Switch", cn: "总开关"},
|
||||
ChildLock:{en: "Child Lock", cn: "童锁"}
|
||||
}
|
||||
function ChangeLanguage(lang) {
|
||||
if (lang == "jp") {
|
||||
@@ -660,6 +815,8 @@
|
||||
$(this).html(val);
|
||||
});
|
||||
}
|
||||
var BTN_OPERATIONS=["切换总开关"];
|
||||
var names_arr = [];
|
||||
//弹框-start
|
||||
var snackbarContainer = document.querySelector('#demo-toast-example');
|
||||
function ShowToast(mess) {
|
||||
@@ -728,39 +885,6 @@
|
||||
var mqtt_pwd;
|
||||
var mqtt_freq;
|
||||
|
||||
HttpGet("/status", function (re) {
|
||||
var status = JSON.parse(re);
|
||||
var status_arr = status.sockets.split(",");
|
||||
for (var i = 0; i < status_arr.length; i++) {
|
||||
//checkboxs[i].checked = status_arr[i] == "1";
|
||||
if (status_arr[i] == "1") {
|
||||
switch_lables[i].MaterialSwitch.on();
|
||||
} else {
|
||||
switch_lables[i].MaterialSwitch.off();
|
||||
}
|
||||
}
|
||||
|
||||
if(status.mode == 1) {
|
||||
$("#custom_station").click();
|
||||
info_station_name = status.station_ssid;
|
||||
info_wifi_password = status.station_pwd;
|
||||
} else {
|
||||
$("#custom_ap").click();
|
||||
$("#custom_ssid")[0].parentElement.MaterialTextfield.change(status.ap_ssid);
|
||||
info_wifi_password = status.ap_pwd;
|
||||
}
|
||||
|
||||
mqtt_addr = status.mqtt_addr;
|
||||
mqtt_port = status.mqtt_port;
|
||||
mqtt_usr = status.mqtt_usr;
|
||||
mqtt_pwd = status.mqtt_pwd;
|
||||
mqtt_freq = status.reportFreq;
|
||||
$("#info_version").html(status.version);
|
||||
$("#info_ip").html(status.ip);
|
||||
$("#info_mask").html(status.mask);
|
||||
$("#info_gateway").html(status.gateway);
|
||||
$("#uptime").html(status.up_time);
|
||||
});
|
||||
$("#st-date").html((new Date()).Format("yyyy-MM-dd"));
|
||||
|
||||
//Menu-start
|
||||
@@ -800,23 +924,214 @@
|
||||
var socket_ul = document.getElementById("socket_ul");
|
||||
var checkboxs = socket_ul.getElementsByClassName("mdl-switch__input");
|
||||
var switch_lables = socket_ul.getElementsByClassName("mdl-switch");
|
||||
|
||||
|
||||
HttpGet("/status", function (re) {
|
||||
var status = JSON.parse(re);
|
||||
var status_arr = status.sockets.split(",");
|
||||
names_arr = status.socketNames.split(",");
|
||||
var switchTexts = document.querySelectorAll('.mdl-list__item-primary-content');
|
||||
$(".mdl-layout-title").text(status.deviceName);
|
||||
document.title=status.deviceName;
|
||||
for (var i = 0; i < status_arr.length; i++) {
|
||||
var langSpan = switchTexts[i+3].querySelector('.lang');
|
||||
var indexSpan = switchTexts[i+3].querySelector('.socket-index');
|
||||
if (langSpan) langSpan.textContent = names_arr[i]; // 修改插座名称
|
||||
if (indexSpan) indexSpan.textContent = ""; // 修改序号，可自定义起始数字
|
||||
//checkboxs[i].checked = status_arr[i] == "1";
|
||||
if (status_arr[i] == "1") {
|
||||
switch_lables[i+3].MaterialSwitch.on();
|
||||
} else {
|
||||
switch_lables[i+3].MaterialSwitch.off();
|
||||
}
|
||||
}
|
||||
|
||||
if(status.mode == 1) {
|
||||
$("#custom_station").click();
|
||||
info_station_name = status.station_ssid;
|
||||
info_wifi_password = status.station_pwd;
|
||||
} else {
|
||||
$("#custom_ap").click();
|
||||
$("#custom_ssid")[0].parentElement.MaterialTextfield.change(status.ap_ssid);
|
||||
info_wifi_password = status.ap_pwd;
|
||||
}
|
||||
|
||||
mqtt_addr = status.mqtt_addr;
|
||||
mqtt_port = status.mqtt_port;
|
||||
mqtt_usr = status.mqtt_usr;
|
||||
mqtt_pwd = status.mqtt_pwd;
|
||||
mqtt_freq = status.reportFreq;
|
||||
$("#info_version").html(status.version);
|
||||
$("#info_ip").html(status.ip);
|
||||
$("#info_mask").html(status.mask);
|
||||
$("#info_gateway").html(status.gateway);
|
||||
$("#uptime").html(status.up_time);
|
||||
|
||||
for (var i = 0; i < names_arr.length; i++) {
|
||||
BTN_OPERATIONS.push(`切换${names_arr[i]}`);
|
||||
}
|
||||
BTN_OPERATIONS.push("切换电源指示灯启用");
|
||||
BTN_OPERATIONS.push("重启系统");
|
||||
BTN_OPERATIONS.push("重新配网");
|
||||
BTN_OPERATIONS.push("重置系统");
|
||||
BTN_OPERATIONS.push("切换童锁");
|
||||
BTN_OPERATIONS.push("重启网页");
|
||||
|
||||
$('#btn_action_selector').append(
|
||||
$('<li>')
|
||||
.addClass('mdl-menu__item')
|
||||
.attr('data-val', -1)
|
||||
.text("未设置")
|
||||
);
|
||||
for (let i = 0; i < BTN_OPERATIONS.length; i++) {
|
||||
$('#operations_list').append(
|
||||
$('<li>')
|
||||
.addClass('mdl-menu__item')
|
||||
.attr('data-val', `${i}`)
|
||||
.attr('data-selected', `false`)
|
||||
.text(BTN_OPERATIONS[i].replaceAll('切换','设置'))
|
||||
);
|
||||
$('#btn_action_selector').append(
|
||||
$('<li>')
|
||||
.addClass('mdl-menu__item')
|
||||
.attr('data-val', i)
|
||||
.text(BTN_OPERATIONS[i])
|
||||
);
|
||||
}
|
||||
getmdlSelect.init(".getmdl-select");
|
||||
|
||||
refreshButtonEvents(status.btnClicks);
|
||||
GetTimedTask();
|
||||
});
|
||||
|
||||
|
||||
function refreshButtonEvents(actions){
|
||||
var tb_html = `
|
||||
<thead>
|
||||
<tr>
|
||||
<th>按键类型</th>
|
||||
<th>执行动作</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
`;
|
||||
|
||||
var cnt=0;
|
||||
for (var i = 0; i < actions.length; i++) {
|
||||
var rowId = `select-${i}`;
|
||||
var times = Object.keys(actions[i])[0];
|
||||
var operations = Object.values(actions[i])[0];
|
||||
if(operations[0]!=-1){
|
||||
cnt++;
|
||||
var valueText = (isNaN(operations[0]) || operations[0] < 0 || operations[0] >= BTN_OPERATIONS.length) ? '未设置' : BTN_OPERATIONS[operations[0]];
|
||||
tb_html += `
|
||||
<tr>
|
||||
<td>${times > 1 ? '连续' : ''}短按${times}次</td>
|
||||
<td>${valueText}</td>
|
||||
<td><a href='javascript:deleteButtonEvent(${times},0);'>删除</a></td>
|
||||
</tr>
|
||||
`;
|
||||
}
|
||||
if(operations[1]!=-1){
|
||||
cnt++;
|
||||
var valueText = (isNaN(operations[1]) || operations[1] < 0 || operations[1] >= BTN_OPERATIONS.length) ? '未设置' : BTN_OPERATIONS[operations[1]];
|
||||
|
||||
tb_html += `
|
||||
<tr>
|
||||
<td>长按${times}秒</td>
|
||||
<td>${valueText}</td>
|
||||
<td><a href='javascript:deleteButtonEvent(${times},1);'>删除</a></td>
|
||||
</tr>
|
||||
`;
|
||||
}
|
||||
|
||||
}
|
||||
if (cnt == 0) {
|
||||
tb_html += "<tr><td colspan='5'>没有自定义按键动作</td></tr>";
|
||||
}
|
||||
tb_html+="\
|
||||
</tbody>";
|
||||
document.getElementById("short_click_events_tb").innerHTML = tb_html;
|
||||
componentHandler.upgradeDom();
|
||||
}
|
||||
|
||||
$(".mdl-switch__input").on("click", function() {
|
||||
if("list-switch-all" == this.id){
|
||||
if("list-switch-all" == this.id||"list-switch-child-lock"== this.id||"task_on"== this.id){
|
||||
return;
|
||||
}
|
||||
var sockets_st = "";
|
||||
for (var i = 2; i < checkboxs.length; i++) {
|
||||
for (var i = 3; i < checkboxs.length; i++) {
|
||||
sockets_st += (checkboxs[i].checked ? "1," : "0,");
|
||||
}
|
||||
HttpPost("/socket", function (re) {
|
||||
}, sockets_st);
|
||||
HttpPost("/led", function (re) {
|
||||
}, checkboxs[0].checked ? "1" : "0");
|
||||
}, checkboxs[1].checked ? "1" : "0");
|
||||
|
||||
});
|
||||
|
||||
$(".edit-socket-name").on("click", function () {
|
||||
// 获取当前按钮所在的 li 元素
|
||||
var $li = $(this).closest(".mdl-list__item");
|
||||
|
||||
// 获取当前索引
|
||||
var index = $(".edit-socket-name").index(this);
|
||||
|
||||
// 获取 lang 名称和 socket-index 元素
|
||||
var $lang = $li.find(".lang");
|
||||
var $index = $li.find(".socket-index");
|
||||
|
||||
// 原名称
|
||||
var oldName = $lang.text().trim();
|
||||
|
||||
// 弹窗编辑
|
||||
var newName = prompt("请输入新的插座名称", oldName);
|
||||
if (newName && newName.trim() !== "") {
|
||||
if(newName.trim().includes(" ")){
|
||||
ShowToast("名称不能包含空格");
|
||||
return;
|
||||
}
|
||||
if(newName.trim().length>16){
|
||||
ShowToast("名称不能超过16个字");
|
||||
return;
|
||||
}
|
||||
$lang.text(newName.trim());
|
||||
// 可选：更新序号
|
||||
$index.text("");
|
||||
HttpPost("/socketNames", function (re) {
|
||||
}, index+' '+newName.trim());}
|
||||
});
|
||||
|
||||
$(".edit-device-name").on("click", function () {
|
||||
var title = $(".mdl-layout-title");
|
||||
// 原名称
|
||||
var oldName = title.text().trim();
|
||||
|
||||
// 弹窗编辑
|
||||
var newName = prompt("请输入新的设备名称", oldName);
|
||||
if (newName && newName.trim() !== "") {
|
||||
if(newName.trim().includes(" ")){
|
||||
ShowToast("名称不能包含空格");
|
||||
return;
|
||||
}
|
||||
if(newName.trim().length>16){
|
||||
ShowToast("名称不能超过16个字");
|
||||
return;
|
||||
}
|
||||
title.text(newName.trim());
|
||||
|
||||
HttpPost("/deviceName", function (re) {
|
||||
}, newName.trim());}
|
||||
});
|
||||
|
||||
document.getElementById("list-switch-all").addEventListener("click", function() {
|
||||
HttpPost("/socketAll", function (re) {
|
||||
}, checkboxs[1].checked ? "1" : "0");});
|
||||
}, checkboxs[2].checked ? "1" : "0");});
|
||||
|
||||
document.getElementById("list-switch-child-lock").addEventListener("click", function() {
|
||||
HttpPost("/childLock", function (re) {
|
||||
}, checkboxs[0].checked ? "1" : "0");});
|
||||
|
||||
//Socket-end
|
||||
|
||||
@@ -942,6 +1257,10 @@
|
||||
var chart_wth = 0;
|
||||
var p = document.getElementById("p");
|
||||
var w = document.getElementById("w");
|
||||
var w_t = document.getElementById("w_t");
|
||||
var w_y = document.getElementById("w_y");
|
||||
var powerTimerId;
|
||||
|
||||
function GetPowerRecord() {
|
||||
HttpPost("/power", function (re) {
|
||||
re = re.replace(/'/g, '"');
|
||||
@@ -967,28 +1286,46 @@
|
||||
$("#uptime").html(power.up_time);
|
||||
|
||||
var w_v = (17.1 * power.p_count) / 1000 / 36000;
|
||||
w.innerHTML = w_v.toFixed(2);
|
||||
if (power.led_enabled == 1) {
|
||||
w.innerHTML = w_v.toFixed(3);
|
||||
var w_v_t = (17.1 * (power.p_count - power.p_count_1_day_ago)) / 1000 / 36000;
|
||||
w_v_t = w_v_t < 0 ? 0 : w_v_t;
|
||||
w_t.innerHTML = w_v_t.toFixed(3);
|
||||
var w_v_y = (17.1 * (power.p_count_1_day_ago - power.p_count_2_days_ago)) / 1000 / 36000;
|
||||
w_v_y = w_v_y < 0 ? 0 : w_v_y;
|
||||
w_y.innerHTML = w_v_y.toFixed(3);
|
||||
if (power.child_lock_enabled == 1) {
|
||||
switch_lables[0].MaterialSwitch.on();
|
||||
} else {
|
||||
switch_lables[0].MaterialSwitch.off();
|
||||
}
|
||||
if (power.total_switch_on == 1) {
|
||||
if (power.led_enabled == 1) {
|
||||
switch_lables[1].MaterialSwitch.on();
|
||||
} else {
|
||||
switch_lables[1].MaterialSwitch.off();
|
||||
}
|
||||
if (power.total_switch_on == 1) {
|
||||
switch_lables[2].MaterialSwitch.on();
|
||||
} else {
|
||||
switch_lables[2].MaterialSwitch.off();
|
||||
}
|
||||
var status_arr = power.sockets.split(",");
|
||||
names_arr = power.socketNames.split(",");
|
||||
var switchTexts = document.querySelectorAll('.mdl-list__item-primary-content');
|
||||
$(".mdl-layout-title").text(power.deviceName);
|
||||
document.title=power.deviceName;
|
||||
for (var i = 0; i < status_arr.length; i++) {
|
||||
//checkboxs[i].checked = status_arr[i] == "1";
|
||||
var langSpan = switchTexts[i+3].querySelector('.lang');
|
||||
var indexSpan = switchTexts[i+3].querySelector('.socket-index');
|
||||
if (langSpan) langSpan.textContent = names_arr[i]; // 修改插座名称
|
||||
if (indexSpan) indexSpan.textContent = ""; // 修改序号，可自定义起始数字
|
||||
if (status_arr[i] == "1") {
|
||||
switch_lables[i+2].MaterialSwitch.on();
|
||||
switch_lables[i+3].MaterialSwitch.on();
|
||||
} else {
|
||||
switch_lables[i+2].MaterialSwitch.off();
|
||||
switch_lables[i+3].MaterialSwitch.off();
|
||||
}
|
||||
}
|
||||
|
||||
window.setTimeout(GetPowerRecord, 3000);
|
||||
powerTimerId= window.setTimeout(GetPowerRecord, 3000);
|
||||
}, power_idx.toString());
|
||||
}
|
||||
$(document).ready(function(){
|
||||
@@ -1007,13 +1344,14 @@
|
||||
function GetTimedTask() {
|
||||
HttpGet("/task", function (re) {
|
||||
var tb_html = "\
|
||||
<tr>\
|
||||
<thead><tr>\
|
||||
<th>时间</th>\
|
||||
<th>插座</th>\
|
||||
<th>开关</th>\
|
||||
<th>循环</th>\
|
||||
<th>操作</th>\
|
||||
</tr>";
|
||||
</tr></thead>\
|
||||
<tbody>";
|
||||
console.log(re);
|
||||
var tasks = JSON.parse(re);
|
||||
if (tasks.length == 0) {
|
||||
@@ -1023,16 +1361,39 @@
|
||||
tb_html += "\
|
||||
<tr>\
|
||||
<td>" + tasks[i].prs_time + "</td>\
|
||||
<td>" + tasks[i].socket_idx + "</td>\
|
||||
<td>" + tasks[i].on + "</td>\
|
||||
<td>" + tasks[i].weekday + "</td>\
|
||||
<td><a href='javascript:DelTimedTask(" + tasks[i].timestamp + ");'>Delete</a></td>\
|
||||
<td>" + BTN_OPERATIONS[tasks[i].operation].replaceAll('切换','设置') + "</td>\
|
||||
<td>" + ((tasks[i].operation==11||tasks[i].operation<8)?(tasks[i].on == 1?"开":"关"):"-") + "</td>\
|
||||
<td>" + getLoopText(tasks[i].weekday) + "</td>\
|
||||
<td><a href='javascript:DelTimedTask(" + tasks[i].timestamp + ");'>删除</a></td>\
|
||||
</tr>";
|
||||
}
|
||||
tb_html+="\
|
||||
</tbody>";
|
||||
document.getElementById("timed_task_tb").innerHTML = tb_html;
|
||||
});
|
||||
}
|
||||
GetTimedTask();
|
||||
function getLoopText(i){
|
||||
switch(i){
|
||||
case 0:
|
||||
return '不循环';
|
||||
case 1:
|
||||
return '每周一';
|
||||
case 2:
|
||||
return '每周二';
|
||||
case 3:
|
||||
return '每周三';
|
||||
case 4:
|
||||
return '每周四';
|
||||
case 5:
|
||||
return '每周五';
|
||||
case 6:
|
||||
return '每周六';
|
||||
case 7:
|
||||
return '每周日';
|
||||
case 8:
|
||||
return '每天';
|
||||
}
|
||||
}
|
||||
|
||||
var task_date = document.getElementById("task_date");
|
||||
var task_time = document.getElementById("task_time");
|
||||
@@ -1052,10 +1413,7 @@
|
||||
//prs_time = prs_time + parseInt(sec);
|
||||
on = on ? "1" : "0";
|
||||
var cmd = prs_time + " " + idx + " " + on + " " + wkd;
|
||||
if (cmd.length != 16) {
|
||||
alert("CMD ERROR!");
|
||||
return
|
||||
}
|
||||
|
||||
HttpPost("/task", function (re) {
|
||||
if (re != "OK") {
|
||||
alert(re);
|
||||
@@ -1064,6 +1422,75 @@
|
||||
GetTimedTask();
|
||||
}, cmd);
|
||||
}
|
||||
|
||||
$(document).ready(function(){
|
||||
$('ul[for="button_type"] .mdl-menu__item').on('click',function(){
|
||||
$('#button_type').trigger('change');
|
||||
});
|
||||
});
|
||||
$('#button_type').on('change', function() {
|
||||
var value = $(this).val();
|
||||
$('#click_times_press_time_label').text(value == '0'?'连击次数':'长按秒数');
|
||||
});
|
||||
$(function() {
|
||||
for (let i = 1; i <= 30; i++) {
|
||||
$('#click_times_press_time_selector').append(
|
||||
$('<li>')
|
||||
.addClass('mdl-menu__item')
|
||||
.attr('data-val', i)
|
||||
.text(i)
|
||||
);
|
||||
}
|
||||
getmdlSelect.init(".getmdl-select");
|
||||
});
|
||||
|
||||
function getButtonEvents(){
|
||||
HttpGet("/buttonEvents", function (re) {
|
||||
|
||||
refreshButtonEvents(JSON.parse(re));
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
function addButtonEvent() {
|
||||
|
||||
var longPress = document.getElementById("button_type").value;
|
||||
var event = document.getElementById("action_type").value;
|
||||
var times_or_seconds = document.getElementById("click_times_press_time").value;
|
||||
|
||||
if(!event||!times_or_seconds){
|
||||
ShowToast("请完成选项");
|
||||
return;
|
||||
}
|
||||
HttpPost("/buttonEvents", function (re) {
|
||||
if (re == "OK") {
|
||||
ShowToast("已添加按键事件");
|
||||
getButtonEvents();
|
||||
}
|
||||
}, `${times_or_seconds} ${event} ${longPress}`);
|
||||
}
|
||||
function deleteButtonEvent(times_or_seconds ,longPress){
|
||||
HttpPost("/buttonEvents", function (re) {
|
||||
if (re == "OK") {
|
||||
ShowToast("已删除按键事件");
|
||||
getButtonEvents();
|
||||
}
|
||||
}, `${times_or_seconds} -1 ${longPress}`);
|
||||
}
|
||||
function selectOperation(rowId, index, operationText) {
|
||||
var witch = parseInt(rowId.split('-')[1]);
|
||||
if (index === -1) {
|
||||
document.getElementById(`${rowId}-input`).value = '未设置';
|
||||
document.getElementById(`${rowId}-value`).value = -1;
|
||||
} else {
|
||||
document.getElementById(`${rowId}-input`).value = operationText;
|
||||
document.getElementById(`${rowId}-value`).value = index;
|
||||
}
|
||||
HttpPost("/shortClickEvent", function (re) {
|
||||
ShowToast("已设置按钮事件");
|
||||
}, `${witch} ${index}`);
|
||||
}
|
||||
|
||||
function DelTimedTask(timestamp) {
|
||||
HttpDel("/task/"+timestamp, function (re) {
|
||||
ShowToast("Delete timed task OK!");
|
||||
@@ -1075,15 +1502,39 @@
|
||||
//OTA-start
|
||||
function OtaStart() {
|
||||
var ota_url = document.getElementById("ota_url").value;
|
||||
var protocol = window.location.protocol;
|
||||
var baseUrl = protocol+"//"+window.location.host;
|
||||
|
||||
HttpPost("/ota", function (re) {
|
||||
OtaStatus();
|
||||
}, ota_url);
|
||||
}
|
||||
|
||||
function OtaFileUpload() {
|
||||
//alert("假的假的是假的，忽略");
|
||||
//return;
|
||||
var fileInput = document.getElementById("ota_file");
|
||||
if (fileInput.files.length === 0) {
|
||||
alert("请选择要上传的 OTA 文件");
|
||||
return;
|
||||
}
|
||||
clearTimeout(powerTimerId);
|
||||
console.log(fileInput.files[0].size); // 应显示 647168 左右
|
||||
fetch("/ota/fileUpload", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/octet-stream" },
|
||||
body: fileInput.files[0]
|
||||
}).then(r => r.text()).then(alert).catch(alert);
|
||||
}
|
||||
|
||||
var ota_status = document.querySelector('#ota_status');
|
||||
ota_status.addEventListener('mdl-componentupgraded', function() {
|
||||
this.MaterialProgress.setProgress(0);
|
||||
});
|
||||
function OtaStatus() {
|
||||
var protocol = window.location.protocol;
|
||||
var baseUrl = protocol+"//"+window.location.host;
|
||||
|
||||
HttpGet("/ota", function (re) {
|
||||
var percent = parseInt(re);
|
||||
//console.log(re + " " + parseInt(re));
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
56
TC1/main.c
56
TC1/main.c
@@ -4,12 +4,12 @@
|
||||
#include "time.h"
|
||||
#include "unistd.h"
|
||||
#include "TimeUtils.h"
|
||||
#include "mico_system.h"
|
||||
|
||||
#include "user_gpio.h"
|
||||
#include "user_wifi.h"
|
||||
#include "time_server/user_rtc.h"
|
||||
#include "user_power.h"
|
||||
#include "mqtt_server/user_mqtt_client.h"
|
||||
#include "http_server/app_httpd.h"
|
||||
#include "timed_task/timed_task.h"
|
||||
|
||||
@@ -17,6 +17,7 @@ char rtc_init = 0; //sntp校时成功标志位
|
||||
uint32_t total_time = 0;
|
||||
char str_mac[16] = {0};
|
||||
int last_check_day = 0;
|
||||
int childLockEnabled = 0;
|
||||
|
||||
system_config_t *sys_config;
|
||||
user_config_t *user_config;
|
||||
@@ -43,12 +44,23 @@ void appRestoreDefault_callback(void *const user_config_data, uint32_t size) {
|
||||
userConfigDefault->p_count_1_day_ago = 0;
|
||||
userConfigDefault->power_led_enabled = 1;
|
||||
userConfigDefault->version = USER_CONFIG_VERSION;
|
||||
|
||||
int i;
|
||||
for (i = 0; i < SOCKET_NUM; i++) {
|
||||
userConfigDefault->socket_status[i] = 1;
|
||||
set_key_map(userConfigDefault->user,1, SWITCH_ALL_SOCKETS, NO_FUNCTION);
|
||||
for (int i = 2; i < 32; i++) {
|
||||
int longFunc = NO_FUNCTION;
|
||||
//出厂设置，长按5秒开启配网模式，长按10秒恢复出厂设置
|
||||
if (i >=5 && i< 10) {
|
||||
longFunc = CONFIG_WIFI;
|
||||
} else if (i >= 10 && i< 15) {
|
||||
longFunc = RESET_SYSTEM;
|
||||
}
|
||||
set_key_map(userConfigDefault->user,i, NO_FUNCTION, longFunc);
|
||||
}
|
||||
for (i = 0; i < MAX_TASK_NUM; i++) {
|
||||
|
||||
for (int i = 0; i < SOCKET_NUM; i++) {
|
||||
userConfigDefault->socket_status[i] = 1;
|
||||
snprintf(userConfigDefault->socket_names[i], SOCKET_NAME_LENGTH, "插座-%d", i + 1);
|
||||
}
|
||||
for (int i = 0; i < MAX_TASK_NUM; i++) {
|
||||
userConfigDefault->timed_tasks[i].on_use = false;
|
||||
}
|
||||
mico_system_context_update(sys_config);
|
||||
@@ -56,15 +68,17 @@ void appRestoreDefault_callback(void *const user_config_data, uint32_t size) {
|
||||
|
||||
void recordDailyPCount() {
|
||||
// 获取当前时间
|
||||
mico_utc_time_t utc_time;
|
||||
mico_time_get_utc_time(&utc_time);
|
||||
utc_time += 28800;
|
||||
struct tm * current_time = localtime((const time_t *) &utc_time);
|
||||
mico_utc_time_t utc_time;
|
||||
mico_time_get_utc_time(&utc_time);
|
||||
utc_time += 28800;
|
||||
struct tm *current_time = localtime((const time_t *) &utc_time);
|
||||
// 判断上次检查的时间与当前时间的日期是否不同
|
||||
if (last_check_day != 0) {
|
||||
// 如果日期发生变化（即跨天了），则进行记录
|
||||
if (current_time->tm_mday != last_check_day) {
|
||||
tc1_log("WARNGIN: pcount day changed! now day %d hour %d min %d ,lastCheck day %d",current_time->tm_mday,current_time->tm_hour,current_time->tm_min,last_check_day);
|
||||
if (current_time->tm_mday != last_check_day) { tc1_log(
|
||||
"WARNGIN: pcount day changed! now day %d hour %d min %d ,lastCheck day %d",
|
||||
current_time->tm_mday, current_time->tm_hour, current_time->tm_min,
|
||||
last_check_day);
|
||||
|
||||
// tc1_log("WARNGIN: pcount day changed! ");
|
||||
// 记录数据
|
||||
@@ -81,8 +95,8 @@ void recordDailyPCount() {
|
||||
} else {
|
||||
// tc1_log("WARNGIN: pcount day not changed , waiting for next run! ");
|
||||
}
|
||||
}else{
|
||||
tc1_log("WARNGIN: now day %d hour %d min %d ,lastCheck day %d",current_time->tm_mday,current_time->tm_hour,current_time->tm_min,last_check_day);
|
||||
} else { tc1_log("WARNGIN: now day %d hour %d min %d ,lastCheck day %d", current_time->tm_mday,
|
||||
current_time->tm_hour, current_time->tm_min, last_check_day);
|
||||
}
|
||||
// 更新上次检查时间
|
||||
last_check_day = current_time->tm_mday;
|
||||
@@ -132,7 +146,7 @@ int application_start(void) {
|
||||
MicoGpioInitialize((mico_gpio_t) Button, INPUT_PULL_UP);
|
||||
if (!MicoGpioInputGet(Button)) { //开机时按钮状态
|
||||
tc1_log("press ap_init");
|
||||
ApInit(false);
|
||||
ApInit(true);
|
||||
open_ap = true;
|
||||
}
|
||||
|
||||
@@ -143,6 +157,7 @@ int application_start(void) {
|
||||
}
|
||||
MicoSysLed(0);
|
||||
|
||||
childLockEnabled = (int) user_config->user[0];
|
||||
if (user_config->version != USER_CONFIG_VERSION) { tc1_log("WARNGIN: user params restored!");
|
||||
err = mico_system_context_restore(sys_config);
|
||||
require_noerr(err, exit);
|
||||
@@ -152,8 +167,8 @@ int application_start(void) {
|
||||
sprintf(sys_config->micoSystemConfig.name, ZTC1_NAME, str_mac + 8);
|
||||
}
|
||||
|
||||
tc1_log("user:%s", user_config->user);tc1_log("device name:%s",
|
||||
sys_config->micoSystemConfig.name);tc1_log(
|
||||
tc1_log("device name:%s",
|
||||
sys_config->micoSystemConfig.name);tc1_log(
|
||||
"mqtt_ip:%s", user_config->mqtt_ip);tc1_log("mqtt_port:%d",
|
||||
user_config->mqtt_port);tc1_log(
|
||||
"mqtt_user:%s", user_config->mqtt_user);
|
||||
@@ -170,8 +185,6 @@ int application_start(void) {
|
||||
}
|
||||
}
|
||||
KeyInit();
|
||||
err = UserMqttInit();
|
||||
require_noerr(err, exit);
|
||||
err = UserRtcInit();
|
||||
require_noerr(err, exit);
|
||||
PowerInit();
|
||||
@@ -181,12 +194,12 @@ int application_start(void) {
|
||||
|
||||
err = mico_rtos_create_thread(NULL, MICO_APPLICATION_PRIORITY, "p_count",
|
||||
(mico_thread_function_t) schedule_p_count_task,
|
||||
0x2000, 0);
|
||||
0x800, 0);
|
||||
require_noerr_string(err, exit, "ERROR: Unable to start the p_count thread.");
|
||||
|
||||
err = mico_rtos_create_thread(NULL, MICO_APPLICATION_PRIORITY, "mqtt_power_report",
|
||||
(mico_thread_function_t) reportMqttPowerInfoThread,
|
||||
0x2000, 0);
|
||||
0x800, 0);
|
||||
require_noerr_string(err, exit, "ERROR: Unable to start the mqtt_power_report thread.");
|
||||
|
||||
|
||||
@@ -196,6 +209,7 @@ int application_start(void) {
|
||||
ProcessTask();
|
||||
}
|
||||
|
||||
if (now % 10 == 5) system_log("Free memory %d bytes", MicoGetMemoryInfo()->free_memory);
|
||||
mico_thread_msleep(1000);
|
||||
}
|
||||
|
||||
|
||||
14
TC1/main.h
14
TC1/main.h
@@ -16,17 +16,17 @@
|
||||
#define wifi_log(M, ...) custom_log("WIFI", M, ##__VA_ARGS__); web_log("WIFI", M, ##__VA_ARGS__);
|
||||
#define power_log(M, ...) custom_log("POWER", M, ##__VA_ARGS__); web_log("POWER", M, ##__VA_ARGS__);
|
||||
|
||||
#define VERSION "v2.1.6"
|
||||
#define VERSION "v2.2.4"
|
||||
|
||||
#define TYPE 1
|
||||
#define TYPE_NAME "zTC1"
|
||||
#define TYPE_NAME "TC1"
|
||||
|
||||
#define ZTC1_NAME "zTC1-%s"
|
||||
#define ZTC1_NAME "TC1-%s"
|
||||
|
||||
#define USER_CONFIG_VERSION 8
|
||||
#define USER_CONFIG_VERSION 9
|
||||
#define SETTING_MQTT_STRING_LENGTH_MAX 32 //必须4字节对齐。
|
||||
|
||||
#define SOCKET_NAME_LENGTH 32
|
||||
#define SOCKET_NAME_LENGTH 64
|
||||
#define SOCKET_NUM 6 //插座数量
|
||||
|
||||
#define Led MICO_GPIO_5
|
||||
@@ -35,6 +35,7 @@
|
||||
|
||||
#define Relay_ON 1
|
||||
#define Relay_OFF 0
|
||||
#define Relay_TOGGLE -1
|
||||
|
||||
#define Relay_0 MICO_GPIO_6
|
||||
#define Relay_1 MICO_GPIO_8
|
||||
@@ -51,6 +52,7 @@ typedef struct
|
||||
{
|
||||
char version;
|
||||
char mqtt_ip[SETTING_MQTT_STRING_LENGTH_MAX];
|
||||
char socket_names[SOCKET_NUM][SOCKET_NAME_LENGTH];
|
||||
int mqtt_port;
|
||||
int mqtt_report_freq;
|
||||
char mqtt_user[SETTING_MQTT_STRING_LENGTH_MAX];
|
||||
@@ -74,5 +76,7 @@ extern char str_mac[16];
|
||||
extern system_config_t* sys_config;
|
||||
extern user_config_t* user_config;
|
||||
extern mico_gpio_t Relay[Relay_NUM];
|
||||
extern int childLockEnabled;
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -53,6 +53,7 @@ mico_queue_t mqtt_msg_send_queue = NULL;
|
||||
|
||||
Client c; // mqtt client object
|
||||
Network n; // socket network for mqtt client
|
||||
volatile bool mqtt_thread_should_exit = false;
|
||||
|
||||
static mico_worker_thread_t mqtt_client_worker_thread; /* Worker thread to manage send/recv events */
|
||||
//static mico_timed_event_t mqtt_client_send_event;
|
||||
@@ -76,6 +77,8 @@ void UserMqttTimerFunc(void *arg) {
|
||||
case 0:
|
||||
UserMqttHassAutoLed();
|
||||
UserMqttHassAutoTotalSocket();
|
||||
UserMqttHassAutoChildLock();
|
||||
UserMqttHassAutoRebootButton();
|
||||
break;
|
||||
case 1:
|
||||
case 2:
|
||||
@@ -96,6 +99,18 @@ void UserMqttTimerFunc(void *arg) {
|
||||
}
|
||||
}
|
||||
|
||||
OSStatus UserMqttDeInit(void) {
|
||||
OSStatus err = kNoErr;
|
||||
|
||||
// 1. 请求线程退出
|
||||
mqtt_thread_should_exit = true;
|
||||
|
||||
exit:
|
||||
if (kNoErr != err)
|
||||
mqtt_log("ERROR: UserMqttDeInit exit err: %d", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
/* Application entrance */
|
||||
OSStatus UserMqttInit(void) {
|
||||
OSStatus err = kNoErr;
|
||||
@@ -174,6 +189,11 @@ static OSStatus MqttMsgPublish(Client *c, const char *topic, char qos, char reta
|
||||
return err;
|
||||
}
|
||||
|
||||
void registerMqttEvents(void) {
|
||||
timer_status = 0;
|
||||
mico_start_timer(&timer_handle);
|
||||
}
|
||||
|
||||
void MqttClientThread(mico_thread_arg_t arg) {
|
||||
OSStatus err = kUnknownErr;
|
||||
|
||||
@@ -197,14 +217,14 @@ void MqttClientThread(mico_thread_arg_t arg) {
|
||||
msg_send_event_fd = mico_create_event_fd(mqtt_msg_send_queue);
|
||||
require_action(msg_send_event_fd >= 0, exit,
|
||||
mqtt_log("ERROR: create msg send queue event fd failed!!!"));
|
||||
|
||||
mqtt_thread_should_exit = false;
|
||||
MQTT_start:
|
||||
|
||||
isconnect = false;
|
||||
/* 1. create network connection */
|
||||
ssl_settings.ssl_enable = false;
|
||||
LinkStatusTypeDef LinkStatus;
|
||||
while (1) {
|
||||
while (!mqtt_thread_should_exit) {
|
||||
isconnect = false;
|
||||
mico_rtos_thread_sleep(3);
|
||||
if (MQTT_SERVER[0] < 0x20 || MQTT_SERVER[0] > 0x7f || MQTT_SERVER_PORT < 1)
|
||||
@@ -259,11 +279,13 @@ void MqttClientThread(mico_thread_arg_t arg) {
|
||||
}
|
||||
|
||||
UserMqttSendLedState();
|
||||
UserMqttSendTotalSocketState();
|
||||
UserMqttSendChildLockState();
|
||||
|
||||
mico_init_timer(&timer_handle, 150, UserMqttTimerFunc, &arg);
|
||||
mico_start_timer(&timer_handle);
|
||||
registerMqttEvents();
|
||||
/* 5. client loop for recv msg && keepalive */
|
||||
while (1) {
|
||||
while (!mqtt_thread_should_exit) {
|
||||
isconnect = true;
|
||||
no_mqtt_msg_exchange = true;
|
||||
FD_ZERO(&readfds);
|
||||
@@ -320,10 +342,12 @@ mqtt_log("Disconnect MQTT client, and reconnect after 5s, reason: mqtt_rc = %d,
|
||||
mico_rtos_thread_sleep(5);
|
||||
goto MQTT_start;
|
||||
|
||||
exit:
|
||||
isconnect = false;mqtt_log("EXIT: MQTT client exit with err = %d.", err);
|
||||
exit:
|
||||
isconnect = false;
|
||||
mqtt_log("EXIT: MQTT client exit with err = %d.", err);
|
||||
UserMqttClientRelease(&c, &n);
|
||||
mico_rtos_delete_thread(NULL);
|
||||
mico_rtos_delete_thread(NULL); // 自删
|
||||
return;
|
||||
}
|
||||
|
||||
// callback, msg received from mqtt server
|
||||
@@ -406,12 +430,25 @@ void ProcessHaCmd(char *cmd) {
|
||||
UserMqttSendSocketState(i);
|
||||
}
|
||||
UserMqttSendTotalSocketState();
|
||||
}else if (strcmp(cmd, "set childLock") == ' ') {
|
||||
int on;
|
||||
sscanf(cmd, "set childLock %s %d", mac, &on);
|
||||
if (strcmp(mac, str_mac)) return;mqtt_log("set childLock on[%d]", on);
|
||||
user_config->user[0] = on;
|
||||
childLockEnabled = on;
|
||||
UserMqttSendChildLockState();
|
||||
mico_system_context_update(sys_config);
|
||||
}else if (strcmp(cmd, "reboot") == 0) {
|
||||
MicoSystemReboot(); // 立即重启设备
|
||||
}
|
||||
}
|
||||
|
||||
OSStatus UserMqttSendTopic(char *topic, char *arg, char retained) {
|
||||
OSStatus err = kUnknownErr;
|
||||
p_mqtt_send_msg_t p_send_msg = NULL;
|
||||
if(mqtt_msg_send_queue == NULL){
|
||||
return err;
|
||||
}
|
||||
|
||||
// mqtt_log("======App prepare to send ![%d]======", MicoGetMemoryInfo()->free_memory);
|
||||
|
||||
@@ -494,29 +531,47 @@ OSStatus UserMqttSendLedState(void) {
|
||||
return oss_status;
|
||||
}
|
||||
|
||||
OSStatus UserMqttSendChildLockState(void) {
|
||||
char *send_buf = malloc(64);
|
||||
char *topic_buf = malloc(64);
|
||||
OSStatus oss_status = kUnknownErr;
|
||||
if (send_buf != NULL && topic_buf != NULL) {
|
||||
sprintf(topic_buf, "homeassistant/switch/%s/childLock/state", str_mac);
|
||||
sprintf(send_buf, "set childLock %s %d", str_mac, childLockEnabled);
|
||||
oss_status = UserMqttSendTopic(topic_buf, send_buf, 1);
|
||||
}
|
||||
if (send_buf) free(send_buf);
|
||||
if (topic_buf) free(topic_buf);
|
||||
|
||||
return oss_status;
|
||||
}
|
||||
|
||||
//hass mqtt鑷姩鍙戠幇鏁版嵁寮<E5B581>鍏冲彂閫<E5BD82>
|
||||
void UserMqttHassAuto(char socket_id) {
|
||||
socket_id--;
|
||||
char *send_buf = NULL;
|
||||
char *topic_buf = NULL;
|
||||
send_buf = (char *) malloc(1024);
|
||||
send_buf = (char *) malloc(600);
|
||||
topic_buf = (char *) malloc(64);
|
||||
if (send_buf != NULL && topic_buf != NULL) {
|
||||
sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/config", str_mac, socket_id);
|
||||
sprintf(send_buf,
|
||||
"{\"name\":\"TC1_%s_Socket_%d\","
|
||||
"\"uniq_id\":\"%s_s%d\","
|
||||
"{\"name\":\"%s\","
|
||||
"\"uniq_id\":\"tc1_%s_s%d\","
|
||||
"\"object_id\":\"tc1_%s_s%d\","
|
||||
"\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\","
|
||||
"\"cmd_t\":\"device/ztc1/set\","
|
||||
"\"pl_on\":\"set socket %s %d 1\","
|
||||
"\"pl_off\":\"set socket %s %d 0\","
|
||||
"\"device_class\":\"outlet\","
|
||||
"\"device\":{"
|
||||
"\"identifiers\":[\"tc1_%s\"],"
|
||||
"\"name\":\"TC1_%s\","
|
||||
"\"name\":\"%s\","
|
||||
"\"model\":\"TC1\","
|
||||
"\"manufacturer\":\"PHICOMM\"}}",
|
||||
str_mac + 8, socket_id + 1, str_mac, socket_id, str_mac, socket_id, str_mac,
|
||||
socket_id, str_mac, socket_id, str_mac, str_mac);
|
||||
user_config->socket_names[(int)socket_id], str_mac, socket_id,str_mac, socket_id, str_mac, socket_id,
|
||||
str_mac,
|
||||
socket_id, str_mac, socket_id, str_mac,sys_config->micoSystemConfig.name);
|
||||
UserMqttSendTopic(topic_buf, send_buf, 1);
|
||||
}
|
||||
if (send_buf)
|
||||
@@ -525,26 +580,84 @@ void UserMqttHassAuto(char socket_id) {
|
||||
free(topic_buf);
|
||||
}
|
||||
|
||||
void UserMqttHassAutoRebootButton(void) {
|
||||
char *send_buf = NULL;
|
||||
char *topic_buf = NULL;
|
||||
send_buf = (char *) malloc(600);
|
||||
topic_buf = (char *) malloc(64);
|
||||
if (send_buf != NULL && topic_buf != NULL) {
|
||||
// 重启按钮配置
|
||||
sprintf(topic_buf, "homeassistant/button/%s/reboot/config", str_mac);
|
||||
sprintf(send_buf,
|
||||
"{\"name\":\"重启设备\","
|
||||
"\"uniq_id\":\"tc1_%s_reboot\","
|
||||
"\"object_id\":\"tc1_%s_reboot\","
|
||||
"\"cmd_t\":\"device/ztc1/set\","
|
||||
"\"pl_prs\":\"reboot\","
|
||||
"\"device\":{"
|
||||
"\"identifiers\":[\"tc1_%s\"],"
|
||||
"\"name\":\"%s\","
|
||||
"\"model\":\"TC1\","
|
||||
"\"manufacturer\":\"PHICOMM\"}}",
|
||||
str_mac,str_mac,str_mac, sys_config->micoSystemConfig.name);
|
||||
UserMqttSendTopic(topic_buf, send_buf, 1);
|
||||
}
|
||||
if (send_buf) free(send_buf);
|
||||
if (topic_buf) free(topic_buf);
|
||||
}
|
||||
|
||||
void UserMqttHassAutoLed(void) {
|
||||
char *send_buf = NULL;
|
||||
char *topic_buf = NULL;
|
||||
send_buf = (char *) malloc(1024);
|
||||
send_buf = (char *) malloc(600);
|
||||
topic_buf = (char *) malloc(64);
|
||||
if (send_buf != NULL && topic_buf != NULL) {
|
||||
sprintf(topic_buf, "homeassistant/switch/%s/led/config", str_mac);
|
||||
sprintf(send_buf,
|
||||
"{\"name\":\"TC1_%s_Led\","
|
||||
"\"uniq_id\":\"%s_led\","
|
||||
"{\"name\":\"LED指示灯\","
|
||||
"\"uniq_id\":\"tc1_%s_led\","
|
||||
"\"object_id\":\"tc1_%s_led\","
|
||||
"\"stat_t\":\"homeassistant/switch/%s/led/state\","
|
||||
"\"cmd_t\":\"device/ztc1/set\","
|
||||
"\"pl_on\":\"set led %s 1\","
|
||||
"\"pl_off\":\"set led %s 0\","
|
||||
"\"device_class\":\"outlet\","
|
||||
"\"device\":{"
|
||||
"\"identifiers\":[\"tc1_%s\"],"
|
||||
"\"name\":\"TC1_%s\","
|
||||
"\"name\":\"%s\","
|
||||
"\"model\":\"TC1\","
|
||||
"\"manufacturer\":\"PHICOMM\"}}",
|
||||
str_mac + 8, str_mac, str_mac, str_mac, str_mac, str_mac, str_mac);
|
||||
str_mac,str_mac,str_mac, str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
|
||||
UserMqttSendTopic(topic_buf, send_buf, 1);
|
||||
}
|
||||
if (send_buf)
|
||||
free(send_buf);
|
||||
if (topic_buf)
|
||||
free(topic_buf);
|
||||
}
|
||||
|
||||
void UserMqttHassAutoChildLock(void) {
|
||||
char *send_buf = NULL;
|
||||
char *topic_buf = NULL;
|
||||
send_buf = (char *) malloc(600);
|
||||
topic_buf = (char *) malloc(64);
|
||||
if (send_buf != NULL && topic_buf != NULL) {
|
||||
sprintf(topic_buf, "homeassistant/switch/%s/childLock/config", str_mac);
|
||||
sprintf(send_buf,
|
||||
"{\"name\":\"童锁\","
|
||||
"\"uniq_id\":\"tc1_%s_child_lock\","
|
||||
"\"object_id\":\"tc1_%s_child_lock\","
|
||||
"\"stat_t\":\"homeassistant/switch/%s/childLock/state\","
|
||||
"\"cmd_t\":\"device/ztc1/set\","
|
||||
"\"pl_on\":\"set childLock %s 1\","
|
||||
"\"pl_off\":\"set childLock %s 0\","
|
||||
"\"device_class\":\"outlet\","
|
||||
"\"device\":{"
|
||||
"\"identifiers\":[\"tc1_%s\"],"
|
||||
"\"name\":\"%s\","
|
||||
"\"model\":\"TC1\","
|
||||
"\"manufacturer\":\"PHICOMM\"}}",
|
||||
str_mac,str_mac,str_mac, str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
|
||||
UserMqttSendTopic(topic_buf, send_buf, 1);
|
||||
}
|
||||
if (send_buf)
|
||||
@@ -556,23 +669,25 @@ void UserMqttHassAutoLed(void) {
|
||||
void UserMqttHassAutoTotalSocket(void) {
|
||||
char *send_buf = NULL;
|
||||
char *topic_buf = NULL;
|
||||
send_buf = (char *) malloc(1024);
|
||||
send_buf = (char *) malloc(600);
|
||||
topic_buf = (char *) malloc(64);
|
||||
if (send_buf != NULL && topic_buf != NULL) {
|
||||
sprintf(topic_buf, "homeassistant/switch/%s/total_socket/config", str_mac);
|
||||
sprintf(send_buf,
|
||||
"{\"name\":\"TC1_%s_TotalSocket\","
|
||||
"\"uniq_id\":\"%s_total_socket\","
|
||||
"{\"name\":\"总开关\","
|
||||
"\"uniq_id\":\"tc1_%s_total_socket\","
|
||||
"\"object_id\":\"tc1_%s_total_socket\","
|
||||
"\"stat_t\":\"homeassistant/switch/%s/total_socket/state\","
|
||||
"\"cmd_t\":\"device/ztc1/set\","
|
||||
"\"pl_on\":\"set total_socket %s 1\","
|
||||
"\"pl_off\":\"set total_socket %s 0\","
|
||||
"\"device_class\":\"outlet\","
|
||||
"\"device\":{"
|
||||
"\"identifiers\":[\"tc1_%s\"],"
|
||||
"\"name\":\"TC1_%s\","
|
||||
"\"name\":\"%s\","
|
||||
"\"model\":\"TC1\","
|
||||
"\"manufacturer\":\"PHICOMM\"}}",
|
||||
str_mac + 8, str_mac, str_mac, str_mac, str_mac, str_mac, str_mac);
|
||||
str_mac, str_mac, str_mac, str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
|
||||
UserMqttSendTopic(topic_buf, send_buf, 1);
|
||||
}
|
||||
if (send_buf)
|
||||
@@ -585,66 +700,87 @@ void UserMqttHassAutoTotalSocket(void) {
|
||||
void UserMqttHassAutoPower(void) {
|
||||
char *send_buf = NULL;
|
||||
char *topic_buf = NULL;
|
||||
send_buf = malloc(1024);
|
||||
send_buf = malloc(600);
|
||||
topic_buf = malloc(128);
|
||||
if (send_buf != NULL && topic_buf != NULL) {
|
||||
sprintf(topic_buf, "homeassistant/sensor/%s/power/config", str_mac);
|
||||
sprintf(send_buf,
|
||||
"{\"name\":\"TC1_%s_Power\","
|
||||
"\"uniq_id\":\"%s_p\","
|
||||
"{\"name\":\"功率\","
|
||||
"\"uniq_id\":\"tc1_%s_p\","
|
||||
"\"object_id\":\"tc1_%s_p\","
|
||||
"\"state_topic\":\"homeassistant/sensor/%s/power/state\","
|
||||
"\"unit_of_measurement\":\"W\","
|
||||
"\"icon\":\"mdi:gauge\","
|
||||
"\"value_template\":\"{{ value_json.power }}\",""\"device\":{"
|
||||
"\"identifiers\":[\"tc1_%s\"],"
|
||||
"\"name\":\"TC1_%s\","
|
||||
"\"name\":\"%s\","
|
||||
"\"model\":\"TC1\","
|
||||
"\"manufacturer\":\"PHICOMM\"}}",
|
||||
str_mac + 8, str_mac, str_mac, str_mac, str_mac);
|
||||
str_mac,str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
|
||||
UserMqttSendTopic(topic_buf, send_buf, 1);
|
||||
sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumption/config", str_mac);
|
||||
sprintf(send_buf,
|
||||
"{\"name\":\"TC1_%s_PowerConsumption\","
|
||||
"\"uniq_id\":\"%s_pc\","
|
||||
"{\"name\":\"总耗电量\","
|
||||
"\"uniq_id\":\"tc1_%s_pc\","
|
||||
"\"object_id\":\"tc1_%s_pc\","
|
||||
"\"state_topic\":\"homeassistant/sensor/%s/powerConsumption/state\","
|
||||
"\"unit_of_measurement\":\"kWh\","
|
||||
"\"icon\":\"mdi:fence-electric\","
|
||||
"\"value_template\":\"{{ value_json.powerConsumption }}\",""\"device\":{"
|
||||
"\"identifiers\":[\"tc1_%s\"],"
|
||||
"\"name\":\"TC1_%s\","
|
||||
"\"name\":\"%s\","
|
||||
"\"model\":\"TC1\","
|
||||
"\"manufacturer\":\"PHICOMM\"}}",
|
||||
str_mac + 8, str_mac, str_mac, str_mac, str_mac);
|
||||
str_mac, str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
|
||||
UserMqttSendTopic(topic_buf, send_buf, 1);
|
||||
|
||||
|
||||
sprintf(topic_buf, "homeassistant/sensor/%s/startupTime/config", str_mac);
|
||||
sprintf(send_buf,
|
||||
"{\"name\":\"运行时间\","
|
||||
"\"uniq_id\":\"tc1_%s_sut\","
|
||||
"\"object_id\":\"tc1_%s_sut\","
|
||||
"\"state_topic\":\"homeassistant/sensor/%s/startupTime/state\","
|
||||
"\"icon\":\"mdi:clock-time-three-outline\","
|
||||
"\"entity_category\":\"diagnostic\","
|
||||
"\"value_template\":\"{{ value_json.startupTime }}\",""\"device\":{"
|
||||
"\"identifiers\":[\"tc1_%s\"],"
|
||||
"\"name\":\"%s\","
|
||||
"\"model\":\"TC1\","
|
||||
"\"manufacturer\":\"PHICOMM\"}}",
|
||||
str_mac, str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
|
||||
UserMqttSendTopic(topic_buf, send_buf, 1);
|
||||
|
||||
sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionToday/config", str_mac);
|
||||
sprintf(send_buf,
|
||||
"{\"name\":\"TC1_%s_powerConsumptionToday\","
|
||||
"\"uniq_id\":\"%s_pc_today\","
|
||||
"{\"name\":\"今日耗电量\","
|
||||
"\"uniq_id\":\"tc1_%s_pc_today\","
|
||||
"\"object_id\":\"tc1_%s_pc_today\","
|
||||
"\"state_topic\":\"homeassistant/sensor/%s/powerConsumptionToday/state\","
|
||||
"\"unit_of_measurement\":\"kWh\","
|
||||
"\"icon\":\"mdi:fence-electric\","
|
||||
"\"value_template\":\"{{ value_json.powerConsumptionToday }}\",""\"device\":{"
|
||||
"\"identifiers\":[\"tc1_%s\"],"
|
||||
"\"name\":\"TC1_%s\","
|
||||
"\"name\":\"%s\","
|
||||
"\"model\":\"TC1\","
|
||||
"\"manufacturer\":\"PHICOMM\"}}",
|
||||
str_mac + 8, str_mac, str_mac, str_mac, str_mac);
|
||||
str_mac,str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
|
||||
UserMqttSendTopic(topic_buf, send_buf, 1);
|
||||
|
||||
sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionYesterday/config", str_mac);
|
||||
sprintf(send_buf,
|
||||
"{\"name\":\"TC1_%s_powerConsumptionYesterday\","
|
||||
"\"uniq_id\":\"%s_pc_yesterday\","
|
||||
"{\"name\":\"昨日耗电量\","
|
||||
"\"uniq_id\":\"tc1_%s_pc_yesterday\","
|
||||
"\"object_id\":\"tc1_%s_pc_yesterday\","
|
||||
"\"state_topic\":\"homeassistant/sensor/%s/powerConsumptionYesterday/state\","
|
||||
"\"unit_of_measurement\":\"kWh\","
|
||||
"\"icon\":\"mdi:fence-electric\","
|
||||
"\"value_template\":\"{{ value_json.powerConsumptionYesterday }}\",""\"device\":{"
|
||||
"\"identifiers\":[\"tc1_%s\"],"
|
||||
"\"name\":\"TC1_%s\","
|
||||
"\"name\":\"%s\","
|
||||
"\"model\":\"TC1\","
|
||||
"\"manufacturer\":\"PHICOMM\"}}",
|
||||
str_mac + 8, str_mac, str_mac, str_mac, str_mac);
|
||||
str_mac,str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
|
||||
UserMqttSendTopic(topic_buf, send_buf, 1);
|
||||
}
|
||||
if (send_buf) free(send_buf);
|
||||
@@ -663,6 +799,21 @@ void UserMqttHassPower(void) {
|
||||
sprintf(send_buf, "{\"powerConsumption\":\"%.3f\"}", (17.1 * p_count) / 1000 / 36000);
|
||||
UserMqttSendTopic(topic_buf, send_buf, 0);
|
||||
|
||||
//计算系统运行时间
|
||||
char up_time[16] = "00:00:00";
|
||||
mico_time_t past_ms = 0;
|
||||
mico_time_get_time(&past_ms);
|
||||
int past = past_ms / 1000;
|
||||
int d = past / 3600 / 24;
|
||||
int h = past / 3600 % 24;
|
||||
int m = past / 60 % 60;
|
||||
int s = past % 60;
|
||||
sprintf(up_time, "%d - %02d:%02d:%02d", d, h, m, s);
|
||||
|
||||
sprintf(topic_buf, "homeassistant/sensor/%s/startupTime/state", str_mac);
|
||||
sprintf(send_buf, "{\"startupTime\":\"%s\"}", up_time);
|
||||
UserMqttSendTopic(topic_buf, send_buf, 0);
|
||||
|
||||
// tc1_log("p_count %ld, p_count_1_day_ago %ld ,p_count_2_days_ago %ld, result %ld",p_count,user_config->p_count_1_day_ago,user_config->p_count_2_days_ago,((p_count-user_config->p_count_1_day_ago)<0?0:(p_count-user_config->p_count_1_day_ago)));
|
||||
sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionToday/state", str_mac);
|
||||
sprintf(send_buf, "{\"powerConsumptionToday\":\"%.3f\"}", (17.1 * ((p_count -
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
#define MQTT_CMD_TIMEOUT 5000 // 5s
|
||||
#define MQTT_YIELD_TMIE 5000 // 5s
|
||||
|
||||
#define MAX_MQTT_TOPIC_SIZE (256)
|
||||
#define MAX_MQTT_DATA_SIZE (1024)
|
||||
#define MAX_MQTT_TOPIC_SIZE (512)
|
||||
#define MAX_MQTT_DATA_SIZE (2048)
|
||||
#define MAX_MQTT_SEND_QUEUE_SIZE (10)
|
||||
|
||||
#define MQTT_SERVER user_config->mqtt_ip
|
||||
@@ -22,6 +22,7 @@
|
||||
#define MQTT_LED_ENABLED user_config->power_led_enabled
|
||||
|
||||
extern OSStatus UserMqttInit(void);
|
||||
extern OSStatus UserMqttDeInit(void);
|
||||
|
||||
extern OSStatus UserMqttSend(char *arg);
|
||||
|
||||
@@ -31,6 +32,8 @@ extern OSStatus UserMqttSendSocketState(char socket_id);
|
||||
|
||||
extern OSStatus UserMqttSendLedState(void);
|
||||
|
||||
extern OSStatus UserMqttSendChildLockState(void);
|
||||
|
||||
extern OSStatus UserMqttSendTotalSocketState(void);
|
||||
|
||||
extern void UserMqttHassAuto(char socket_id);
|
||||
@@ -41,6 +44,12 @@ extern void UserMqttHassAutoPower(void);
|
||||
|
||||
extern void UserMqttHassAutoLed(void);
|
||||
|
||||
extern void UserMqttHassAutoChildLock(void);
|
||||
|
||||
extern void UserMqttHassAutoTotalSocket(void);
|
||||
|
||||
extern void registerMqttEvents(void);
|
||||
|
||||
extern void UserMqttHassAutoRebootButton(void);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -257,7 +257,7 @@ static void OtaServerThread(mico_thread_arg_t arg)
|
||||
InitMd5(&md5);
|
||||
}
|
||||
|
||||
httpHeader = HTTPHeaderCreateWithCallback(1024, OnReceivedData, NULL, NULL);
|
||||
httpHeader = HTTPHeaderCreateWithCallback(512, OnReceivedData, NULL, NULL);
|
||||
require_action(httpHeader, DELETE, OtaServerProgressSet(OTA_FAIL));
|
||||
|
||||
while (1)
|
||||
|
||||
@@ -67,7 +67,7 @@ OSStatus UserRtcInit(void)
|
||||
/* start rtc client */
|
||||
err = mico_rtos_create_thread(NULL, MICO_APPLICATION_PRIORITY, "rtc",
|
||||
(mico_thread_function_t) RtcThread,
|
||||
0x1000, 0);
|
||||
0x800, 0);
|
||||
require_noerr_string(err, exit, "ERROR: Unable to start the rtc thread.");
|
||||
|
||||
if (kNoErr != err) rtc_log("ERROR1, app thread exit err: %d kNoErr[%d]", err, kNoErr);
|
||||
|
||||
@@ -6,8 +6,10 @@
|
||||
|
||||
#include"main.h"
|
||||
#include"user_gpio.h"
|
||||
#include "mqtt_server/user_mqtt_client.h"
|
||||
#include"timed_task/timed_task.h"
|
||||
#include"http_server/web_log.h"
|
||||
#include "user_wifi.h"
|
||||
|
||||
int day_sec = 86400;
|
||||
|
||||
@@ -142,9 +144,61 @@ bool DelTask(int time)
|
||||
|
||||
void ProcessTask()
|
||||
{
|
||||
task_log("process task time[%ld] socket_idx[%d] on[%d]",
|
||||
user_config->task_top->prs_time, user_config->task_top->socket_idx, user_config->task_top->on);
|
||||
UserRelaySet(user_config->task_top->socket_idx, user_config->task_top->on);
|
||||
task_log("process task time[%ld] operation[%s] on[%d]",
|
||||
user_config->task_top->prs_time, get_func_name(user_config->task_top->operation), user_config->task_top->on);
|
||||
switch (user_config->task_top->operation) {
|
||||
case SWITCH_ALL_SOCKETS:
|
||||
UserRelaySetAll(user_config->task_top->on);
|
||||
mico_system_context_update(sys_config);
|
||||
for (int i = 0; i < SOCKET_NUM; i++) {
|
||||
UserMqttSendSocketState(i);
|
||||
}
|
||||
UserMqttSendTotalSocketState();
|
||||
break;
|
||||
case SWITCH_SOCKET_1:
|
||||
case SWITCH_SOCKET_2:
|
||||
case SWITCH_SOCKET_3:
|
||||
case SWITCH_SOCKET_4:
|
||||
case SWITCH_SOCKET_5:
|
||||
case SWITCH_SOCKET_6:
|
||||
UserRelaySet(user_config->task_top->operation - 1, user_config->task_top->on);
|
||||
UserMqttSendSocketState(user_config->task_top->operation - 1);
|
||||
UserMqttSendTotalSocketState();
|
||||
mico_system_context_update(sys_config);
|
||||
break;
|
||||
case SWITCH_LED_ENABLE:
|
||||
|
||||
if (RelayOut() && user_config->task_top->on) {
|
||||
UserLedSet(1);
|
||||
} else {
|
||||
UserLedSet(0);
|
||||
}
|
||||
UserMqttSendLedState();
|
||||
mico_system_context_update(sys_config);
|
||||
break;
|
||||
case SWITCH_CHILD_LOCK_ENABLE:
|
||||
user_config->user[0] = user_config->task_top->on;
|
||||
childLockEnabled = user_config->user[0];
|
||||
mico_system_context_update(sys_config);
|
||||
UserMqttSendChildLockState();
|
||||
break;
|
||||
case REBOOT_SYSTEM:
|
||||
MicoSystemReboot();
|
||||
break;
|
||||
case CONFIG_WIFI:
|
||||
|
||||
micoWlanSuspendStation();
|
||||
ApInit(true);
|
||||
break;
|
||||
case RESET_SYSTEM:
|
||||
|
||||
mico_system_context_restore(sys_config);
|
||||
mico_rtos_thread_sleep(1);
|
||||
MicoSystemReboot();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
DelFirstTask();
|
||||
}
|
||||
|
||||
@@ -164,8 +218,8 @@ char* GetTaskStr()
|
||||
tm_info = localtime(&prs_time);
|
||||
strftime(buffer, 26, "%m-%d %H:%M", tm_info);
|
||||
|
||||
sprintf(tmp_str, "{'timestamp':%ld,'prs_time':'%s','socket_idx':%d,'on':%d,'weekday':%d},",
|
||||
tmp_tsk->prs_time, buffer, tmp_tsk->socket_idx+1, tmp_tsk->on, tmp_tsk->weekday);
|
||||
sprintf(tmp_str, "{'timestamp':%ld,'prs_time':'%s','operation':%d,'on':%d,'weekday':%d},",
|
||||
tmp_tsk->prs_time, buffer, tmp_tsk->operation, tmp_tsk->on, tmp_tsk->weekday);
|
||||
tmp_str += strlen(tmp_str);
|
||||
tmp_tsk = tmp_tsk->next;
|
||||
}
|
||||
|
||||
@@ -7,8 +7,8 @@ struct TimedTask
|
||||
{
|
||||
bool on_use; //正在使用
|
||||
time_t prs_time; //被执行的格林尼治时间戳
|
||||
int socket_idx; //要控制的插孔
|
||||
int on; //开或者关
|
||||
int operation; //要进行的操作
|
||||
int on; //开或者关，或者其他操作
|
||||
int weekday; //星期重复 0代表不重复 8代表每日重复
|
||||
pTimedTask next; //下一个任务(按之间排序)
|
||||
};
|
||||
|
||||
432
TC1/user_gpio.c
432
TC1/user_gpio.c
@@ -2,13 +2,14 @@
|
||||
|
||||
#include "main.h"
|
||||
#include "user_gpio.h"
|
||||
#include "user_wifi.h"
|
||||
#include "mqtt_server/user_mqtt_client.h"
|
||||
|
||||
mico_gpio_t relay[Relay_NUM] = { Relay_0, Relay_1, Relay_2, Relay_3, Relay_4, Relay_5 };
|
||||
char socket_status[32] = { 0 };
|
||||
mico_gpio_t relay[Relay_NUM] = {Relay_0, Relay_1, Relay_2, Relay_3, Relay_4, Relay_5};
|
||||
char socket_status[32] = {0};
|
||||
char btn_click_config[500] = {0};
|
||||
|
||||
void UserLedSet(char x)
|
||||
{
|
||||
void UserLedSet(char x) {
|
||||
if (x == -1)
|
||||
MicoGpioOutputTrigger(Led);
|
||||
else if (x)
|
||||
@@ -17,43 +18,111 @@ void UserLedSet(char x)
|
||||
MicoGpioOutputLow(Led);
|
||||
}
|
||||
|
||||
bool RelayOut(void)
|
||||
{
|
||||
bool RelayOut(void) {
|
||||
int i;
|
||||
for (i = 0; i < SOCKET_NUM; i++)
|
||||
{
|
||||
if (user_config->socket_status[i] != 0)
|
||||
{
|
||||
for (i = 0; i < SOCKET_NUM; i++) {
|
||||
if (user_config->socket_status[i] != 0) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
char* GetSocketStatus()
|
||||
{
|
||||
char* get_func_name(char func_code) {
|
||||
static char buffer[32];
|
||||
switch (func_code) {
|
||||
case SWITCH_ALL_SOCKETS:
|
||||
return "Toggle All Sockets";
|
||||
case SWITCH_SOCKET_1:
|
||||
case SWITCH_SOCKET_2:
|
||||
case SWITCH_SOCKET_3:
|
||||
case SWITCH_SOCKET_4:
|
||||
case SWITCH_SOCKET_5:
|
||||
case SWITCH_SOCKET_6:
|
||||
sprintf(buffer, "Toggle Socket %d %s", func_code - 1,
|
||||
user_config->socket_names[func_code - 1]);
|
||||
return buffer;
|
||||
case SWITCH_LED_ENABLE:
|
||||
return "Toggle LED";
|
||||
case REBOOT_SYSTEM:
|
||||
return "Reboot";
|
||||
case REBOOT_HTTP:
|
||||
return "REBOOT_HTTP";
|
||||
case CONFIG_WIFI:
|
||||
return "WiFi Config";
|
||||
case RESET_SYSTEM:
|
||||
return "Factory Reset";
|
||||
case SWITCH_CHILD_LOCK_ENABLE:
|
||||
return "Toggle ChildLick";
|
||||
case -1:
|
||||
case NO_FUNCTION:
|
||||
return "Unassigned";
|
||||
default:
|
||||
return "Unknown";
|
||||
}
|
||||
}
|
||||
|
||||
/// 针对电源按钮的点击事件
|
||||
/// \param index 判断短按（连击）时，代表连击次数，判断长按时代表长按秒数
|
||||
/// \param short_func 功能码 在user_gpio.h中定义了
|
||||
/// \param long_func 功能码 在user_gpio.h中定义了
|
||||
void set_key_map(char user[],int index, char short_func, char long_func) {
|
||||
user[index] = ((long_func & 0x0F) << 4) | (short_func & 0x0F);
|
||||
}
|
||||
|
||||
char get_short_func(char val) {
|
||||
char func = val & 0x0F;
|
||||
return (func == NO_FUNCTION) ? -1 : func; // -1 表示未配置
|
||||
}
|
||||
|
||||
char get_long_func(char val) {
|
||||
char func = (val >> 4) & 0x0F;
|
||||
return (func == NO_FUNCTION) ? -1 : func; // -1 表示未配置
|
||||
}
|
||||
|
||||
|
||||
char *GetSocketStatus() {
|
||||
sprintf(socket_status, "%d,%d,%d,%d,%d,%d",
|
||||
user_config->socket_status[0],
|
||||
user_config->socket_status[1],
|
||||
user_config->socket_status[2],
|
||||
user_config->socket_status[3],
|
||||
user_config->socket_status[4],
|
||||
user_config->socket_status[5]);
|
||||
user_config->socket_status[0],
|
||||
user_config->socket_status[1],
|
||||
user_config->socket_status[2],
|
||||
user_config->socket_status[3],
|
||||
user_config->socket_status[4],
|
||||
user_config->socket_status[5]);
|
||||
return socket_status;
|
||||
}
|
||||
|
||||
void SetSocketStatus(char* socket_status)
|
||||
{
|
||||
char *GetButtonClickConfig() {
|
||||
char temp[32];
|
||||
int len = 0;
|
||||
int max_len =sizeof(btn_click_config);
|
||||
len += snprintf(btn_click_config + len, max_len - len, "[");
|
||||
|
||||
for (int i = 1; i <= 30; i++) {
|
||||
char short_func = get_short_func(user_config->user[i]);
|
||||
char long_func = get_long_func(user_config->user[i]);
|
||||
// key_log("WARNGIN:KEY func %d %d %d", i,short_func,long_func);
|
||||
|
||||
snprintf(temp, sizeof(temp), "{'%d':[%d,%d]}%s", i, short_func, long_func, (i != 30) ? "," : "");
|
||||
len += snprintf(btn_click_config + len, max_len - len, "%s", temp);
|
||||
|
||||
if (len >= max_len - 1) break;
|
||||
}
|
||||
snprintf(btn_click_config + len, max_len - len, "]");
|
||||
|
||||
return btn_click_config;
|
||||
}
|
||||
|
||||
void SetSocketStatus(char *socket_status) {
|
||||
sscanf(socket_status, "%d,%d,%d,%d,%d,%d,",
|
||||
(int*)&user_config->socket_status[0],
|
||||
(int*)&user_config->socket_status[1],
|
||||
(int*)&user_config->socket_status[2],
|
||||
(int*)&user_config->socket_status[3],
|
||||
(int*)&user_config->socket_status[4],
|
||||
(int*)&user_config->socket_status[5]);
|
||||
(int *) &user_config->socket_status[0],
|
||||
(int *) &user_config->socket_status[1],
|
||||
(int *) &user_config->socket_status[2],
|
||||
(int *) &user_config->socket_status[3],
|
||||
(int *) &user_config->socket_status[4],
|
||||
(int *) &user_config->socket_status[5]);
|
||||
int i = 0;
|
||||
for (i = 0; i < SOCKET_NUM; i++)
|
||||
{
|
||||
for (i = 0; i < SOCKET_NUM; i++) {
|
||||
UserRelaySet(i, user_config->socket_status[i]);
|
||||
UserMqttSendSocketState(i);
|
||||
}
|
||||
@@ -64,29 +133,27 @@ void SetSocketStatus(char* socket_status)
|
||||
/*UserRelaySet
|
||||
* 设置继电器开关
|
||||
* i:编号 0-5
|
||||
* on:开关 0:关 1:开
|
||||
* on:开关 0:关 1:开 -1:切换
|
||||
*/
|
||||
void UserRelaySet(unsigned char i, unsigned char on)
|
||||
{
|
||||
void UserRelaySet(unsigned char i, char on) {
|
||||
if (i < 0 || i >= SOCKET_NUM) return;
|
||||
|
||||
if (on == Relay_ON)
|
||||
{
|
||||
if (on == Relay_ON) {
|
||||
MicoGpioOutputHigh(relay[i]);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else if (on == Relay_OFF) {
|
||||
MicoGpioOutputLow(relay[i]);
|
||||
} else if (on == Relay_TOGGLE) {
|
||||
if (user_config->socket_status[i] == Relay_OFF) {
|
||||
MicoGpioOutputHigh(relay[i]);
|
||||
} else {
|
||||
MicoGpioOutputLow(relay[i]);
|
||||
}
|
||||
}
|
||||
user_config->socket_status[i] = on >= 0 ? on : (user_config->socket_status[i] == 0 ? 1 : 0);
|
||||
|
||||
user_config->socket_status[i] = on;
|
||||
|
||||
if (RelayOut()&&user_config->power_led_enabled)
|
||||
{
|
||||
if (RelayOut() && user_config->power_led_enabled) {
|
||||
UserLedSet(1);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
UserLedSet(0);
|
||||
}
|
||||
}
|
||||
@@ -96,112 +163,229 @@ void UserRelaySet(unsigned char i, unsigned char on)
|
||||
* y: 0:全部关 1:全部开
|
||||
*
|
||||
*/
|
||||
void UserRelaySetAll(char y)
|
||||
{
|
||||
void UserRelaySetAll(char y) {
|
||||
int i;
|
||||
for (i = 0; i < SOCKET_NUM; i++)
|
||||
UserRelaySet(i, y);
|
||||
}
|
||||
|
||||
static void KeyLongPress(void)
|
||||
{
|
||||
// key_log("KeyLongPress");
|
||||
// UserLedSet(1);
|
||||
// UserMqttSend("mqtt test");
|
||||
static void KeyEventHandler(int num, boolean longPress) {
|
||||
key_log("WARNGIN:Power key %s %d %s", !longPress ? "quick clicked" : "longPressed", num,
|
||||
num > 1 ? (longPress ? "seconds" : "times") : (longPress ? "second" : "time"));
|
||||
if (num > 30 || num <= 0)
|
||||
return;
|
||||
int function = !longPress ? get_short_func(user_config->user[num]) : get_long_func(
|
||||
user_config->user[num]);
|
||||
boolean showLog= childLockEnabled==0;
|
||||
switch (function) {
|
||||
case SWITCH_ALL_SOCKETS:
|
||||
if (childLockEnabled)
|
||||
break;
|
||||
if (RelayOut()) {
|
||||
UserRelaySetAll(0);
|
||||
} else {
|
||||
UserRelaySetAll(1);
|
||||
}
|
||||
mico_system_context_update(sys_config);
|
||||
for (int i = 0; i < SOCKET_NUM; i++) {
|
||||
UserMqttSendSocketState(i);
|
||||
}
|
||||
UserMqttSendTotalSocketState();
|
||||
break;
|
||||
case SWITCH_SOCKET_1:
|
||||
case SWITCH_SOCKET_2:
|
||||
case SWITCH_SOCKET_3:
|
||||
case SWITCH_SOCKET_4:
|
||||
case SWITCH_SOCKET_5:
|
||||
case SWITCH_SOCKET_6:
|
||||
if (childLockEnabled)
|
||||
break;
|
||||
UserRelaySet(function - 1, Relay_TOGGLE);
|
||||
UserMqttSendSocketState(function - 1);
|
||||
UserMqttSendTotalSocketState();
|
||||
mico_system_context_update(sys_config);
|
||||
break;
|
||||
case SWITCH_LED_ENABLE:
|
||||
if (childLockEnabled)
|
||||
break;
|
||||
MQTT_LED_ENABLED = MQTT_LED_ENABLED == 0 ? 1 : 0;
|
||||
if (RelayOut() && MQTT_LED_ENABLED) {
|
||||
UserLedSet(1);
|
||||
} else {
|
||||
UserLedSet(0);
|
||||
}
|
||||
UserMqttSendLedState();
|
||||
mico_system_context_update(sys_config);
|
||||
break;
|
||||
case SWITCH_CHILD_LOCK_ENABLE:
|
||||
showLog=true;
|
||||
user_config->user[0] = user_config->user[0] == 0 ? 1 : 0;
|
||||
childLockEnabled = user_config->user[0];
|
||||
mico_system_context_update(sys_config);
|
||||
UserMqttSendChildLockState();
|
||||
break;
|
||||
case REBOOT_SYSTEM:
|
||||
if (childLockEnabled)
|
||||
break;
|
||||
MicoSystemReboot();
|
||||
break;
|
||||
case REBOOT_HTTP:
|
||||
if (childLockEnabled)
|
||||
break;
|
||||
AppHttpdStop();
|
||||
mico_rtos_thread_sleep(1);
|
||||
AppHttpdStart();
|
||||
break;
|
||||
case CONFIG_WIFI:
|
||||
if (childLockEnabled)
|
||||
break;
|
||||
StartLedBlink(3);
|
||||
UserMqttDeInit();
|
||||
micoWlanSuspendStation();
|
||||
ApInit(true);
|
||||
break;
|
||||
case RESET_SYSTEM:
|
||||
if (childLockEnabled)
|
||||
break;
|
||||
StartLedBlink(8);
|
||||
mico_system_context_restore(sys_config);
|
||||
mico_rtos_thread_sleep(1);
|
||||
MicoSystemReboot();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
key_log("WARNGIN:%s",showLog? get_func_name(function):"child lock enabled,ignore key event !");
|
||||
}
|
||||
|
||||
static void KeyLong10sPress(void)
|
||||
{
|
||||
key_log("WARNGIN: user params restored!");
|
||||
appRestoreDefault_callback(user_config, sizeof(user_config_t));
|
||||
sys_config->micoSystemConfig.ssid[0] = 0;
|
||||
mico_system_context_update(mico_system_context_get());
|
||||
}
|
||||
static void KeyShortPress(void)
|
||||
{
|
||||
char i;
|
||||
|
||||
if (RelayOut())
|
||||
{
|
||||
UserRelaySetAll(0);
|
||||
}
|
||||
else
|
||||
{
|
||||
UserRelaySetAll(1);
|
||||
}
|
||||
|
||||
for (i = 0; i < SOCKET_NUM; i++)
|
||||
{
|
||||
UserMqttSendSocketState(i);
|
||||
}
|
||||
UserMqttSendTotalSocketState();
|
||||
}
|
||||
mico_timer_t user_key_timer;
|
||||
// 全局静态变量声明
|
||||
static uint8_t click_count = 0;
|
||||
static mico_timer_t click_end_timer;
|
||||
uint16_t key_time = 0;
|
||||
#define BUTTON_LONG_PRESS_TIME 10 //100ms*10=1s
|
||||
|
||||
static void KeyTimeoutHandler(void* arg)
|
||||
static mico_timer_t led_blink_timer;
|
||||
static bool timer_initialized = false;
|
||||
|
||||
static uint8_t total_blinks = 0;
|
||||
static uint8_t blink_counter = 0;
|
||||
static bool led_state = false;
|
||||
#define BUTTON_LONG_PRESS_TIME 10 //100ms*10=1s
|
||||
// 定时器回调
|
||||
static void _led_blink_timer_handler(void *arg)
|
||||
{
|
||||
if (blink_counter >= total_blinks) {
|
||||
UserLedSet(0); // 闪烁完成，灭灯
|
||||
mico_stop_timer(&led_blink_timer);
|
||||
mico_deinit_timer(&led_blink_timer);
|
||||
timer_initialized = false;
|
||||
return;
|
||||
}
|
||||
|
||||
led_state = !led_state;
|
||||
UserLedSet(led_state ? 1 : 0);
|
||||
blink_counter++;
|
||||
}
|
||||
|
||||
// 安全重入的启动函数
|
||||
void StartLedBlink(uint8_t times)
|
||||
{
|
||||
if (times == 0) return;
|
||||
|
||||
// 如果之前已启动，先停止并清理
|
||||
if (timer_initialized) {
|
||||
mico_stop_timer(&led_blink_timer);
|
||||
mico_deinit_timer(&led_blink_timer);
|
||||
timer_initialized = false;
|
||||
}
|
||||
|
||||
total_blinks = times * 2;
|
||||
blink_counter = 0;
|
||||
led_state = false;
|
||||
|
||||
mico_init_timer(&led_blink_timer, 100, _led_blink_timer_handler, NULL);
|
||||
mico_start_timer(&led_blink_timer);
|
||||
timer_initialized = true;
|
||||
}
|
||||
static void ClickEndTimeoutHandler(void *arg) {
|
||||
if (click_count <= 0) {
|
||||
click_count = 0;
|
||||
return;
|
||||
}
|
||||
KeyEventHandler(click_count,false);
|
||||
click_count = 0;
|
||||
}
|
||||
|
||||
static void KeyTimeoutHandler(void *arg) {
|
||||
static char key_trigger, key_continue;
|
||||
//按键扫描程序
|
||||
static uint8_t key_time = 0;
|
||||
|
||||
char tmp = ~(0xfe | MicoGpioInputGet(Button));
|
||||
key_trigger = tmp & (tmp ^ key_continue);
|
||||
key_continue = tmp;
|
||||
if (key_trigger != 0) key_time = 0; //新按键按下时,重新开始按键计时
|
||||
if (key_continue != 0)
|
||||
{
|
||||
//any button pressed
|
||||
key_time++;
|
||||
if (key_time <= BUTTON_LONG_PRESS_TIME)
|
||||
{
|
||||
key_log("button long pressed:%d",key_time);
|
||||
|
||||
if (key_time == 30)
|
||||
{
|
||||
KeyLongPress();
|
||||
}
|
||||
else if (key_time == 100)
|
||||
{
|
||||
KeyLong10sPress();
|
||||
}
|
||||
else if (key_time == 102)
|
||||
{
|
||||
UserLedSet(1);
|
||||
}
|
||||
else if (key_time == 103)
|
||||
{
|
||||
UserLedSet(0);
|
||||
key_time = 101;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//button released
|
||||
if (key_time < BUTTON_LONG_PRESS_TIME)
|
||||
{ //100ms*10=1s 大于1s为长按
|
||||
key_time = 0;
|
||||
key_log("button short pressed:%d",key_time);
|
||||
KeyShortPress();
|
||||
}
|
||||
else if (key_time > 100)
|
||||
{
|
||||
MicoSystemReboot();
|
||||
if (key_trigger != 0)
|
||||
key_time = 0;
|
||||
|
||||
if (key_continue != 0) {
|
||||
key_time++;
|
||||
// if (key_time > BUTTON_LONG_PRESS_TIME) {
|
||||
// if (key_time == 50) {
|
||||
// KeyLong5sPress();
|
||||
// } else if (key_time > 50 && key_time < 57) {
|
||||
// switch (key_time) {
|
||||
// case 51:
|
||||
// UserLedSet(1);
|
||||
// break;
|
||||
// case 52:
|
||||
// UserLedSet(0);
|
||||
// break;
|
||||
// case 53:
|
||||
// UserLedSet(1);
|
||||
// break;
|
||||
// case 54:
|
||||
// UserLedSet(0);
|
||||
// break;
|
||||
// case 55:
|
||||
// UserLedSet(1);
|
||||
// break;
|
||||
// case 56:
|
||||
// UserLedSet(0);
|
||||
// break;
|
||||
// }
|
||||
// } else if (key_time == 57) {
|
||||
// UserLedSet(RelayOut() && user_config->power_led_enabled);
|
||||
// } else if (key_time == 100) {
|
||||
// KeyLong10sPress();
|
||||
// } else if (key_time == 102) {
|
||||
// UserLedSet(1);
|
||||
// } else if (key_time == 103) {
|
||||
// UserLedSet(0);
|
||||
// key_time = 101;
|
||||
// }
|
||||
// }
|
||||
} else {
|
||||
if (key_time < BUTTON_LONG_PRESS_TIME) {
|
||||
click_count++;
|
||||
|
||||
// 重启 click_end_timer（300ms）
|
||||
mico_rtos_stop_timer(&click_end_timer);
|
||||
mico_rtos_start_timer(&click_end_timer);
|
||||
} else {
|
||||
KeyEventHandler(key_time/10,true);
|
||||
}
|
||||
|
||||
mico_rtos_stop_timer(&user_key_timer);
|
||||
}
|
||||
}
|
||||
|
||||
static void KeyFallingIrqHandler(void* arg)
|
||||
{
|
||||
static void KeyFallingIrqHandler(void *arg) {
|
||||
mico_rtos_start_timer(&user_key_timer);
|
||||
}
|
||||
|
||||
void KeyInit(void)
|
||||
{
|
||||
void KeyInit(void) {
|
||||
MicoGpioInitialize(Button, INPUT_PULL_UP);
|
||||
mico_rtos_init_timer(&user_key_timer, 100, KeyTimeoutHandler, NULL);
|
||||
|
||||
mico_rtos_init_timer(&click_end_timer, 400, ClickEndTimeoutHandler, NULL);
|
||||
MicoGpioEnableIRQ(Button, IRQ_TRIGGER_FALLING_EDGE, KeyFallingIrqHandler, NULL);
|
||||
|
||||
}
|
||||
|
||||
@@ -4,14 +4,35 @@
|
||||
#include "mico.h"
|
||||
#include "micokit_ext.h"
|
||||
|
||||
#define NO_FUNCTION 0x0F
|
||||
#define SWITCH_ALL_SOCKETS 0
|
||||
#define SWITCH_SOCKET_1 1
|
||||
#define SWITCH_SOCKET_2 2
|
||||
#define SWITCH_SOCKET_3 3
|
||||
#define SWITCH_SOCKET_4 4
|
||||
#define SWITCH_SOCKET_5 5
|
||||
#define SWITCH_SOCKET_6 6
|
||||
#define SWITCH_LED_ENABLE 7
|
||||
#define REBOOT_SYSTEM 8
|
||||
#define CONFIG_WIFI 9
|
||||
#define RESET_SYSTEM 10
|
||||
#define SWITCH_CHILD_LOCK_ENABLE 11
|
||||
#define REBOOT_HTTP 12
|
||||
|
||||
extern char socket_status[32];
|
||||
|
||||
void UserLedSet(char x);
|
||||
void KeyInit(void);
|
||||
void UserRelaySet(unsigned char x,unsigned char y);
|
||||
void UserRelaySet(unsigned char x, char y);
|
||||
void UserRelaySetAll(char y);
|
||||
bool RelayOut(void);
|
||||
char* GetSocketStatus();
|
||||
char* GetButtonClickConfig();
|
||||
void SetSocketStatus(char* socket_status);
|
||||
void set_key_map(char user[],int index, char short_func, char long_func);
|
||||
char get_short_func(char val);
|
||||
char get_long_func(char val);
|
||||
char *get_func_name(char func_code);
|
||||
void StartLedBlink(uint8_t times);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "mico_socket.h"
|
||||
#include "user_gpio.h"
|
||||
#include "http_server/web_log.h"
|
||||
#include "mqtt_server/user_mqtt_client.h"
|
||||
|
||||
char wifi_status = WIFI_STATE_NOCONNECT;
|
||||
|
||||
@@ -122,6 +123,9 @@ static void WifiLedTimerCallback(void* arg)
|
||||
UserLedSet(-1);
|
||||
break;
|
||||
case WIFI_STATE_CONNECTED:
|
||||
if (!(MQTT_SERVER[0] < 0x20 || MQTT_SERVER[0] > 0x7f || MQTT_SERVER_PORT < 1)){
|
||||
UserMqttInit();
|
||||
}
|
||||
UserLedSet(0);
|
||||
mico_rtos_stop_timer(&wifi_led_timer);
|
||||
if (RelayOut()&&user_config->power_led_enabled)
|
||||
|
||||
38
build.sh
38
build.sh
@@ -1,11 +1,27 @@
|
||||
cd ./TC1/http_server
|
||||
|
||||
python ./test.py > web_data.c
|
||||
|
||||
cd ../..
|
||||
|
||||
mico make clean
|
||||
|
||||
mico make TC1@MK3031@moc total
|
||||
|
||||
cp ./build/TC1\@MK3031\@moc/binary/TC1\@MK3031\@moc.ota.bin ./build/TC1\@MK3031\@moc/binary/ota.bin
|
||||
version_file=".version"
|
||||
if [ ! -f $version_file ]; then echo "v1.0.0" > $version_file; fi
|
||||
|
||||
# 读当前版本并自增
|
||||
ver=$(cat $version_file)
|
||||
major=$(echo $ver | cut -d. -f1 | sed 's/v//')
|
||||
minor=$(echo $ver | cut -d. -f2)
|
||||
patch=$(echo $ver | cut -d. -f3)
|
||||
patch=$((patch + 1))
|
||||
new_ver="v${major}.${minor}.${patch}"
|
||||
echo $new_ver > $version_file
|
||||
|
||||
|
||||
cd ./TC1/http_server
|
||||
|
||||
python ./test.py > web_data.c
|
||||
|
||||
cd ../..
|
||||
|
||||
mico make TC1@MK3031@moc total
|
||||
|
||||
cp ./build/TC1\@MK3031\@moc/binary/TC1\@MK3031\@moc.ota.bin ./build/TC1\@MK3031\@moc/binary/ota.bin
|
||||
|
||||
cp ./build/TC1\@MK3031\@moc/binary/TC1\@MK3031\@moc.ota.bin ./build/TC1\@MK3031\@moc/binary/ota$(date +%Y%m%d%H%M%S).bin
|
||||
|
||||
cp ./build/TC1\@MK3031\@moc/binary/TC1\@MK3031\@moc.all.bin ./build/TC1\@MK3031\@moc/binary/all$(date +%Y%m%d%H%M%S).bin
|
||||
|
||||
|
||||
BIN
doc/IMG_0862.png
Normal file
BIN
doc/IMG_0862.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 396 KiB |
BIN
doc/IMG_0863.png
Normal file
BIN
doc/IMG_0863.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 286 KiB |
BIN
doc/IMG_0887.png
Normal file
BIN
doc/IMG_0887.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 216 KiB |
BIN
doc/IMG_0888.png
Normal file
BIN
doc/IMG_0888.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 265 KiB |
4
mico-os/.gitignore
vendored
Normal file
4
mico-os/.gitignore
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
MiCoder/compiler
|
||||
Projects
|
||||
MiCoder
|
||||
tools_root
|
||||
@@ -50,7 +50,8 @@ httpd_state_t httpd_state;
|
||||
|
||||
static mico_thread_t httpd_main_thread;
|
||||
|
||||
#define http_server_thread_stack_size 0x2000
|
||||
// 0x8000 不行
|
||||
#define http_server_thread_stack_size 0x6000
|
||||
|
||||
/* Why HTTPD_MAX_MESSAGE + 2?
|
||||
* Handlers are allowed to use HTTPD_MAX_MESSAGE bytes of this buffer.
|
||||
|
||||
@@ -1125,6 +1125,8 @@ int httpd_parse_hdr_tags(httpd_request_t *req, int sock,
|
||||
*/
|
||||
int httpd_get_data(httpd_request_t *req, char *content, int length);
|
||||
|
||||
int httpd_get_data2(httpd_request_t *req, char *content, int length);
|
||||
|
||||
/** @brief Get the incoming JSON data in case of HTTP POST request
|
||||
*
|
||||
* @note This function is an extension to \ref httpd_get_data. Additionally this
|
||||
|
||||
@@ -543,6 +543,52 @@ out:
|
||||
return req->remaining_bytes;
|
||||
}
|
||||
|
||||
int httpd_get_data2(httpd_request_t *req, char *content, int length)
|
||||
{
|
||||
int ret;
|
||||
char *buf;
|
||||
|
||||
// /* Is this condition required? */
|
||||
// if (req->body_nbytes >= HTTPD_MAX_MESSAGE - 2)
|
||||
// return -kInProgressErr;
|
||||
|
||||
if (!req->hdr_parsed) {
|
||||
buf = malloc(HTTPD_MAX_MESSAGE);
|
||||
if (!buf) {
|
||||
system_log("Failed to allocate memory for buffer");
|
||||
return -kInProgressErr;
|
||||
}
|
||||
|
||||
ret = httpd_parse_hdr_tags(req, req->sock, buf,
|
||||
HTTPD_MAX_MESSAGE);
|
||||
|
||||
if (ret != kNoErr) {
|
||||
system_log("Unable to parse header tags");
|
||||
goto out;
|
||||
} else {
|
||||
system_log("Headers parsed successfully\r\n");
|
||||
req->hdr_parsed = 1;
|
||||
}
|
||||
|
||||
free(buf);
|
||||
}
|
||||
|
||||
/* handle here */
|
||||
ret = httpd_recv(req->sock, content,
|
||||
length, 0);
|
||||
if (ret == -1) {
|
||||
system_log("Failed to read POST data");
|
||||
goto out;
|
||||
}
|
||||
/* scratch will now have the JSON data */
|
||||
// content[ret] = '\0';
|
||||
req->remaining_bytes -= ret;
|
||||
system_log("Read %d bytes and remaining %d bytes",
|
||||
ret, req->remaining_bytes);
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int get_matching_chars(const char *s1, const char *s2)
|
||||
{
|
||||
int match = 0;
|
||||
|
||||
Reference in New Issue
Block a user