diff --git a/src/omv/common/sensor.h b/src/omv/common/sensor.h index a3f0695bd..033512c87 100644 --- a/src/omv/common/sensor.h +++ b/src/omv/common/sensor.h @@ -146,7 +146,7 @@ typedef enum { #define SENSOR_HW_FLAGS_PIXCK (2) // pixel clock edge. #define SENSOR_HW_FLAGS_FSYNC (3) // hardware frame sync. #define SENSOR_HW_FLAGS_JPEGE (4) // hardware JPEG encoder. -#define SWNSOR_HW_FLAGS_RGB565_REV (5) // byte reverse rgb565. +#define SENSOR_HW_FLAGS_RGB565_REV (5) // byte reverse rgb565. #define SENSOR_HW_FLAGS_GET(s, x) ((s)->hw_flags & (1<hw_flags |= (v<hw_flags &= ~(1<bpp = 2; - if (SENSOR_HW_FLAGS_GET(sensor, SWNSOR_HW_FLAGS_RGB565_REV)) { + if (SENSOR_HW_FLAGS_GET(sensor, SENSOR_HW_FLAGS_RGB565_REV)) { unaligned_memcpy_rev16(buffer->data, buffer->data, _width*_height); } break; diff --git a/src/omv/ports/stm32/sensor.c b/src/omv/ports/stm32/sensor.c index 713f8f214..44ed7c9fa 100644 --- a/src/omv/ports/stm32/sensor.c +++ b/src/omv/ports/stm32/sensor.c @@ -1462,7 +1462,7 @@ void DCMI_DMAConvCpltUser(uint32_t addr) #if (OMV_ENABLE_SENSOR_MDMA == 1) mdma_memcpy(buffer, dst16, src16, sizeof(uint16_t), sensor.transpose); #else - if (SENSOR_HW_FLAGS_GET(&sensor, SWNSOR_HW_FLAGS_RGB565_REV)) { + if (SENSOR_HW_FLAGS_GET(&sensor, SENSOR_HW_FLAGS_RGB565_REV)) { if (!sensor.transpose) { unaligned_memcpy_rev16(dst16, src16, MAIN_FB()->u); } else { @@ -1503,7 +1503,7 @@ static void mdma_config(MDMA_InitTypeDef *init, sensor_t *sensor, uint32_t bytes init->SourceBlockAddressOffset = 0; init->DestBlockAddressOffset = 0; - if ((sensor->pixformat == PIXFORMAT_RGB565) && SENSOR_HW_FLAGS_GET(sensor, SWNSOR_HW_FLAGS_RGB565_REV)) { + if ((sensor->pixformat == PIXFORMAT_RGB565) && SENSOR_HW_FLAGS_GET(sensor, SENSOR_HW_FLAGS_RGB565_REV)) { init->Endianness = MDMA_LITTLE_BYTE_ENDIANNESS_EXCHANGE; } else { init->Endianness = MDMA_LITTLE_ENDIANNESS_PRESERVE; diff --git a/src/omv/sensors/gc2145.c b/src/omv/sensors/gc2145.c index 49e7397b8..4fb00de93 100644 --- a/src/omv/sensors/gc2145.c +++ b/src/omv/sensors/gc2145.c @@ -805,7 +805,7 @@ int gc2145_init(sensor_t *sensor) SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_PIXCK, 1); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_FSYNC, 0); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_JPEGE, 0); - SENSOR_HW_FLAGS_SET(sensor, SWNSOR_HW_FLAGS_RGB565_REV, 1); + SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_RGB565_REV, 1); return 0; } diff --git a/src/omv/sensors/mt9m114.c b/src/omv/sensors/mt9m114.c index c9babce41..5e050b52c 100644 --- a/src/omv/sensors/mt9m114.c +++ b/src/omv/sensors/mt9m114.c @@ -55,14 +55,14 @@ #define REG_SYSMGR_NEXT_STATE (0xDC00) #define REG_SYSMGR_CURRENT_STATE (0xDC01) #define REG_SYSMGR_CMD_STATUS (0xDC02) -#define SS_ENTER_CONFIG_CHANGE ( 0x28) -#define SS_STREAMING ( 0x31) -#define SS_START_STREAMING ( 0x34) -#define SS_ENTER_SUSPEND ( 0x40) -#define SS_SUSPENDED ( 0x41) -#define SS_ENTER_STANDBY ( 0x50) -#define SS_STANDBY ( 0x52) -#define SS_LEAVE_STANDBY ( 0x54) +#define SS_ENTER_CONFIG_CHANGE ( 0x28) +#define SS_STREAMING ( 0x31) +#define SS_START_STREAMING ( 0x34) +#define SS_ENTER_SUSPEND ( 0x40) +#define SS_SUSPENDED ( 0x41) +#define SS_ENTER_STANDBY ( 0x50) +#define SS_STANDBY ( 0x52) +#define SS_LEAVE_STANDBY ( 0x54) #define REG_CAM_OUTPUT_FORMAT (0xC86C) #define OUTPUT_FORMAT_RGB565 (0 << 12) @@ -171,8 +171,8 @@ static int reset(sensor_t *sensor) const uint32_t (*regs)[3] = qvga_24mhz_regs; for (int i=0, ret=0; regs[i][0]; i++) { uint16_t addr = __REV16(regs[i][0]); - uint32_t size = regs[i][1]; - uint32_t data; + uint32_t size = regs[i][1]; + uint32_t data; // TODO: could use indirect/logical addressing, please test it. switch (size) { case 4: @@ -234,7 +234,7 @@ int mt9m114_init(sensor_t *sensor) SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_PIXCK, 0); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_FSYNC, 0); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_JPEGE, 0); - SENSOR_HW_FLAGS_SET(sensor, SWNSOR_HW_FLAGS_RGB565_REV, 1); + SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_RGB565_REV, 1); return 0; } diff --git a/src/omv/sensors/mt9v034.c b/src/omv/sensors/mt9v034.c index 3f4db43a9..d39642e6b 100644 --- a/src/omv/sensors/mt9v034.c +++ b/src/omv/sensors/mt9v034.c @@ -447,7 +447,7 @@ int mt9v034_init(sensor_t *sensor) SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_PIXCK, 0); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_FSYNC, 1); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_JPEGE, 0); - SENSOR_HW_FLAGS_SET(sensor, SWNSOR_HW_FLAGS_RGB565_REV, 0); + SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_RGB565_REV, 0); return 0; } diff --git a/src/omv/sensors/ov2640.c b/src/omv/sensors/ov2640.c index 045d27516..e195ba39e 100644 --- a/src/omv/sensors/ov2640.c +++ b/src/omv/sensors/ov2640.c @@ -855,7 +855,7 @@ int ov2640_init(sensor_t *sensor) SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_PIXCK, 1); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_FSYNC, 0); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_JPEGE, 1); - SENSOR_HW_FLAGS_SET(sensor, SWNSOR_HW_FLAGS_RGB565_REV, 0); + SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_RGB565_REV, 0); return 0; } diff --git a/src/omv/sensors/ov5640.c b/src/omv/sensors/ov5640.c index 1c6dcf959..618af6077 100644 --- a/src/omv/sensors/ov5640.c +++ b/src/omv/sensors/ov5640.c @@ -1381,7 +1381,7 @@ int ov5640_init(sensor_t *sensor) SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_PIXCK, 1); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_FSYNC, 0); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_JPEGE, 1); - SENSOR_HW_FLAGS_SET(sensor, SWNSOR_HW_FLAGS_RGB565_REV, 0); + SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_RGB565_REV, 0); return 0; } diff --git a/src/omv/sensors/ov7670.c b/src/omv/sensors/ov7670.c index b0eec8550..5c0dd11ca 100644 --- a/src/omv/sensors/ov7670.c +++ b/src/omv/sensors/ov7670.c @@ -453,7 +453,7 @@ int ov7670_init(sensor_t *sensor) SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_PIXCK, 1); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_FSYNC, 0); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_JPEGE, 0); - SENSOR_HW_FLAGS_SET(sensor, SWNSOR_HW_FLAGS_RGB565_REV, 1); + SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_RGB565_REV, 1); return 0; } diff --git a/src/omv/sensors/ov7690.c b/src/omv/sensors/ov7690.c index d4b93a887..f1758d5fe 100644 --- a/src/omv/sensors/ov7690.c +++ b/src/omv/sensors/ov7690.c @@ -624,7 +624,7 @@ int ov7690_init(sensor_t *sensor) SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_PIXCK, 1); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_FSYNC, 0); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_JPEGE, 0); - SENSOR_HW_FLAGS_SET(sensor, SWNSOR_HW_FLAGS_RGB565_REV, 1); + SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_RGB565_REV, 1); return 0; } diff --git a/src/omv/sensors/ov7725.c b/src/omv/sensors/ov7725.c index de337a5f6..13974bdc0 100644 --- a/src/omv/sensors/ov7725.c +++ b/src/omv/sensors/ov7725.c @@ -623,7 +623,7 @@ int ov7725_init(sensor_t *sensor) SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_PIXCK, 1); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_FSYNC, 0); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_JPEGE, 0); - SENSOR_HW_FLAGS_SET(sensor, SWNSOR_HW_FLAGS_RGB565_REV, 1); + SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_RGB565_REV, 1); return 0; } diff --git a/src/omv/sensors/ov9650.c b/src/omv/sensors/ov9650.c index b58f4214b..7bec656dc 100644 --- a/src/omv/sensors/ov9650.c +++ b/src/omv/sensors/ov9650.c @@ -539,7 +539,7 @@ int ov9650_init(sensor_t *sensor) SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_PIXCK, 1); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_FSYNC, 0); SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_JPEGE, 0); - SENSOR_HW_FLAGS_SET(sensor, SWNSOR_HW_FLAGS_RGB565_REV, 1); + SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_RGB565_REV, 1); return 0; }