diff --git a/src/omv/imlib/imlib.h b/src/omv/imlib/imlib.h index 76af9f348..c8ee39075 100644 --- a/src/omv/imlib/imlib.h +++ b/src/omv/imlib/imlib.h @@ -375,6 +375,16 @@ extern const uint16_t ironbow_table[256]; // Image Stuff // ///////////////// +typedef enum { + PIXFORMAT_INVALID = 0, + PIXFORMAT_BINARY, // 1BPP/BINARY + PIXFORMAT_GRAYSCALE, // 1BPP/GRAYSCALE + PIXFORMAT_RGB565, // 2BPP/RGB565 + PIXFORMAT_YUV422, // 2BPP/YUV422 + PIXFORMAT_BAYER, // 1BPP/RAW + PIXFORMAT_JPEG, // JPEG/COMPRESSED +} pixformat_t; + typedef enum image_bpp { IMAGE_BPP_BINARY, // BPP = 0 diff --git a/src/omv/modules/py_gif.c b/src/omv/modules/py_gif.c index 8c00b38f5..bbc5e75a0 100644 --- a/src/omv/modules/py_gif.c +++ b/src/omv/modules/py_gif.c @@ -13,7 +13,7 @@ #include "ff_wrapper.h" #include "framebuffer.h" -#include "sensor.h" +#include "imlib.h" #include "py_assert.h" #include "py_helper.h" #include "py_image.h" diff --git a/src/omv/modules/py_image.c b/src/omv/modules/py_image.c index 880876350..6ea21a471 100644 --- a/src/omv/modules/py_image.c +++ b/src/omv/modules/py_image.c @@ -23,7 +23,6 @@ #include "imlib.h" #include "array.h" -#include "sensor.h" #include "ff_wrapper.h" #include "xalloc.h" #include "fb_alloc.h" diff --git a/src/omv/modules/py_mjpeg.c b/src/omv/modules/py_mjpeg.c index d8e6d8aa2..b22b20ce3 100644 --- a/src/omv/modules/py_mjpeg.c +++ b/src/omv/modules/py_mjpeg.c @@ -12,7 +12,6 @@ #include "py/nlr.h" #include "ff_wrapper.h" #include "framebuffer.h" -#include "sensor.h" #include "py_assert.h" #include "py_helper.h" #include "py_image.h" diff --git a/src/omv/ports/stm32/sensor.h b/src/omv/ports/stm32/sensor.h index 6f627cb8a..119c12420 100644 --- a/src/omv/ports/stm32/sensor.h +++ b/src/omv/ports/stm32/sensor.h @@ -36,16 +36,6 @@ #define LEPTON_ID (0x54) #define HM01B0_ID (0xB0) -typedef enum { - PIXFORMAT_INVALID = 0, - PIXFORMAT_BINARY, // 1BPP/BINARY - PIXFORMAT_GRAYSCALE, // 1BPP/GRAYSCALE - PIXFORMAT_RGB565, // 2BPP/RGB565 - PIXFORMAT_YUV422, // 2BPP/YUV422 - PIXFORMAT_BAYER, // 1BPP/RAW - PIXFORMAT_JPEG, // JPEG/COMPRESSED -} pixformat_t; - typedef enum { FRAMESIZE_INVALID = 0, // C/SIF Resolutions