v0.3

app/src/app_ble_service.c

@@ -146,10 +146,11 @@ void prvf_report_sample_data(uint32_t frameIndex, one_frame_data_t* data, int32_
  *******************************************************************************/
 
 static int      m_upload_fd;
-static uint8_t  m_datacache[256];
+static uint8_t  m_datacache[360];
 static int      m_remaindatalen            = 0;
 static uint32_t m_report_data_sumcheckcode = 0;
 static bool     m_isupload_data_state      = false;
+static uint32_t m_upload_cnt               = 0;
 
 void RecordUpload_report_finish_event(uint32_t sumcheckcode) {
   ify_hrs_packet_t* txheader = (ify_hrs_packet_t*)m_txbuf;
@@ -201,12 +202,12 @@ static void RecordUpload_tmr_cb(void* p_context) {  //
   }
 
   int32_t mtusize = zble_module_get_mtu_size();
-  mtusize         = mtusize < 128 ? mtusize : 128;
+  mtusize         = mtusize < 180 ? mtusize : 180;
 
   uint8_t* data = m_datacache + (sizeof(m_datacache) - m_remaindatalen);
   int      len  = m_remaindatalen > mtusize ? mtusize : m_remaindatalen;
 
-  ZLOGI("upload %d %d %d", len, m_remaindatalen, mtusize);
+  // ZLOGI("upload %d %d %d", len, m_remaindatalen, mtusize);
   if (!zdatachannel_is_connected()) {
     ZLOGI("ble is disconnected,stop upload");
     RecordUpload_ble_stop_upload_record();
@@ -233,12 +234,15 @@ static void RecordUpload_tmr_cb(void* p_context) {  //
     m_report_data_sumcheckcode += data[i];
   }
   m_remaindatalen -= len;
+  m_upload_cnt += len;
+  ZLOGI("has_upload %d %d", m_upload_cnt, len);
 }
 
 int RecordUpload_start(sample_data_filename_t* recordid) {
   //
   // Æô¶¯
   //
+  m_upload_cnt = 0;
   SampleDataMgr_changeToLocalMode();
 
   m_upload_fd = SampleDataMgr_open(recordid, kwrflag_read_only);

app/src/basic/version.h

@@ -2,7 +2,7 @@
 #define CATEGORY "M1002" // Èýµ¼Áª
 #define MANUFACTURER_NAME "iflytop"
 
-#define FIRMWARE_VERSION 0x0002
+#define FIRMWARE_VERSION 0x0003
 #define BLESTACK_VERSION 1
 #define BOOTLOADER_VERSION 1
 #define HARDWARE_VERSION (1)

dynamic_electrocardiograph_ble_server

@@ -1 +1 @@
-Subproject commit 03eb63bb18a16f04fb2aedab5a9c955d66ac7b96
+Subproject commit d76e1d1de74faaca531d54fb588d229a1090d3eb

tools/build.bat

@@ -1 +1,2 @@
-g++ -static -static-libgcc -static-libstdc++  -lwsock32 -lstdc++ .\sample_bin_parse.cpp -o sample_bin_parse.exe
+g++ -static -static-libgcc -static-libstdc++  -lwsock32 -lstdc++ .\sample_bin_parse.cpp -o sample_bin_parse.exe
+g++ -static -static-libgcc -static-libstdc++  -lwsock32 -lstdc++ text2bin.cpp -o text2bin.exe

tools/text2bin.cpp

@@ -0,0 +1,54 @@
+
+#include <fstream>
+#include <functional>
+#include <iostream>
+#include <list>
+#include <map>
+#include <memory>
+#include <set>
+#include <sstream>
+#include <string>
+#include <thread>
+#include <vector>
+//
+#include <winsock2.h>
+//
+#include <Windows.h>
+//
+#include <stdio.h>
+
+#pragma comment(lib, "ws2_32.lib")
+#define PORT 8988
+
+int main(int argc, char *argv[]) {
+  /**
+   * @brief
+   * 打开raw.txt
+   * 读取raw.txt全部内容
+   * 去掉换行，空格，回车
+   * 将16进制字符串转换成二进制
+   * 写入raw.bin
+   */
+
+  std::ifstream ifs("raw.txt");
+  std::string   str((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
+  ifs.close();
+
+  std::string str2;
+  for (auto &c : str) {
+    if (c == ' ' || c == '\n' || c == '\r') {
+      continue;
+    }
+    str2.push_back(c);
+  }
+
+  std::ofstream ofs("raw.bin", std::ios::binary);
+  for (size_t i = 0; i < str2.size(); i += 2) {
+    std::string str3 = str2.substr(i, 2);
+    char        c    = (char)std::stoi(str3, nullptr, 16);
+    ofs.write(&c, 1);
+  }
+  ofs.close();
+
+  return 0;
+}