From ebd15f4cd61f5e2b84f585fd31bbb5cdf1c12bae Mon Sep 17 00:00:00 2001 From: LynnL4 Date: Tue, 5 Nov 2024 11:04:26 +0000 Subject: [PATCH] chore: rename grove_vision_ai_we2 to grove_vision_ai_v2 --- .../{grove_vision_ai_we2 => grove_vision_ai_v2}/board.h | 4 ++-- porting/himax/we2/el_camera_we2.cpp | 4 ++-- porting/himax/we2/el_config_porting.h | 4 ++-- porting/himax/we2/el_device_we2.cpp | 4 ++-- porting/himax/we2/el_extfs_we2.cpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename porting/himax/we2/boards/{grove_vision_ai_we2 => grove_vision_ai_v2}/board.h (97%) diff --git a/porting/himax/we2/boards/grove_vision_ai_we2/board.h b/porting/himax/we2/boards/grove_vision_ai_v2/board.h similarity index 97% rename from porting/himax/we2/boards/grove_vision_ai_we2/board.h rename to porting/himax/we2/boards/grove_vision_ai_v2/board.h index b32a175d..df52784f 100644 --- a/porting/himax/we2/boards/grove_vision_ai_we2/board.h +++ b/porting/himax/we2/boards/grove_vision_ai_v2/board.h @@ -23,8 +23,8 @@ * */ -#ifndef _BOARD_GROVE_VISION_AI_WE2_H_ -#define _BOARD_GROVE_VISION_AI_WE2_H_ +#ifndef _BOARD_GROVE_VISION_AI_V2_H_ +#define _BOARD_GROVE_VISION_AI_V2_H_ #define PRODUCT_NAME_PREFIX "grove_vision_ai" #define PRODUCT_NAME_SUFFIX "v2" diff --git a/porting/himax/we2/el_camera_we2.cpp b/porting/himax/we2/el_camera_we2.cpp index 65185d88..e59232b6 100644 --- a/porting/himax/we2/el_camera_we2.cpp +++ b/porting/himax/we2/el_camera_we2.cpp @@ -63,7 +63,7 @@ CameraWE2::CameraWE2() : Camera(0b00001111) { } } } -#elif defined(CONFIG_EL_BOARD_GROVE_VISION_AI_WE2) +#elif defined(CONFIG_EL_BOARD_GROVE_VISION_AI_V2) CameraWE2::CameraWE2() : Camera(0b00000111) {} #else #error "Camera moudle does not find supported board." @@ -134,7 +134,7 @@ el_err_code_t CameraWE2::init(SensorOptIdType opt_id) { default: ret = EL_EINVAL; } -#elif defined(CONFIG_EL_BOARD_GROVE_VISION_AI_WE2) +#elif defined(CONFIG_EL_BOARD_GROVE_VISION_AI_V2) switch (opt_id & 0x0FFF) { case 0: ret = _drv_cam_init(240, 240); diff --git a/porting/himax/we2/el_config_porting.h b/porting/himax/we2/el_config_porting.h index e6467dcf..0f3e0218 100644 --- a/porting/himax/we2/el_config_porting.h +++ b/porting/himax/we2/el_config_porting.h @@ -35,8 +35,8 @@ #ifndef CONFIG_EL_TARGET_HIMAX #error "Please specify porting target" #else - #if defined(CONFIG_EL_BOARD_GROVE_VISION_AI_WE2) - #include "boards/grove_vision_ai_we2/board.h" + #if defined(CONFIG_EL_BOARD_GROVE_VISION_AI_V2) + #include "boards/grove_vision_ai_v2/board.h" #elif defined(CONFIG_EL_BOARD_SENSECAP_WATCHER) #include "boards/sensecap_watcher/board.h" #else diff --git a/porting/himax/we2/el_device_we2.cpp b/porting/himax/we2/el_device_we2.cpp index f44c30d1..8a8985d7 100644 --- a/porting/himax/we2/el_device_we2.cpp +++ b/porting/himax/we2/el_device_we2.cpp @@ -166,13 +166,13 @@ void DeviceWE2::init() { this->_network = nullptr; -#ifndef CONFIG_EL_BOARD_SENSECAP_WATCHER +#ifdef CONFIG_EL_BOARD_SENSECAP_WATCHER static sspiWE2 spi{}; spi.type = EL_TRANSPORT_SPI; this->_transports.emplace_front(&spi); #endif -#ifdef CONFIG_EL_BOARD_GROVE_VISION_AI_WE2 +#ifdef CONFIG_EL_BOARD_GROVE_VISION_AI_V2 static Serial2WE2 serial2{}; serial2.type = EL_TRANSPORT_UART; this->_transports.emplace_front(&serial2); diff --git a/porting/himax/we2/el_extfs_we2.cpp b/porting/himax/we2/el_extfs_we2.cpp index 9dfa1fee..21ad5186 100644 --- a/porting/himax/we2/el_extfs_we2.cpp +++ b/porting/himax/we2/el_extfs_we2.cpp @@ -242,7 +242,7 @@ FileStatus ExtfsWE2::open(const char* path, int mode) { } Extfs* Extfs::get_ptr() { -#ifdef CONFIG_EL_BOARD_GROVE_VISION_AI_WE2 +#ifdef CONFIG_EL_BOARD_GROVE_VISION_AI_V2 static ExtfsWE2 extfs{}; return &extfs; #else