Merge pull request #16 from HarvestX/feat/update_api

add init_packet_<type>_pub

Author: Ar-Ray-code

.github/workflows/ci_humble.yml

@@ -32,4 +32,6 @@ jobs:
           import-token: ${{ secrets.H6X_REPO_TOKEN }}
           vcs-repo-file-url: build_depends.repos
           package-name: |
-            h6x_dynamic_packet_handler
+            h6x_dynamic_packet_handler
+            h6x_dynamic_packet_tools
+            h6x_dynamic_serial_port_handler

example/m5core2/include/command_handler.hpp

@@ -250,4 +250,4 @@ void command_handler(const uint8_t & command, Packet & s_pkt)
 
 }
 
-#endif
+#endif

example/m5core2/include/serial_handler.hpp

@@ -62,7 +62,7 @@ bool serial_read(Packet & pkt, const uint8_t mode, const uint8_t own_id)
 
     if (read_data_len == data_len) {break;}
   }
-  if(!packet_division(&pkt, data, read_data_len)){
+  if (!packet_division(&pkt, data, read_data_len)) {
     M5.Lcd.setCursor(0, 100);
     M5.Lcd.printf("Packet division error\n");
   }
@@ -114,4 +114,4 @@ bool serial_write(Packet & pkt)
   M5.Lcd.println();
 }
 
-#endif // SERIAL_HANDLER_HPP
+#endif // SERIAL_HANDLER_HPP

example/m5core2/primary/main.cpp

@@ -58,10 +58,7 @@ void drawMenu(int highlightIndex = -1)
 
 void sendSelectedCommand()
 {
-  pkt_send = init_packet();
-  pkt_send.client_id = 0x01; // M5Core2 ID
-  pkt_send.mode = SERIAL_MODE_HOST;
-  pkt_send.command = return_values[selected_index];
+  pkt_send = init_packet_server_pub(0x01, return_values[selected_index]);
   if (pkt_send.command == 0x03) {
     pkt_send.data[0] = (selected_index == 3) ? 0x05 : 0x01;
     pkt_send.data_len = 1;
@@ -128,4 +125,4 @@ void loop()
   }
 
   delay(20);
-}
+}

example/m5core2/secondary/main.cpp

@@ -34,9 +34,7 @@ void loop()
       M5.Lcd.printf("Failed read\n");
       return;
     }
-    pkt_send = init_packet();
-    pkt_send.client_id = ONW_ID;  // Set client_id here
-    pkt_send.mode = SERIAL_MODE_CLIENT; // Set mode to CLIENT
+    pkt_send = init_packet_client_pub(ONW_ID, ERR_SUCCESS);
     command_handler(pkt_recv.command, pkt_send);
     pkt_send.start_tick = pkt_recv.start_tick;
     pkt_send.elapsed_tick = millis() - pkt_recv.start_tick;
@@ -47,4 +45,4 @@ void loop()
     }
   }
   delay(10);   // ~100Hz loop
-}
+}

h6x_dynamic_packet_handler/include/h6x_dynamic_packet_handler/h6x_dynamic_packet_big_endian.h

@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Note: This header is kept for compatibility reasons.
+// Use `Ar-Ray-code/h6xserial_idl` instead.
+
 #ifndef H6X_DYNAMIC_PACKET_HANDLER__H6X_DYNAMIC_PACKET_BIG_ENDIAN_HPP
 #define H6X_DYNAMIC_PACKET_HANDLER__H6X_DYNAMIC_PACKET_BIG_ENDIAN_HPP
 

h6x_dynamic_packet_handler/include/h6x_dynamic_packet_handler/h6x_dynamic_packet_definitions_base.h

@@ -55,6 +55,10 @@ typedef struct Packet
 
 Packet init_packet();
 
+Packet init_packet_server_pub(const uint8_t client_id, const uint8_t command);
+Packet init_packet_client_pub(const uint8_t own_id, const uint8_t status);
+
+
 // === COMMAND DEFINITIONS ===
 typedef enum
 {

h6x_dynamic_packet_handler/include/h6x_dynamic_packet_handler/h6x_dynamic_packet_handler.h

@@ -42,9 +42,9 @@ bool check_crc(const Packet * pkt);
 
 bool create_packet(const Packet * pkt, char * send_packet);
 
-Packet get_received_packet(const char * input, const int32_t input_len, const uint8_t client_id);
+uint16_t get_total_packet_length(const Packet * packet);
 
-int32_t process_msg(const char * input, int32_t input_len, char * output, int32_t output_max_len);
+Packet get_received_packet(const char * input, const int32_t input_len, const uint8_t client_id);
 
 #ifdef __cplusplus
 }

h6x_dynamic_packet_handler/src/h6x_dynamic_packet_definitions_base.c

@@ -24,3 +24,21 @@ Packet init_packet()
   pkt.is_valid = true;
   return pkt;
 }
+
+Packet init_packet_server_pub(const uint8_t client_id, const uint8_t command)
+{
+  Packet pkt = init_packet();
+  pkt.mode = SERIAL_MODE_HOST;
+  pkt.client_id = client_id;
+  pkt.command = command;
+  return pkt;
+}
+
+Packet init_packet_client_pub(const uint8_t own_id, const uint8_t status)
+{
+  Packet pkt = init_packet();
+  pkt.mode = SERIAL_MODE_CLIENT;
+  pkt.client_id = own_id;
+  pkt.status = status;
+  return pkt;
+}

h6x_dynamic_packet_handler/src/h6x_dynamic_packet_handler.c

@@ -122,6 +122,10 @@ Packet get_received_packet(const char * input, const int32_t input_len, const ui
   return r_pkt;
 }
 
+uint16_t get_total_packet_length(const Packet * packet)
+{
+  return (uint16_t)(packet->data_len + ADDITIONAL_PACKET_LENGTH);
+}
 
 uint8_t get_serial_data(char * input_buf, const int max_len, serial_getchar_fn_t getchar_fn)
 {