diff --git a/.gitignore b/.gitignore index b21aa33..a97862a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ !/.idea/ !/apps/m9zCtrlTty/logs/ **tgk-touch** -!/apps/m9zCtrlTty/wwwroot/ +!/apps/m9zCtrlTty/wwwroot3/ **.zip !/apps/m9zCtrlTty/data/ +*.idea* +*logs diff --git a/apps/devicetest/app.go b/apps/devicetest/app.go new file mode 100644 index 0000000..e5ce091 --- /dev/null +++ b/apps/devicetest/app.go @@ -0,0 +1,21 @@ +package main + +import ( + "github.com/gogf/gf/v2/errors/gerror" + "go.uber.org/zap" + "tgk-touch/internal/library/meterControl" + "tgk-touch/internal/module/maincontrollerClient" +) + +func main() { + err := maincontrollerClient.UseSerialPort(`/dev/ttyS2`, 8600) + if err != nil { + panic(gerror.Wrap(err, "串口启动失败")) + } + power, err := meterControl.GetMeterControls(meterControl.ADL400).ReadTotalPower("", 0x04) + if err != nil { + panic(err) + return + } + zap.S().Debugf("power: %+v", power) +} diff --git a/apps/m9zCtrlTty/config/config-bak.json b/apps/m9zCtrlTty/config/config-bak.json new file mode 100644 index 0000000..02eff1e --- /dev/null +++ b/apps/m9zCtrlTty/config/config-bak.json @@ -0,0 +1,59 @@ +{ + "server": { + "port": "8089", + "static": "./wwwroot" + }, + "logger": { + "path": "logs", + "file": "{Y-m-d}.log", + "prefix": "", + "level": "debug", + "timeFormat": "2006-01-02 15:04:05", + "ctxKeys": [], + "header": true, + "stdout": true, + "rotateSize": 0, + "rotateExpire": 0, + "rotateBackupLimit": 0, + "rotateBackupExpire": 0, + "rotateBackupCompress": 0, + "rotateCheckInterval": "1h", + "stdoutColorDisabled": false, + "writerColorEnable": false + }, + "tty": { + "serialPortAddress": "/dev/ttyS2", + "baudRate": "9600" + }, + "deviceInfo": { + "deviceId": "TGK", + "version": "1.0.2", + "meterAddr": "0x04" + }, + "MessageInterval": 15, + "Firefox": { + "DebPkgPath": "./firefox", + "DebPkgName": "firefox-deb.tar.gz", + "InstallShellPath": "./firefox/firefox_install.sh" + }, + "zap": { + "level": "debug", + "prefix": "", + "format": "console", + "director": "logs", + "encode-level": "CapitalLevelEncoder", + "stacktrace-key": "stacktrace", + "show-line": true, + "console-in-log": true, + "log-in-console": true, + "retention-day": 30, + "max-size": "10mb", + "compress": true, + "compress-level": 9, + "check-interval": "30m" + }, + "mainControllerClient": { + "server_host": "wss://iotserver.ruixininfo.com/jsonrpc/websocket", + "secret_key": "viFuv4G2XJMxO4GIIsVfbJ2eKwy6QyuWLXmqZY69dy0G9iTY" + } +} diff --git a/apps/m9zCtrlTty/config/config.json b/apps/m9zCtrlTty/config/config.json index d33a737..e154c04 100644 --- a/apps/m9zCtrlTty/config/config.json +++ b/apps/m9zCtrlTty/config/config.json @@ -29,7 +29,7 @@ "baudRate": "9600" }, "deviceInfo": { - "deviceId": "862809072815088", + "deviceId": "866749078669632", "version": "1.0.2", "meterAddr": "0x04" },