v3.0

README.md

@@ -15,6 +15,9 @@ V2.0
 v2.1
     1.修改手柄回流和预充满管路按键    
 
+V2.2
+    1.fix some bug
+
 ```
 
 ```

app/src/acid_dispenser_ble_slave_main.c

@@ -152,6 +152,22 @@ void process_offline_broadcast(app_event_t* event, uint16_t event_size) {  //
     return;
   }
 }
+void sendKeyEvent(keyid_t keyid, app_event_type_t event) {
+  if (keyid == keyid_addliquid) {
+    if (event == kappevent_key_pressed) {
+      send_report_key_event(hand_acid_remoter_kevent_add_liquid);
+    } else if (event == kappevent_key_long_pressed) {
+      send_report_key_event(hand_acid_remoter_kevent_change_next_mode);
+    }
+  } else if (keyid == keyid_reflux) {
+    if (event == kappevent_key_pressed) {
+      send_report_key_event(hand_acid_remoter_kevent_preFilling);
+    } else if (event == kappevent_key_pressed_double) {
+      send_report_key_event(hand_acid_remoter_kevent_reflux);
+    }
+  }
+  return;
+}
 void process_online_workstate(app_event_t* event, uint16_t event_size) {  //
   app_event_type_t eventType = event->eventType;
   if (eventType == kappevent_state_machine_state_enter) {
@@ -181,24 +197,10 @@ void process_online_workstate(app_event_t* event, uint16_t event_size) {  //
   // hand_acid_remoter_kevent_reflux           = 2,  //
   // hand_acid_remoter_kevent_preFilling       = 3,  //
   if (eventType == kappevent_key_pressed || eventType == kappevent_key_pressed_double || eventType == kappevent_key_long_pressed) {
-    int keyid = 0;
-    keyid     = event->val.keyid;
-    if (keyid == keyid_addliquid) {
-      if (eventType == kappevent_key_pressed) {
-        send_report_key_event(hand_acid_remoter_kevent_add_liquid);
-      } else if (eventType == kappevent_key_long_pressed) {
-        send_report_key_event(hand_acid_remoter_kevent_change_next_mode);
-      }
-    } else if (keyid == keyid_reflux) {
-      if (eventType == kappevent_key_pressed) {
-        send_report_key_event(hand_acid_remoter_kevent_reflux);
-      } else if (eventType == kappevent_key_pressed_double) {
-        send_report_key_event(hand_acid_remoter_kevent_preFilling);
-      }
-    }
-    return;
+    sendKeyEvent(event->val.keyid, eventType);
   }
 }
+
 void process_online_standy(app_event_t* event, uint16_t event_size) {  //
   app_event_type_t eventType = event->eventType;
   if (eventType == kappevent_state_machine_state_enter) {
@@ -232,22 +234,7 @@ void process_online_standy(app_event_t* event, uint16_t event_size) {  //
   }
 
   if (eventType == kappevent_key_pressed || eventType == kappevent_key_pressed_double || eventType == kappevent_key_long_pressed) {
-    int keyid = 0;
-    keyid     = event->val.keyid;
-    if (keyid == keyid_addliquid) {
-      if (eventType == kappevent_key_pressed) {
-        send_report_key_event(hand_acid_remoter_kevent_add_liquid);
-      } else if (eventType == kappevent_key_long_pressed) {
-        send_report_key_event(hand_acid_remoter_kevent_change_next_mode);
-      }
-    } else if (keyid == keyid_reflux) {
-      if (eventType == kappevent_key_pressed) {
-        send_report_key_event(hand_acid_remoter_kevent_preFilling);
-      } else if (eventType == kappevent_key_pressed_double) {
-        send_report_key_event(hand_acid_remoter_kevent_reflux);
-      }
-    }
-    return;
+    sendKeyEvent(event->val.keyid, eventType);
   }
 }
 

app/src/aproject_config/config.h

@@ -3,7 +3,7 @@
 #define CATEGORY          "AciDisp"  //
 #define MANUFACTURER_NAME "iflytop"
 
-#define FIRMWARE_VERSION   (3)
+#define FIRMWARE_VERSION   (4)
 #define BLESTACK_VERSION   (1)
 #define BOOTLOADER_VERSION (1)
 #define HARDWARE_VERSION   (1)