Dev v0.6.2

aibase/aibase_runtime.go

@@ -1,3 +1,18 @@
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 package aibase
 
 import (

aibase/ann_base.go

@@ -1 +1,16 @@
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 package aibase

aibase/body_pose_recognition.go

@@ -1,3 +1,18 @@
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 package aibase
 
 import (

aibase/common_utils.go

@@ -1 +1,16 @@
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 package aibase

aibase/rnn_base.go

@@ -1 +1,16 @@
-package aibase
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package aibase

aibase/typex.go

@@ -1,3 +1,18 @@
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 package aibase
 
 /*

appstack/appstack_runtime.go

@@ -1,3 +1,18 @@
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 package appstack
 
 import (

appstack/lua_runtime.go

@@ -1,3 +1,18 @@
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 package appstack
 
 import (
@@ -84,9 +99,7 @@ func LoadAppLib(app *typex.Application, e typex.RuleX) {
 	// 消息转发
 	addAppLib(app, e, "applib", "DataToHttp", rulexlib.DataToHttp(e))
 	addAppLib(app, e, "applib", "DataToMqtt", rulexlib.DataToMqtt(e))
-	// DataToIthings 专门为Ithings支持的
-	// vendor: 三方支持命名空间
-	addAppLib(app, e, "vendor", "DataToIthings", rulexlib.DataToMqtt(e))
+
 	addAppLib(app, e, "applib", "DataToUdp", rulexlib.DataToUdp(e))
 	// JQ
 	addAppLib(app, e, "applib", "JqSelect", rulexlib.JqSelect(e))
@@ -173,9 +186,9 @@ func LoadAppLib(app *typex.Application, e typex.RuleX) {
 	//------------------------------------------------------------------------
 	// 注册GPIO操作函数到LUA运行时
 	//------------------------------------------------------------------------
-	// EEKIT
-	addAppLib(app, e, "eekit", "GPIOGet", rulexlib.EEKIT_GPIOGet(e))
-	addAppLib(app, e, "eekit", "GPIOSet", rulexlib.EEKIT_GPIOSet(e))
+	// EEKIT H3
+	addAppLib(app, e, "eekith3", "GPIOGet", rulexlib.EEKIT_GPIOGet(e))
+	addAppLib(app, e, "eekith3", "GPIOSet", rulexlib.EEKIT_GPIOSet(e))
 	// 树莓派4B
 	addAppLib(app, e, "raspi4b", "GPIOGet", rulexlib.RASPI4_GPIOGet(e))
 	addAppLib(app, e, "raspi4b", "GPIOSet", rulexlib.RASPI4_GPIOSet(e))

appstack/readme.md

@@ -22,7 +22,7 @@ AppDESCRIPTION = "A demo app"
 -- 必须包含 APPMain(arg) 函数作为 app 启动点
 function Main(arg)
 	while true do
-		local value, err = eekit:GPIOGet(6)
+		local value, err = eekith3:GPIOGet(6)
 		if err ~= nil
 		then
 			print(err)

bspsupport/eekit_adda_linux.go

@@ -14,7 +14,7 @@ import (
 )
 
 //-----------------------------------------------
-// 这是E-EKIT网关的DI-DO支持库
+// 这是EEKIT网关的DI-DO支持库
 //-----------------------------------------------
 /*
     pins map

bspsupport/readme.md

@@ -22,11 +22,13 @@ ARCHSUPPORT=EEKITH3 rulex run
 
 ## 支持硬件列表
 
-| 硬件名          | 环境参数 | 示例                            |
-| --------------- | -------- | ------------------------------- |
-| EEKITH3版本网关 | EEKITH3  | `ARCHSUPPORT=EEKITH3 rulex run` |
-| 树莓派4B、4B+   | RPI4     | `ARCHSUPPORT=RPI4B rulex run`   |
-| 玩客云S805      | WKYS805  | `ARCHSUPPORT=WKYS805 rulex run` |
+| 硬件名             | 环境参数  | 示例                              |
+| ------------------ | --------- | --------------------------------- |
+| EEKIT H3版本网关   | EEKITH3   | `ARCHSUPPORT=EEKITH3 rulex run`   |
+| EEKIT T507版本网关 | EEKITT507 | `ARCHSUPPORT=EEKITT507 rulex run` |
+| EEKIT T113版本网关 | EEKITT113 | `ARCHSUPPORT=EEKITT113 rulex run` |
+| 树莓派4B、4B+      | RPI4      | `ARCHSUPPORT=RPI4B rulex run`     |
+| 玩客云S805         | WKYS805   | `ARCHSUPPORT=WKYS805 rulex run`   |
 
 > 警告: 这些属于板级高级功能，和硬件架构以及外设有关，默认关闭。 如果你自己需要定制，最好针对自己的硬件进行跨平台适配, 如果没有指定平台，可能会导致预料之外的结果。
 
@@ -37,7 +39,7 @@ ARCHSUPPORT=EEKITH3 rulex run
 1. GPIO 设置
 
    ```lua
-   eekit:GPIOSet(Pin, Value)
+   eekith3:GPIOSet(Pin, Value)
    ```
    参数表
 
@@ -48,7 +50,7 @@ ARCHSUPPORT=EEKITH3 rulex run
 2. GPIO 获取
 
    ```lua
-   eekit:GPIOGet(Pin)
+   eekith3:GPIOGet(Pin)
    ```
    | 参数名 | 类型 | 说明     |
    | ------ | ---- | -------- |
@@ -67,13 +69,15 @@ function Main(arg)
 end
 
 ```
-2. EEKIT 网关
+>必须使用这个系统：Linux aml-s812 5.9.0-rc7-aml-s812 #20.12 SMP Sun Dec 13 22:50:05 CST 2020 armv7l GNU/Linux, Armbian 20.12 Buster \l
+
+1. EEKIT 网关
 ```lua
 function Main(arg)
     while true do
-        eekit:GPIOSet(6, 1)
+        eekith3:GPIOSet(6, 1)
         applib:Sleep(2000)
-        eekit:GPIOSet(7, 0)
+        eekith3:GPIOSet(7, 0)
         applib:Sleep(2000)
     end
 end

common/source_config.go

@@ -12,18 +12,6 @@ type GenericIoTHUBMqttConfig struct {
 	Username string `json:"username" validate:"required" title:"连接账户"`
 	Password string `json:"password" validate:"required" title:"连接密码"`
 }
-type IThingsMqttConfig struct {
-	Mode       string `json:"mode" validate:"required" title:"模式:GW(网关)|DC(直连)"`
-	ProductId  string `json:"productId" validate:"required" title:"产品名"`
-	DeviceName string `json:"deviceName" validate:"required" title:"设备名"`
-	//
-	Host string `json:"host" validate:"required" title:"服务地址"`
-	Port int    `json:"port" validate:"required" title:"服务端口"`
-	//
-	ClientId string `json:"clientId" validate:"required" title:"客户端ID"`
-	Username string `json:"username" validate:"required" title:"连接账户"`
-	Password string `json:"password" validate:"required" title:"连接密码"`
-}
 
 /*
 *

core/cfg.go

@@ -1,3 +1,18 @@
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 package core
 
 import (

core/device_namager.go

@@ -1,3 +1,18 @@
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 package core
 
 import "github.com/hootrhino/rulex/typex"

core/lua_validator.go

@@ -1,3 +1,18 @@
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 package core
 
 import (

core/resource_manager.go

@@ -1,3 +1,18 @@
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 package core
 
 import "github.com/hootrhino/rulex/typex"

core/store.go

@@ -1,3 +1,18 @@
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 package core
 
 import (

core/target_manager.go

@@ -1,3 +1,18 @@
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 package core
 
 import "github.com/hootrhino/rulex/typex"