Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit edd4afc

Browse files
iabdalkaderpennam
authored andcommitted
Update OV7670 driver.
1 parent c6eadbd commit edd4afc

File tree

2 files changed

+27
-23
lines changed

2 files changed

+27
-23
lines changed

‎libraries/OV7670/ov7670.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366

367367
static const uint8_t default_regs[][2] = {
368368
// OV7670 reference registers
369-
{ CLKRC, OMV_OV7670_CLKRC },
369+
{ CLKRC, CLKRC_PRESCALER_BYPASS | OMV_OV7670_CLKRC },
370370
{ TSLB, 0x04 },
371371
{ COM7, 0x00 },
372372
{ HSTART, 0x13 },
@@ -383,6 +383,7 @@ static const uint8_t default_regs[][2] = {
383383
{ SCALING_DCWCTR, 0x11 },
384384
{ SCALING_PCLK_DIV, 0xf0 },
385385
{ SCALING_PCLK, 0x02 },
386+
{ COM10, COM10_VSYNC_NEG},
386387

387388
/* Gamma curve values */
388389
{ SLOP, 0x20 },
@@ -557,7 +558,7 @@ static const uint8_t rgb565_regs[][2] = {
557558
{ COM7, COM7_RGB_FMT }, /* Selects RGB mode */
558559
{ RGB444, 0 }, /* No RGB444 please */
559560
{ COM1, 0x0 }, /* CCIR601 */
560-
{ COM15, COM15_FMT_RGB565 |COM15_OUT_00_FF},
561+
{ COM15, COM15_FMT_RGB565 |COM15_OUT_00_FF},
561562
{ MVFP, MVFP_BLACK_SUN_EN },
562563
{ COM9, 0x6A }, /* 128x gain ceiling; 0x8 is reserved bit */
563564
{ MTX1, 0xb3 }, /* "matrix coefficient 1" */
@@ -591,16 +592,16 @@ static const uint8_t yuv422_regs[][2] = {
591592
};
592593

593594
static const uint8_t vga_regs[][2] = {
594-
{ COM3, COM3_DCW_EN },
595-
{ COM14, 0x10 },
596-
{ 0x72, 0x22 }, // downsample by 4
597-
{ 0x73, 0xf2 }, // divide by 4
598-
{ HSTART, 0x16 },
599-
{ HSTOP, 0x04 },
600-
{ HREF, 0xa4 },
601-
{ VSTART, 0x22 },
595+
{ COM3, 0x00 },
596+
{ COM14, 0x00 },
597+
{ 0x72, 0x11 }, // downsample by 4
598+
{ 0x73, 0xf0 }, // divide by 4
599+
{ HSTART, 0x12 },
600+
{ HSTOP, 0x00 },
601+
{ HREF, 0xb6 },
602+
{ VSTART, 0x02 },
602603
{ VSTOP, 0x7a },
603-
{ VREF, 0x0a },
604+
{ VREF, 0x00 },
604605
{ 0xFF, 0xFF },
605606
};
606607

@@ -620,12 +621,11 @@ static const uint8_t qvga_regs[][2] = {
620621
};
621622
#else
622623
static const uint8_t qvga_regs[][2] = {
623-
//{ COM7, COM7_RES_QVGA },
624624
{ COM3, COM3_DCW_EN },
625-
{ COM14, 0x1a },
626-
{ 0x72, 0x22 }, // downsample by 4
627-
{ 0x73, 0xf2 }, // divide by 4
628-
{ HSTART, 0x16 },
625+
{ COM14, 0x19 },
626+
{ 0x72, 0x11 }, // downsample by 2
627+
{ 0x73, 0xf1 }, // divide by 2
628+
{ HSTART, 0x15 },
629629
{ HSTOP, 0x04 },
630630
{ HREF, 0xa4 },
631631
{ VSTART, 0x02 },
@@ -638,15 +638,15 @@ static const uint8_t qvga_regs[][2] = {
638638
#if (OMV_OV7670_VERSION == 75)
639639
static const uint8_t qqvga_regs[][2] = {
640640
{ COM3, COM3_DCW_EN },
641-
{ COM14, 0x12 }, // Divide by 4
641+
{ COM14, 0x11 }, // Divide by 2
642642
{ 0x72, 0x22 }, // This has no effect on OV7675
643643
{ 0x73, 0xf2 }, // This has no effect on OV7675
644644
{ HSTART, 0x16 },
645645
{ HSTOP, 0x04 },
646646
{ HREF, 0xa4 },
647647
{ VSTART, 0x22 },
648648
{ VSTOP, 0x7a },
649-
{ VREF, 0xFa },
649+
{ VREF, 0xfa },
650650
{ 0xFF, 0xFF },
651651
};
652652
#else
@@ -678,14 +678,12 @@ int OV7670::init()
678678
int ret = 0;
679679
reset();
680680

681-
delay(10);
682-
683681
// Write default registers
684-
for (int i = 0; default_regs[i][0]; i++) {
682+
for (int i = 0; default_regs[i][0] != 0xFF; i++) {
685683
ret |= regWrite(getID(), default_regs[i][0], default_regs[i][1]);
686684
}
687685

688-
//regWrite(getID(), COM10, COM10_PCLK_MASK);
686+
delay(300);
689687

690688
return ret;
691689
}
@@ -697,7 +695,9 @@ int OV7670::setWindow(uint16_t reg, uint16_t x, uint16_t y, uint16_t w, uint16_t
697695

698696
int OV7670::reset()
699697
{
700-
return regWrite(getID(), COM7, COM7_RESET);
698+
int ret = regWrite(getID(), COM7, COM7_RESET);
699+
delay(10);
700+
return ret;
701701
}
702702

703703
int OV7670::setFrameRate(int32_t framerate)

‎libraries/OV7670/ov7670.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@
2121

2222
#include "camera.h"
2323

24+
#ifndef OMV_OV7670_VERSION
2425
#define OMV_OV7670_VERSION (70)
26+
#endif
27+
#ifndef OMV_OV7670_CLKRC
2528
#define OMV_OV7670_CLKRC (0x00)
29+
#endif
2630

2731
class OV7670: public ImageSensor {
2832
private:

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /