stefan преди 3 години
родител
ревизия
ba03ac9b38
променени са 4 файла, в които са добавени 8 реда и са изтрити 5 реда
  1. 2 1
      .gitignore
  2. 2 2
      src/shellmatta.c
  3. 2 0
      test/unittest/shellmatta/test_shellmatta_doInit.cpp
  4. 2 2
      test/unittest/shellmatta_utils/test_utils_writeEcho.cpp

+ 2 - 1
.gitignore

@@ -1,2 +1,3 @@
 output
-output
+.cache
+compile_commands.json

+ 2 - 2
src/shellmatta.c

@@ -409,7 +409,7 @@ shellmatta_retCode_t shellmatta_processData(shellmatta_handle_t     handle,
                     break;
 
                 case STATE_GET_PACKET_TYPE:
-                    packetType = data[headerCounter];
+                    packetType = (shellmatta_transport_packet_t)data[headerCounter];
                     break;
 
                 case STATE_GET_PAYLOAD_LENGTH:
@@ -455,7 +455,7 @@ shellmatta_retCode_t shellmatta_processData(shellmatta_handle_t     handle,
                 if (SHELLMATTA_ERROR == ret)
                 {
                     shellmatta_reset_transport();
-                    utils_writeEcho(handle, "crc error\r\n", 11);
+                    utils_writeEcho(inst, "crc error\r\n", 11);
                     utils_terminateInput(inst);
                     return SHELLMATTA_OK;
                 }

+ 2 - 0
test/unittest/shellmatta/test_shellmatta_doInit.cpp

@@ -1,5 +1,7 @@
 #include "test/framework/catch.hpp"
 #include "src/shellmatta.c"
+#include "src/shellmatta_transport.c"
+#include "src/shellmatta_crc.c"
 #include <string.h>
 
 TEST_CASE( "shellmatta dummy" ) {

+ 2 - 2
test/unittest/shellmatta_utils/test_utils_writeEcho.cpp

@@ -18,7 +18,7 @@ TEST_CASE( "shellmatta_writeEcho echo enabled" ) {
 
     shellmatta_instance_t inst;
     char buffer[20];
-    char dummyData[29];
+    char dummyData[29] = "asd";
 
     inst.buffer = buffer;
     inst.bufferSize = 20;
@@ -43,7 +43,7 @@ TEST_CASE( "shellmatta_writeEcho echo disabled" ) {
 
     shellmatta_instance_t inst;
     char buffer[20];
-    char dummyData[29];
+    char dummyData[29] = "asd";
 
     inst.buffer = buffer;
     inst.bufferSize = 20;