Merge to develop candidate

Author: cnadler86

src/micropython.cmake

@@ -6,7 +6,6 @@ add_library(usermod_mp_camera INTERFACE)
 target_sources(usermod_mp_camera INTERFACE
     ${CMAKE_CURRENT_LIST_DIR}/modcamera.c
     ${CMAKE_CURRENT_LIST_DIR}/modcamera_api.c
-    ${CMAKE_CURRENT_LIST_DIR}/mod_img_convertes.c
 )
 
 target_include_directories(usermod_mp_camera INTERFACE

src/micropython.mk

@@ -1,5 +1,4 @@
 CAMERA_MOD_DIR := $(USERMOD_DIR)
 SRC_USERMOD_C += $(addprefix $(CAMERA_MOD_DIR)/, modcamera_api.c)
-SRC_USERMOD_C += $(addprefix $(CAMERA_MOD_DIR)/, mod_img_convertes.c)
 SRC_USERMOD_LIB_C += $(addprefix $(CAMERA_MOD_DIR)/, modcamera.c)
 CFLAGS_USERMOD += -I$(CAMERA_MOD_DIR)

src/mod_img_convertes.c

@@ -73,8 +73,8 @@ static void raise_micropython_error_from_esp_err(esp_err_t err) {
             break;
 
         default:
-            mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("Unknown error 0x%04x"), err);
-            // mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("Unknown error"));
+            // mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("Unknown error 0x%04x"), err);
+            mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("Unknown error"));
             break;
     }
 }
@@ -90,9 +90,13 @@ static inline int get_mapped_jpeg_quality(int8_t quality) {
     return map(quality, 0, 100, 63, 0);
 }
 
-// static bool validate_pixel_format(mp_camera_obj_t *self, mp_camera_pixformat_t pixel_format) {
-
-// }
+static bool validate_pixel_format(mp_camera_obj_t *self, mp_camera_pixformat_t pixel_format) {
+    const char *Name = mp_camera_hal_get_sensor_name(self)
+    if (strcmp(Name, "OV2640")) {
+        if (self->camera_config.pixel_format != PIXFORMAT_RGB565) /
+        && self->camera_config.pixel_format
+    }
+}
 
 // Camera HAL Funcitons
 void mp_camera_hal_construct(