add:修改软件矩阵键盘

luat/include/luat_softkeyboard.h

@@ -0,0 +1,18 @@
+#ifndef LUAT_KEYBOARD_H
+#define LUAT_KEYBOARD_H
+#include "luat_base.h"
+
+typedef struct luat_softkeyboard_conf {
+    uint8_t port;       // 预留port
+    uint8_t inio_num;
+    uint8_t outio_num;
+    uint8_t* inio;      
+    uint8_t* outio;     
+    void* userdata;
+}luat_softkeyboard_conf_t;
+
+int l_softkeyboard_handler(lua_State *L, void* ptr);
+int luat_softkeyboard_init(luat_softkeyboard_conf_t *conf);
+int luat_softkeyboard_deinit(luat_softkeyboard_conf_t *conf);
+
+#endif

luat/modules/luat_lib_softkeyboard.c

@@ -0,0 +1,115 @@
+
+/*
+@module  softkeyboard
+@summary 软件键盘矩阵(当前仅air105支持)
+@version 1.0
+@date    2022.03.09
+*/
+
+#include "luat_base.h"
+#include "luat_softkeyboard.h"
+#include "luat_msgbus.h"
+
+//----------------------
+
+int l_softkeyboard_handler(lua_State *L, void* ptr) {
+    rtos_msg_t* msg = (rtos_msg_t*)lua_topointer(L, -1);
+    lua_getglobal(L, "sys_pub");
+/*
+@sys_pub softkeyboard
+键盘矩阵消息
+SOFT_KB_INC
+@number port, keyboard id 当前固定为0, 可以无视
+@number data, keyboard 按键 需要配合init的map进行解析
+@number state, 按键状态 1 为按下, 0 为 释放
+@usage
+sys.subscribe("SOFT_KB_INC", function(port, data, state)
+    -- port 当前固定为0, 可以无视
+    -- data, 需要配合init的map进行解析
+    -- state, 1 为按下, 0 为 释放
+    log.info("keyboard", port, data, state)
+end)
+*/
+    lua_pushstring(L, "SOFT_KB_INC");
+    lua_pushinteger(L, msg->arg1);
+    lua_pushinteger(L, msg->arg2);
+    lua_pushinteger(L, msg->ptr);
+    lua_call(L, 4, 0);
+    return 0;
+}
+
+/**
+初始化软件键盘矩阵
+@api softkb.init(port, key_in, key_out)
+@int 预留, 当前填0
+@table 矩阵输入按键表
+@table 矩阵输出按键表
+@usage
+    key_in = {pin.PD10,pin.PE00,pin.PE01,pin.PE02}
+    key_out = {pin.PD12,pin.PD13,pin.PD14,pin.PD15}
+    softkb.init(0,key_in,key_out)
+
+sys.subscribe("SOFT_KB_INC", function(port, data, state)
+    -- port 当前固定为0, 可以无视
+    -- data, 需要配合init的map进行解析
+    -- state, 1 为按下, 0 为 释放
+    -- TODO 详细介绍
+end)
+ */
+int l_softkb_init(lua_State* L) {
+    luat_softkeyboard_conf_t conf = {0};
+    conf.port = luaL_checkinteger(L,1);
+    if (lua_istable(L, 2)) {
+        conf.inio_num = lua_rawlen(L, 2);
+        conf.inio = (uint8_t*)luat_heap_calloc(conf.inio_num,sizeof(uint8_t));
+        for (size_t i = 0; i < conf.inio_num; i++){
+            lua_geti(L,2,i+1);
+            conf.inio[i] = luaL_checkinteger(L,-1);
+            lua_pop(L, 1);
+        }
+    }
+    if (lua_istable(L, 3)) {
+        conf.outio_num = lua_rawlen(L, 3);
+        conf.outio = (uint8_t*)luat_heap_calloc(conf.outio_num,sizeof(uint8_t));
+        for (size_t i = 0; i < conf.outio_num; i++){
+            lua_geti(L,3,i+1);
+            conf.outio[i] = luaL_checkinteger(L,-1);
+            lua_pop(L, 1);
+        }
+    }
+    int ret = luat_softkeyboard_init(&conf);
+    lua_pushboolean(L, ret == 0 ? 1 : 0);
+    return 1;
+}
+
+/**
+删除软件键盘矩阵
+@api softkb.deinit(port)
+@int 预留, 当前填0
+@usage
+    softkb.deinit(0)
+ */
+int l_softkb_deinit(lua_State* L) {
+    luat_softkeyboard_conf_t conf = {0};
+    uint8_t softkb_port = luaL_checkinteger(L,1);
+    int ret = luat_softkeyboard_deinit(&conf);
+    luat_heap_free(conf.inio);
+    luat_heap_free(conf.outio);
+    lua_pushboolean(L, ret == 0 ? 1 : 0);
+    return 1;
+}
+
+
+#include "rotable.h"
+static const rotable_Reg reg_softkb[] =
+{
+    { "init",        l_softkb_init,          0},
+    { "deinit",        l_softkb_deinit,          0},
+
+	{ NULL,        NULL,   0}
+};
+
+LUAMOD_API int luaopen_softkb( lua_State *L ) {
+    luat_newlib(L, reg_softkb);
+    return 1;
+}

luat/weak/luat_log_weak.c

@@ -5,8 +5,7 @@
 #include "printf.h"
 #include "luat_cmux.h"
 #include "luat_conf_bsp.h"
-extern uint8_t cmux_state;
-extern uint8_t cmux_log_state;
+
 static uint8_t luat_log_uart_port = 0;
 static uint8_t luat_log_level_cur = LUAT_LOG_DEBUG;