feat: himax we-1 support (wip) (#3)

* chore: cleanup * feat: himax we-1 support (wip) * chore: bug fixes * chore/fix: add missing headers, cleanup * fix: avoid using C99 style initializer * fix: compile issue with stdio * fix: add missing stddef header * chore: eliminate explicit use of local * fix: remove port config * fix: add missing stdarg * refactor: rename el_misc_esp * fix: stop stream logic * chore/fix: temporarily comment out stdio/stdarg due to compile error on arc compiler
Seeed-Studio · Oct 7, 2023 · 18a74e1 · 18a74e1
1 parent e07e0f4
commit 18a74e1
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/core/data/el_data_storage.hpp b/core/data/el_data_storage.hpp
@@ -43,9 +43,9 @@
 #include "core/synchronize/el_mutex.hpp"
 
 #ifdef CONFIG_EL_LIB_FLASHDB
-
+extern "C" {
     #include "third_party/FlashDB/flashdb.h"
-
+}
 namespace edgelab {
 
 namespace types {

diff --git a/core/el_config.h b/core/el_config.h
@@ -26,7 +26,5 @@
 #ifndef _EL_CONFIG_H_
 #define _EL_CONFIG_H_
 
-#define CONFIG_EL_TARGET_ESPPRESSIF
-#define CONFIG_EL_BOARD_SEEED_XIAO_ESP32S3
 
 #endif
diff --git a/porting/espressif/el_misc.cpp → porting/espressif/el_misc_esp.cpp b/porting/espressif/el_misc.cpp → porting/espressif/el_misc_esp.cpp
@@ -55,7 +55,11 @@ EL_ATTR_WEAK int el_printf(const char* fmt, ...) {
 
 EL_ATTR_WEAK int el_putchar(char c) { return putchar(c); }
 
-EL_ATTR_WEAK void* el_malloc(size_t size) { return malloc(size); }
+EL_ATTR_WEAK void* el_malloc(size_t size) {
+    static uint8_t tensor_arena[450 * 1024] __attribute__((aligned(16)));
+
+    return reinterpret_cast<void*>(tensor_arena);
+}
 
 EL_ATTR_WEAK void* el_calloc(size_t nmemb, size_t size) { return calloc(nmemb, size); }
 

diff --git a/porting/espressif/el_serial_esp.cpp b/porting/espressif/el_serial_esp.cpp
@@ -27,7 +27,7 @@
 
 #include <driver/usb_serial_jtag.h>
 
-#include <locale>
+#include <cctype>
 
 #include "core/el_debug.h"
 #include "core/el_types.h"

diff --git a/porting/himax/el_camera_himax.cpp b/porting/himax/el_camera_himax.cpp
@@ -64,7 +64,7 @@ el_err_code_t CameraHimax::start_stream() {
 }
 
 el_err_code_t CameraHimax::stop_stream() {
-    camera_deinit();
+    datapath_stop_work();
     this->_is_streaming = false;
     return EL_OK;
 }

diff --git a/porting/himax/el_serial_himax.cpp b/porting/himax/el_serial_himax.cpp
@@ -25,7 +25,7 @@
 
 #include "el_serial_himax.h"
 
-#include <locale>
+#include <cctype>
 
 #include "core/el_debug.h"
 #include "core/el_types.h"

diff --git a/sscma/interpreter/utility.hpp b/sscma/interpreter/utility.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <locale>
+#include <cctype>
 
 #include "sscma/interpreter/types.hpp"
 

diff --git a/third_party/FlashDB/fal_def.h b/third_party/FlashDB/fal_def.h
@@ -12,7 +12,9 @@
 #define _FAL_DEF_H_
 
 #include <stdint.h>
-#include <stdio.h>
+// #include <stdio.h>
+// #include <stdarg.h>
+#include <stddef.h>
 #ifdef FDB_USING_NATIVE_ASSERT
 #include <assert.h>
 #endif
@@ -123,7 +125,7 @@ struct fal_flash_dev
         int (*erase)(long offset, size_t size);
     } ops;
 
-    /* write minimum granularity, unit: bit. 
+    /* write minimum granularity, unit: bit.
        1(nor flash)/ 8(stm32f2/f4)/ 32(stm32f1)/ 64(stm32l4)
        0 will not take effect. */
     size_t write_gran;