dev: v0.6.5

.github/workflows/2_build_and_test.yml

@@ -18,8 +18,15 @@ jobs:
       - name: Linux 构建测试
         run: |
           sudo apt update -y
-          sudo apt install jq cloc protobuf-compiler -y
+          sudo apt install jq cloc protobuf-compiler \
+               gcc-mingw-w64-x86-64 \
+               gcc-arm-linux-gnueabi \
+               gcc-mips-linux-gnu \
+               gcc-mingw-w64 \
+               gcc-aarch64-linux-gnu -y
           cloc ./
+          go get
+          go get -t github.com/hootrhino/rulex/test
           make
           # for test mqtt
           echo "Start Mqtt Server"
@@ -37,3 +44,5 @@ jobs:
           go test -timeout 30s -run ^Test_data_to_tdengine$ github.com/hootrhino/rulex/test -v -count=1
           #
           go test -timeout 30s -run ^Test_DataToMongo$ github.com/hootrhino/rulex/test -v -count=1
+          chmod +x ./release_pkg.sh
+          bash ./release_pkg.sh

.gitignore

@@ -17,13 +17,10 @@ profile*
 _release*
 _build*
 lua-log*
-*.txt
-*.txt.gz
-plugin/http_server/www/*
-plugin/http_server/server/www/*
+*.txt*
 dist/
 apps/*.lua
-plugin/http_server/www/index.html
-plugin/http_server/server/www/index.html
 test/script/_temp/*
 upload/*
+go.sum
+component/rulex_api_server/server/www/*

Makefile

@@ -8,61 +8,70 @@ ip=$(shell hostname -I)
 memory=$(shell free -m | awk 'NR==2{printf "%.2fGB\n", $$2/1000}')
 disk=$(shell df -h | awk '$$NF=="/"{printf "%s\n", $$2}')
 arch=$(uname -m)
-
+version=$(shell git describe --tags $(git rev-list --tags --max-count=1))
+shortVersion=-X 'github.com/hootrhino/rulex/typex.MainVersion=$(version)'
 .PHONY: all
 all:
 	@echo "\e[41m[*] Distro \e[0m: \e[36m ${distro} \e[0m"
-	@echo "\e[41m[*] Arch \e[0m: \e[36m ${arch} \e[0m"
+	@echo "\e[41m[*] Arch   \e[0m: \e[36m ${arch} \e[0m"
 	@echo "\e[41m[*] Kernel \e[0m: \e[36m ${kernel} \e[0m"
 	@echo "\e[41m[*] Cpu    \e[0m: \e[36m ${cpu} \e[0m"
 	@echo "\e[41m[*] Memory \e[0m: \e[36m ${memory} \e[0m"
 	@echo "\e[41m[*] Host   \e[0m: \e[36m ${host} \e[0m"
 	@echo "\e[41m[*] IP     \e[0m: \e[36m ${ip} \e[0m"
 	@echo "\e[41m[*] Disk   \e[0m: \e[36m ${disk} \e[0m"
+	go generate
 	make build
 
 .PHONY: build
 build:
 	CGO_ENABLED=1 GOOS=linux
-	go build -v -ldflags "-s -w" -o ${APP}
+	go generate
+	go build -ldflags "$(shortVersion) -s -w" -v -o ${APP}
 
 .PHONY: x64linux
 x64linux:
+	go generate
 	CGO_ENABLED=1 GOOS=linux GOARCH=amd64 CC=gcc\
-	    go build -ldflags "-s -w -linkmode external -extldflags -static" -o ${APP}-x64linux
+	    go build -ldflags "$(shortVersion) -s -w" -v -o ${APP}-x64linux
 
 .PHONY: windows
 windows:
 	GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc\
-	    go build -ldflags "-s -w" -o ${APP}-windows.exe
+	    go build -ldflags "$(shortVersion) -s -w" -o ${APP}-windows.exe
 
 .PHONY: arm32
 arm32:
+	go generate
 	CGO_ENABLED=1 GOOS=linux GOARCH=arm CC=arm-linux-gnueabi-gcc\
-	    go build -ldflags "-s -w -linkmode external -extldflags -static" -o ${APP}-arm32linux
+	    go build -ldflags "$(shortVersion) -s -w -linkmode external -extldflags -static" -o ${APP}-arm32linux
 
 .PHONY: arm64
 arm64:
+	go generate
 	CGO_ENABLED=1 GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc\
-	    go build -ldflags "-s -w -linkmode external -extldflags -static" -o ${APP}-arm64linux
+	    go build -ldflags "$(shortVersion) -s -w -linkmode external -extldflags -static" -o ${APP}-arm64linux
 
 .PHONY: mips32
 mips32:
+	go generate
 	# sudo apt-get install gcc-mips-linux-gnu
 	GOOS=linux GOARCH=mips CGO_ENABLED=1 CC=mips-linux-gnu-gcc\
-	    go build -ldflags "-s -w -linkmode external -extldflags -static" -o ${APP}-mips32linux
+	    go build -ldflags "$(shortVersion) -s -w -linkmode external -extldflags -static" -o ${APP}-mips32linux
 
 .PHONY: mips64
 mips64:
+	go generate
 	# sudo apt-get install gcc-mips-linux-gnu
 	GOOS=linux GOARCH=mips64 CGO_ENABLED=1 CC=mips-linux-gnu-gcc\
-	    go build -ldflags "-s -w -linkmode external -extldflags -static" -o ${APP}-mips64linux
+	    go build -ldflags "$(shortVersion) -s -w -linkmode external -extldflags -static" -o ${APP}-mips64linux
 
 .PHONY: mipsel
 mipsle:
+	go generate
 	# sudo apt-get install gcc-mipsel-linux-gnu
 	GOOS=linux GOARCH=mipsle CGO_ENABLED=1 GOMIPS=softfloat CC=mipsel-linux-gnu-gcc\
-	    go build -ldflags "-s -w -linkmode external -extldflags -static" -o ${APP}-mipslelinux
+	    go build -ldflags "$(shortVersion) -s -w -linkmode external -extldflags -static" -o ${APP}-mipslelinux
 
 .PHONY: release
 release:

README.md

@@ -23,6 +23,23 @@
 
 
 ## 快速开始
+### 源码编译
+#### 环境安装
+下面是Ubuntu上搭建环境的指令：
+```bash
+sudo apt install jq cloc protobuf-compiler \
+     gcc-mingw-w64-x86-64 \
+     gcc-arm-linux-gnueabi \
+     gcc-mips-linux-gnu \
+     gcc-mingw-w64 \
+     gcc-aarch64-linux-gnu -y
+```
+> 推荐使用ubuntu开发。
+
+#### 编译
+```sh
+make
+```
 
 ### HelloWorld
 下面展示一个最简单的设备数据转发案例：

bspsupport/eekit_adda_linux.go

@@ -25,14 +25,18 @@ import (
 	DI1 -> PA8
 	DI2	-> PA9
 	DI3 -> PA10
+	USER_GPIO -> PA20
 */
 const (
+	// DO
 	eekit_DO1 string = "6"
 	eekit_DO2 string = "7"
-
+	// DI
 	eekit_DI1 string = "8"
 	eekit_DI2 string = "9"
 	eekit_DI3 string = "10"
+	// Use LED
+	eekit_USER_GPIO string = "20"
 )
 
 const (
@@ -56,11 +60,13 @@ func _EEKIT_GPIOAllInit() int {
 	gpio8 := "/sys/class/gpio/gpio8/value"
 	gpio9 := "/sys/class/gpio/gpio9/value"
 	gpio10 := "/sys/class/gpio/gpio10/value"
+	gpio20 := "/sys/class/gpio/gpio20/value"
 	_, err1 := os.Stat(gpio6)
 	_, err2 := os.Stat(gpio7)
 	_, err3 := os.Stat(gpio8)
 	_, err4 := os.Stat(gpio9)
 	_, err5 := os.Stat(gpio10)
+	_, err6 := os.Stat(gpio20)
 	if err1 != nil {
 		if strings.Contains(err1.Error(), "no such file or directory") {
 			_EEKIT_GPIOInit(eekit_DO1, eekit_Out)
@@ -91,6 +97,12 @@ func _EEKIT_GPIOAllInit() int {
 			fmt.Println("EEKIT_GPIOAllInit DI3 In Mode Ok")
 		}
 	}
+	if err6 != nil {
+		if strings.Contains(err5.Error(), "no such file or directory") {
+			_EEKIT_GPIOInit(eekit_USER_GPIO, eekit_Out)
+			fmt.Println("EEKIT_GPIOAllInit USER_GPIO Out Mode Ok")
+		}
+	}
 	// 返回值无用
 	return 1
 }

bspsupport/rhinopi_gpio_ctrl.go

@@ -15,6 +15,19 @@
 
 package archsupport
 
+//-----------------------------------------------
+// 这是EEKIT网关的DI-DO支持库
+//-----------------------------------------------
+/*
+    pins map
+
+	DO1 -> PA6
+	DO2 -> PA7
+	DI1 -> PA8
+	DI2	-> PA9
+	DI3 -> PA10
+	USER_GPIO -> PA20
+*/
 import (
 	"fmt"
 	"os"
@@ -27,11 +40,6 @@ import (
  */
 const (
 	__h3_GPIO_PATH = "/sys/class/gpio/gpio%v/value"
-	// __h3_DO1       = "/sys/class/gpio/gpio6/value"  // gpio6
-	// __h3_DO2       = "/sys/class/gpio/gpio7/value"  // gpio7
-	// __h3_DI1       = "/sys/class/gpio/gpio8/value"  // gpio8
-	// __h3_DI2       = "/sys/class/gpio/gpio9/value"  // gpio9
-	// __h3_DI3       = "/sys/class/gpio/gpio10/value" // gpio10
 )
 
 /*
@@ -54,6 +62,9 @@ func EEKIT_GPIOGetDI2() (int, error) {
 func EEKIT_GPIOGetDI3() (int, error) {
 	return EEKIT_GPIOGetByFile(10)
 }
+func EEKIT_GPIOGetUserGpio() (int, error) {
+	return EEKIT_GPIOGetByFile(20)
+}
 func EEKIT_GPIOGetByFile(pin byte) (int, error) {
 	return __GPIOGet(fmt.Sprintf(__h3_GPIO_PATH, pin))
 }
@@ -91,6 +102,9 @@ func EEKIT_GPIOSetDI2(value int) error {
 func EEKIT_GPIOSetDI3(value int) error {
 	return EEKIT_GPIOSetByFile(10, value)
 }
+func EEKIT_GPIOSetUserGpio(value int) error {
+	return EEKIT_GPIOSetByFile(20, value)
+}
 
 func EEKIT_GPIOSetByFile(pin, value int) error {
 	return __GPIOSet(fmt.Sprintf(__h3_GPIO_PATH, pin), value)

common/modbus_config.go

@@ -39,13 +39,14 @@ type Registers struct {
 *
  */
 type RegisterRW struct {
-	Tag      string `json:"tag" validate:"required" title:"数据Tag"`         // 数据Tag
-	Alias    string `json:"alias" validate:"required" title:"别名"`          // 别名
-	Function int    `json:"function" validate:"required" title:"Modbus功能"` // Function
-	SlaverId byte   `json:"slaverId" validate:"required" title:"从机ID"`     // 从机ID
-	Address  uint16 `json:"address" validate:"required" title:"地址"`        // Address
-	Quantity uint16 `json:"quantity" validate:"required" title:"数量"`       // Quantity
-	Value    string `json:"value" title:"值" info:"本地系统的串口路径"`              // Value
+	Tag       string `json:"tag" validate:"required" title:"数据Tag"`         // 数据Tag
+	Alias     string `json:"alias" validate:"required" title:"别名"`          // 别名
+	Function  int    `json:"function" validate:"required" title:"Modbus功能"` // Function
+	SlaverId  byte   `json:"slaverId" validate:"required" title:"从机ID"`     // 从机ID
+	Address   uint16 `json:"address" validate:"required" title:"地址"`        // Address
+	Frequency int64  `json:"frequency" validate:"required" title:"采集频率"`    // 间隔
+	Quantity  uint16 `json:"quantity" validate:"required" title:"数量"`       // Quantity
+	Value     string `json:"value"`                                         // 运行时数据
 }
 
 /*
@@ -61,28 +62,11 @@ type RegisterW struct {
 	Values   []byte `json:"values"`   // Value
 }
 
-// Uart "/dev/ttyUSB0"
-// BaudRate = 115200
-// DataBits = 8
-// Parity = "N"
-// StopBits = 1
-// SlaveId = 1
-// Timeout = 5 * time.Second
-// TODO: 在0.5以后删除这两个结构体
-type RTUConfig struct {
-	Uart     string `json:"uart" validate:"required" title:"串口路径" info:"本地系统的串口路径"`
-	BaudRate int    `json:"baudRate" validate:"required" title:"波特率" info:"串口通信波特率"`
-	DataBits int    `json:"dataBits" validate:"required" title:"数据位" info:"串口通信数据位"`
-	Parity   string `json:"parity" validate:"required" title:"奇偶校验" info:"奇偶校验"`
-	StopBits int    `json:"stopBits" validate:"required" title:"停止位" info:"串口通信停止位"`
-}
 type ModBusConfig struct {
-	Mode    string `json:"mode" title:"工作模式" info:"UART/TCP"`
-	Timeout int    `json:"timeout" validate:"required" title:"连接超时"`
-	// Weather allow AutoRequest?
-	AutoRequest bool `json:"autoRequest" title:"启动轮询"`
-	// Request Frequency, default 5 second
-	Frequency int64        `json:"frequency" validate:"required" title:"采集频率"`
-	Config    interface{}  `json:"config" validate:"required" title:"工作模式"`
-	Registers []RegisterRW `json:"registers" validate:"required" title:"寄存器配置"`
+	Mode        string       `json:"mode" title:"工作模式" info:"UART/TCP"`
+	Timeout     *int         `json:"timeout" validate:"required" title:"连接超时"`
+	AutoRequest *bool        `json:"autoRequest" validate:"required"`
+	Frequency   *int64       `json:"frequency" validate:"required" title:"采集频率"`
+	Config      interface{}  `json:"config" validate:"required" title:"工作模式"`
+	Registers   []RegisterRW `json:"registers" validate:"required" title:"寄存器配置"`
 }

common/siemens_config.go

@@ -6,30 +6,21 @@ package common
 *
  */
 type S1200Config struct {
-	Host        string `json:"host" validate:"required" title:"IP地址"`          // 127.0.0.1
-	Port        *int   `json:"port" validate:"required" title:"端口号"`           // 0
-	Rack        *int   `json:"rack" validate:"required" title:"架号"`            // 0
-	Slot        *int   `json:"slot" validate:"required" title:"槽号"`            // 1
-	Model       string `json:"model" validate:"required" title:"型号"`           // s7-200 s7 1500
-	Timeout     *int   `json:"timeout" validate:"required" title:"连接超时时间"`     // 5s
-	IdleTimeout *int   `json:"idleTimeout" validate:"required" title:"心跳超时时间"` // 5s
-	//
-	// Weather allow AutoRequest?
-	AutoRequest bool `json:"autoRequest" title:"启动轮询"`
-	// Request Frequency, default 5 second
-	Frequency int64        `json:"frequency" validate:"required" title:"采集频率"`
-	Blocks    []S1200Block `json:"blocks" validate:"required" title:"采集配置"` // Db
+	Host        string       `json:"host" validate:"required" title:"IP地址:端口号"`      // 127.0.0.1
+	Model       string       `json:"model" validate:"required" title:"型号"`           // s7-200 s7 1500
+	Rack        *int         `json:"rack" validate:"required" title:"架号"`            // 0
+	Slot        *int         `json:"slot" validate:"required" title:"槽号"`            // 1
+	Timeout     *int         `json:"timeout" validate:"required" title:"连接超时时间"`     // 5s
+	IdleTimeout *int         `json:"idleTimeout" validate:"required" title:"心跳超时时间"` // 5s
+	AutoRequest *bool        `json:"autoRequest" title:"启动轮询"`
+	Blocks      []S1200Block `json:"blocks" validate:"required" title:"采集配置"` // Db
 }
 type S1200Block struct {
-	Tag     string `json:"tag" title:"数据tag"`  // 数据tag
-	Address int    `json:"address" title:"地址"` // 地址
-	Start   int    `json:"start" title:"起始地址"` // 起始地址
-	Size    int    `json:"size" title:"数据长度"`  // 数据长度
-}
-type S1200BlockValue struct {
-	Tag     string `json:"tag" title:"数据tag"`  // 数据tag
-	Address int    `json:"address" title:"地址"` // 地址
-	Start   int    `json:"start" title:"起始地址"` // 起始地址
-	Size    int    `json:"size" title:"服务地址"`  // 数据长度
-	Value   []byte `json:"value" title:"数据长度"` // 值
+	Tag       string `json:"tag" validate:"required" title:"数据tag"` // 数据tag
+	Type      string `json:"type" validate:"required" title:"地址"`   // MB | DB |FB
+	Frequency int64  `json:"frequency" validate:"required" title:"采集频率"`
+	Address   int    `json:"address" validate:"required" title:"地址"`            // 地址
+	Start     int    `json:"start" validate:"required" title:"起始地址"`            // 起始地址
+	Size      int    `json:"size" validate:"required" title:"服务地址"`             // 数据长度
+	Value     string `json:"value,omitempty" validate:"required" title:"数据Hex"` // 值
 }