update PikaStdDevice

package/PikaStdDevice/PikaStdDevice.pyi

@@ -74,7 +74,7 @@ class GPIO(BaseDev):
     SIGNAL_FALLING: int
     SIGNAL_ANY: int
 
-    def setCallBack(self, eventCallBack: any, filter: int):
+    def setCallback(self, eventCallBack: any, filter: int):
         """
         Add a callback function to the pin.
         Example: 
@@ -87,6 +87,11 @@ class GPIO(BaseDev):
         The callback function will be called when the signal is triggered.
         """
 
+    def setCallBack(self, eventCallBack: any, filter: int):
+        """
+        deprecated, you can use `setCallback` instead.
+        """
+
     def close(self): ...
 
     def platformHigh(self): ...
@@ -234,7 +239,7 @@ class UART:
     SIGNAL_RX: int
     SIGNAL_TX: int
 
-    def setCallBack(self, eventCallBack: any, filter: int):
+    def setCallback(self, eventCallBack: any, filter: int):
         """
         Add a callback function to the pin.
         Example: 
@@ -245,6 +250,11 @@ class UART:
         ```
         """
 
+    def setCallBack(self, eventCallBack: any, filter: int):
+        """
+        deprecated, you can use `setCallback` instead.
+        """
+
     @abstractmethod
     def platformEnable(self): ...
 
@@ -502,9 +512,12 @@ class CAN(BaseDev):
 
 class BaseDev:
     @PIKA_C_MACRO_IF("PIKA_EVENT_ENABLE")
-    def addEventCallBack(self, eventCallback: any):
+    def addEventCallback(self, eventCallback: any):
         """ Add an event callback. """
 
+    def addEventCallBack(self, eventCallback: any):
+        """ deprecated, use addEventCallback instead. """
+
     @abstractmethod
     @PIKA_C_MACRO_IF("PIKA_EVENT_ENABLE")
     def platformGetEventId(self): ...

package/PikaStdDevice/PikaStdDevice_BaseDev.c

@@ -7,9 +7,8 @@
 
 PikaEventListener* g_pika_device_event_listener;
 
-void PikaStdDevice_BaseDev_addEventCallBack(PikaObj* self, Arg* eventCallBack) {
+void PikaStdDevice_BaseDev_addEventCallback(PikaObj* self, Arg* eventCallBack) {
 #if PIKA_EVENT_ENABLE
-    obj_setArg(self, "eventCallBack", eventCallBack);
     /* init event_listener for the first time */
     if (NULL == g_pika_device_event_listener) {
         pika_eventListener_init(&g_pika_device_event_listener);
@@ -20,13 +19,20 @@ void PikaStdDevice_BaseDev_addEventCallBack(PikaObj* self, Arg* eventCallBack) {
                           "platformGetEventId");
     }
     uint32_t eventId = obj_getInt(self, "eventId");
-    pika_eventListener_registEvent(g_pika_device_event_listener, eventId, self);
+    pika_eventListener_registEventCallback(g_pika_device_event_listener,
+                                           eventId, eventCallBack);
 #else
     obj_setErrorCode(self, 1);
     obj_setSysOut(self, "[error] PIKA_EVENT_ENABLE is disabled.");
 #endif
 }
 
+void PikaStdDevice_BaseDev_addEventCallBack(PikaObj* self, Arg* eventCallBack) {
+    pika_platform_printf("Warning: Method %s is deprecated, please use %s.\r\n",
+                         "addEventCallBack", "addEventCallback");
+    PikaStdDevice_BaseDev_addEventCallback(self, eventCallBack);
+}
+
 void PikaStdDevice_BaseDev_platformGetEventId(PikaObj* self) {
     ABSTRACT_METHOD_NEED_OVERRIDE_ERROR();
 }

package/PikaStdDevice/PikaStdDevice_GPIO.c

@@ -148,12 +148,12 @@ void PikaStdDevice_GPIO_platformRead(PikaObj* self) {
     obj_setInt(self, "readBuff", val);
 }
 
-void PikaStdDevice_GPIO_setCallBack(PikaObj* self,
+void PikaStdDevice_GPIO_setCallback(PikaObj* self,
                                     Arg* eventCallback,
                                     int filter) {
 #if PIKA_EVENT_ENABLE
     pika_dev* dev = _get_dev(self);
-    _PikaStdDevice_setCallBack(self, eventCallback, (uintptr_t)dev);
+    _PikaStdDevice_setCallback(self, eventCallback, (uintptr_t)dev);
     /* regist event to pika_hal */
     pika_hal_GPIO_config cfg_cb = {0};
     cfg_cb.event_callback = (void*)_PikaStdDevice_event_handler;
@@ -166,6 +166,15 @@ void PikaStdDevice_GPIO_setCallBack(PikaObj* self,
 #endif
 }
 
+void PikaStdDevice_GPIO_setCallBack(PikaObj* self,
+                                    Arg* eventCallback,
+                                    int filter) {
+    pika_platform_printf(
+        "Warning: setCallBack is deprecated, use "
+        "setCallback instead.\r\n");
+    PikaStdDevice_GPIO_setCallback(self, eventCallback, filter);
+}
+
 void PikaStdDevice_GPIO_close(PikaObj* self) {
     pika_dev* dev = _get_dev(self);
     pika_hal_close(dev);

package/PikaStdDevice/PikaStdDevice_UART.c

@@ -205,12 +205,12 @@ void PikaStdDevice_UART_platformWriteBytes(PikaObj* self) {
     pika_hal_write(dev, data, len);
 }
 
-void PikaStdDevice_UART_setCallBack(PikaObj* self,
+void PikaStdDevice_UART_setCallback(PikaObj* self,
                                     Arg* eventCallBack,
                                     int filter) {
 #if PIKA_EVENT_ENABLE
     pika_dev* dev = _get_dev(self);
-    _PikaStdDevice_setCallBack(self, eventCallBack, (uintptr_t)dev);
+    _PikaStdDevice_setCallback(self, eventCallBack, (uintptr_t)dev);
     /* regist event to pika_hal */
     pika_hal_UART_config cfg_cb = {0};
     cfg_cb.event_callback = (void*)_PikaStdDevice_event_handler;
@@ -223,6 +223,14 @@ void PikaStdDevice_UART_setCallBack(PikaObj* self,
 #endif
 }
 
+void PikaStdDevice_UART_setCallBack(PikaObj* self,
+                                    Arg* eventCallBack,
+                                    int filter) {
+    pika_platform_printf(
+        "Warning: setCallBack is deprecated, use setCallback instead.\r\n");
+    PikaStdDevice_UART_setCallback(self, eventCallBack, filter);
+}
+
 void PikaStdDevice_UART_close(PikaObj* self) {
     pika_dev* dev = _get_dev(self);
     pika_hal_UART_config* cfg = (pika_hal_UART_config*)dev->ioctl_config;

package/PikaStdDevice/PikaStdDevice_common.c

@@ -6,11 +6,11 @@ void _PikaStdDevice_event_handler(pika_dev* dev, int signal) {
                                   signal);
 }
 
-void _PikaStdDevice_setCallBack(PikaObj* self,
+void _PikaStdDevice_setCallback(PikaObj* self,
                                 Arg* eventCallback,
                                 uint32_t eventId) {
-    obj_setEventCallBack(self, eventId, eventCallback,
-                         &g_pika_device_event_listener);
+    pika_eventListener_registEventCallback(g_pika_device_event_listener,
+                                           eventId, eventCallback);
 }
 
 extern volatile PikaObj* __pikaMain;

package/PikaStdDevice/PikaStdDevice_common.h

@@ -3,7 +3,7 @@
 #include "PikaObj.h"
 #include "PikaVM.h"
 #include "pika_hal.h"
-void _PikaStdDevice_setCallBack(PikaObj* self,
+void _PikaStdDevice_setCallback(PikaObj* self,
                                 Arg* eventCallback,
                                 uint32_t eventId);