ソースを参照

fix: statem有点编译警告,清理一下吧

Wendal Chen 4 年 前
コミット
96a83afc36

+ 0 - 2
components/statem/luat_lib_statem.c

@@ -73,8 +73,6 @@ static int _statem_usleep(lua_State *L) {
 
 static int _statem_end(lua_State *L) {
     luat_statem_t* sm = luaL_checkudata(L, 1, "SM*");
-    int gpio_pin = luaL_checkinteger(L, 2);
-    int gpio_val = luaL_checkinteger(L, 3);
     luat_statem_addop(sm, LUAT_SM_OP_END, (uint8_t)0, (uint8_t)0, (uint8_t)0);
     return 0;
 }

+ 6 - 6
components/statem/luat_statem.c

@@ -6,9 +6,9 @@ void luat_statem_init(luat_statem_t* sm) {
 
 void luat_statem_addop(luat_statem_t* sm, uint8_t tp, uint8_t arg1, uint8_t arg2, uint8_t arg3) {
     sm->op_list[sm->pc].tp = tp;
-    sm->op_list[sm->pc].arg.Arg888.arg1 = arg1;
-    sm->op_list[sm->pc].arg.Arg888.arg2 = arg2;
-    sm->op_list[sm->pc].arg.Arg888.arg3 = arg3;
+    sm->op_list[sm->pc].arg1 = arg1;
+    sm->op_list[sm->pc].arg2 = arg2;
+    sm->op_list[sm->pc].arg3 = arg3;
     sm->pc ++;
 }
 
@@ -24,10 +24,10 @@ void luat_statem_exec(luat_statem_t* sm) {
         switch (op->tp)
         {
         case LUAT_SM_OP_USLEEP:
-            luat_timer_us_delay(op->arg.Arg888.arg1);
+            luat_timer_us_delay(op->arg1);
             break;
         case LUAT_SM_OP_GPIO_GET:
-            value = luat_gpio_get(op->arg.Arg888.arg1);
+            value = luat_gpio_get(op->arg1);
             if (sm->gpio_input_offset < 256) {
                 if (value) {
                     sm->gpio_inputs[(sm->gpio_input_offset) /32] |= 1 << (sm->gpio_input_offset & 0x1F);
@@ -36,7 +36,7 @@ void luat_statem_exec(luat_statem_t* sm) {
             }
             break;
         case LUAT_SM_OP_GPIO_SET:
-            luat_gpio_set(op->arg.Arg888.arg1, op->arg.Arg888.arg2);
+            luat_gpio_set(op->arg1, op->arg2);
             break;
         default:
             break;

+ 3 - 16
components/statem/luat_statem.h

@@ -4,22 +4,9 @@
 
 typedef struct luat_statm_op {
     uint8_t tp;
-    typedef union luat_statem_op_arg
-    {
-        struct {
-            uint8_t arg1;
-            uint8_t arg2;
-            uint8_t arg3;
-        }Arg888;
-        struct {
-            uint8_t arg1;
-            uint16_t arg2;
-        }Arg816;
-        struct {
-            uint16_t arg1;
-            uint8_t arg2;
-        }Arg168;
-    } arg;
+    uint8_t arg1;
+    uint8_t arg2;
+    uint8_t arg3;
 }luat_statm_op_t;
 
 typedef struct luat_statem