Use static alloc heatshrink encoder

They don't mix well if compiled both into one static library.

Author: rovo89

ext/heatshrink/CMakeLists.txt

@@ -9,6 +9,12 @@ add_library(heatshrink STATIC
     ${heatshrink_SOURCE_DIR}/src/heatshrink_encoder.c
 )
 
+target_compile_definitions(heatshrink PUBLIC
+    HEATSHRINK_DYNAMIC_ALLOC=0
+    HEATSHRINK_STATIC_WINDOW_BITS=9
+    HEATSHRINK_STATIC_LOOKAHEAD_BITS=5
+)
+
 target_include_directories(heatshrink
     PUBLIC
         ${heatshrink_SOURCE_DIR}/include

libxbot-service-interface/src/HeatshrinkEncode.cpp

@@ -5,24 +5,25 @@ extern "C" {
 }
 
 std::vector<uint8_t> HeatshrinkEncode(uint8_t *data, const size_t size) {
-  heatshrink_encoder *encoder = heatshrink_encoder_alloc(8, 4);
+  heatshrink_encoder encoder;
   std::vector<uint8_t> out;
   uint8_t buf[128];
   size_t processed = 0, processed_now, polled_now;
   HSE_poll_res poll_res;
 
+  heatshrink_encoder_reset(&encoder);
   while (processed < size) {
-    heatshrink_encoder_sink(encoder, &data[processed], size - processed, &processed_now);
+    heatshrink_encoder_sink(&encoder, &data[processed], size - processed, &processed_now);
     processed += processed_now;
 
     do {
-      poll_res = heatshrink_encoder_poll(encoder, buf, sizeof(buf), &polled_now);
+      poll_res = heatshrink_encoder_poll(&encoder, buf, sizeof(buf), &polled_now);
       out.insert(out.end(), buf, buf + polled_now);
     } while (poll_res == HSER_POLL_MORE);
   }
 
-  while (heatshrink_encoder_finish(encoder) == HSER_FINISH_MORE) {
-    heatshrink_encoder_poll(encoder, buf, sizeof(buf), &polled_now);
+  while (heatshrink_encoder_finish(&encoder) == HSER_FINISH_MORE) {
+    heatshrink_encoder_poll(&encoder, buf, sizeof(buf), &polled_now);
     out.insert(out.end(), buf, buf + polled_now);
   }
 

libxbot-service/CMakeLists.txt

@@ -18,7 +18,6 @@ add_library(xbot-service STATIC
         src/DataSource.cpp
 )
 target_compile_options(xbot-service PRIVATE -Wall -Wextra -Werror -Wno-volatile)
-target_compile_definitions(heatshrink PUBLIC HEATSHRINK_DYNAMIC_ALLOC=0)
 
 if (NOT DEFINED XBOT_CUSTOM_PORT_PATH)
     SET(XBOT_CUSTOM_PORT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/portable/linux)