Skip to content

OV2640 regs ifdef fix #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OV2640 regs ifdef fix #495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions ArduCAM/ov2640_regs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ const struct sensor_reg OV2640_640x480_JPEG[] PROGMEM =
{
{0xff, 0x01},
{0x11, 0x01},
{0x12, 0x00}, // Bit[6:4]: Resolution selection//0x02����
{0x12, 0x00}, // Bit[6:4]: Resolution selection//0x02为彩条
{0x17, 0x11}, // HREFST[10:3]
{0x18, 0x75}, // HREFEND[10:3]
{0x32, 0x36}, // Bit[5:3]: HREFEND[2:0]; Bit[2:0]: HREFST[2:0]
Expand Down Expand Up @@ -673,7 +673,7 @@ const struct sensor_reg OV2640_800x600_JPEG[] PROGMEM =
{
{0xff, 0x01},
{0x11, 0x01},
{0x12, 0x00}, // Bit[6:4]: Resolution selection//0x02����
{0x12, 0x00}, // Bit[6:4]: Resolution selection//0x02为彩条
{0x17, 0x11}, // HREFST[10:3]
{0x18, 0x75}, // HREFEND[10:3]
{0x32, 0x36}, // Bit[5:3]: HREFEND[2:0]; Bit[2:0]: HREFST[2:0]
Expand Down Expand Up @@ -721,7 +721,7 @@ const struct sensor_reg OV2640_1024x768_JPEG[] PROGMEM =
{
{0xff, 0x01},
{0x11, 0x01},
{0x12, 0x00}, // Bit[6:4]: Resolution selection//0x02����
{0x12, 0x00}, // Bit[6:4]: Resolution selection//0x02为彩条
{0x17, 0x11}, // HREFST[10:3]
{0x18, 0x75}, // HREFEND[10:3]
{0x32, 0x36}, // Bit[5:3]: HREFEND[2:0]; Bit[2:0]: HREFST[2:0]
Expand Down Expand Up @@ -768,7 +768,7 @@ const struct sensor_reg OV2640_1280x1024_JPEG[] PROGMEM =
{
{0xff, 0x01},
{0x11, 0x01},
{0x12, 0x00}, // Bit[6:4]: Resolution selection//0x02����
{0x12, 0x00}, // Bit[6:4]: Resolution selection//0x02为彩条
{0x17, 0x11}, // HREFST[10:3]
{0x18, 0x75}, // HREFEND[10:3]
{0x32, 0x36}, // Bit[5:3]: HREFEND[2:0]; Bit[2:0]: HREFST[2:0]
Expand Down Expand Up @@ -816,7 +816,7 @@ const struct sensor_reg OV2640_1600x1200_JPEG[] PROGMEM =
{
{0xff, 0x01},
{0x11, 0x01},
{0x12, 0x00}, // Bit[6:4]: Resolution selection//0x02����
{0x12, 0x00}, // Bit[6:4]: Resolution selection//0x02为彩条
{0x17, 0x11}, // HREFST[10:3]
{0x18, 0x75}, // HREFEND[10:3]
{0x32, 0x36}, // Bit[5:3]: HREFEND[2:0]; Bit[2:0]: HREFST[2:0]
Expand Down Expand Up @@ -859,9 +859,6 @@ const struct sensor_reg OV2640_1600x1200_JPEG[] PROGMEM =
{0xff, 0xff},

};
#endif



const struct sensor_reg OV2640_SVGA[]
{
Expand Down Expand Up @@ -1086,4 +1083,6 @@ const struct sensor_reg OV2640_640x480_JPEG2[] =
{0x5c,0x00}, //038
{0xd3,0x04}, //039
{0xe0,0x00}, //040
};
};

#endif