Skip to content
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

Change order of definition of QVGA and VGA test #1

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

Change order of definition of QVGA and VGA test #1

Show file tree
Hide file tree
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
94 changes: 47 additions & 47 deletions Examples/QVGA_Test/QVGA_Test.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,60 +30,13 @@ tBMPHDR565 fileheader;
File bmpfile;
const int pinCamReset = 14;

void setup() {
Serial.begin(9600);
delay(200);
Wire.begin();

pinMode(pinCamReset, OUTPUT);
pinMode(ledpin, OUTPUT);

digitalWriteFast(pinCamReset, LOW);
delay(10);
digitalWriteFast(pinCamReset, HIGH); // subsequent resets via SCB

Serial.print("\n\nInitializing SD card...");

if (!SD.begin(BUILTIN_SDCARD)) {
Serial.println("initialization failed!");
BlinkForever();
}
Serial.println("initialization done.");

if (OV7670.begin(QVGA, cbuff1, cbuff2)) {
Serial.println("OV7670 camera initialized.");
Serial.printf("cbuff1 at %p\n", cbuff1);
Serial.printf("cbuff2 at %p\n", cbuff2);
Serial.printf("fcaptbuff at %p\n", fcaptbuff);
} else {
Serial.println("Error initializing OV7670");
BlinkForever();
}
CMSI();

LEDOFF
}

void BlinkForever(void) {
while (1) {
LEDON; delay(100);
LEDOFF; delay(100);
}
}

void loop() {

char ch;
if (Serial.available()) {
ch = Serial.read();
if (ch == 's') CMSI();
if (ch == 'c') CMCS();
if (ch == 'r') CMCR();
if (ch == 'f') CMGF();
}

}

void CMSI(void) {
Serial.printf("\n\nOV7670 Camera QVGA Test 3 %s\n", compileTime);
OV7670.ShowCamConfig();
Expand Down Expand Up @@ -143,3 +96,50 @@ void CMGF(void) {
Serial.printf("bmpfile closed \n");
Serial.println("File saved to SD card.");
}

void setup() {
Serial.begin(115200);
delay(200);
Wire.begin();

pinMode(pinCamReset, OUTPUT);
pinMode(ledpin, OUTPUT);

digitalWriteFast(pinCamReset, LOW);
delay(10);
digitalWriteFast(pinCamReset, HIGH); // subsequent resets via SCB

Serial.print("\n\nInitializing SD card...");

if (!SD.begin(BUILTIN_SDCARD)) {
Serial.println("initialization failed!");
BlinkForever();
}
Serial.println("initialization done.");

if (OV7670.begin(QVGA, cbuff1, cbuff2)) {
Serial.println("OV7670 camera initialized.");
Serial.printf("cbuff1 at %p\n", cbuff1);
Serial.printf("cbuff2 at %p\n", cbuff2);
Serial.printf("fcaptbuff at %p\n", fcaptbuff);
} else {
Serial.println("Error initializing OV7670");
BlinkForever();
}
CMSI();

LEDOFF
}

void loop() {

char ch;
if (Serial.available()) {
ch = Serial.read();
if (ch == 's') CMSI();
if (ch == 'c') CMCS();
if (ch == 'r') CMCR();
if (ch == 'f') CMGF();
}

}
108 changes: 53 additions & 55 deletions Examples/VGA_Test/VGA_Test.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,65 +30,15 @@ tBMPHDR565 fileheader;
File bmpfile;
const int pinCamReset = 14;

void setup() {
Serial.begin(9600);
delay(200);
Wire.begin();

pinMode(pinCamReset, OUTPUT);
pinMode(ledpin, OUTPUT);

digitalWriteFast(pinCamReset, LOW);
delay(10);
digitalWriteFast(pinCamReset, HIGH); // subsequent resets via SCB

Serial.print("Initializing SD card...");

if (!SD.begin(BUILTIN_SDCARD)) {
Serial.println("initialization failed!");
while (1){
LEDON; delay(100);
LEDOFF; delay(100);
}
}
Serial.println("initialization done.");

if (OV7670.begin(VGA, cbuff1, cbuff2)) {
Serial.println("OV7670 camera initialized.");
Serial.printf("cbuff1 at %p\n", cbuff1);
Serial.printf("cbuff2 at %p\n", cbuff2);
Serial.printf("fcaptbuff at %p\n", fcaptbuff);
}
OV7670.ShowCamConfig();

LEDOFF
}

void loop() {
// put your main code here, to run repeatedly:

char ch;
if (Serial.available()) {
ch = Serial.read();
if (ch == 's') CMSI();
if (ch == 'c') CMCS();
if (ch == 'r') CMCR();
if (ch == 'f') CMGF();
}

}

void CMSI(void) {
Serial.printf("\n\nOV7670 Camera VGA Test 3 %s\n", compileTime);
OV7670.ShowCamConfig();
}


void CMCS(void) { // Show CSI registers
OV7670.ShowCSIRegisters();
}


// Show Camera Registers
void CMCR(void) {
uint8_t regs[200];
Expand All @@ -97,7 +47,7 @@ void CMCR(void) {
}

void CMGF(void) {
uint32_t imagesize, hdrsize, fbc;
uint32_t imagesize, hdrsize;

imagesize = OV7670.ImageSize();

Expand All @@ -106,13 +56,13 @@ void CMGF(void) {
Serial.printf("Ready to save %lu bytes.\n", imagesize);
Serial.println("Saving OV7670.bmp ");

if (sd.exists("OV7670.bmp")) {
if (SD.exists("OV7670.bmp")) {
// delete the file:
Serial.println("Removing old OV7670.bmp...");
sd.remove("OV7670.bmp");
SD.remove("OV7670.bmp");
}
Serial.println("Opening File\n");
bmpfile = sd.open("OV7670.bmp", FILE_WRITE);
bmpfile = SD.open("OV7670.bmp", FILE_WRITE);
Serial.printf("bmpfile: %p\n", bmpfile);
if (bmpfile) {
Serial.println("Writing...");
Expand All @@ -128,9 +78,57 @@ void CMGF(void) {
Serial.printf("bmpfile: %p\n", bmpfile);
delay(5);
Serial.println("Write complete");
Serial.printf("bmpfile: %p\n", bmpfile);
Serial.printf("bmpfile: %p\n", bmpfile);
delay(5);
bmpfile.close();
Serial.printf("bmpfile: %p closed \n", bmpfile);
Serial.println("File saved to SD card.");
}

void setup() {
Serial.begin(9600);
delay(200);
Wire.begin();

pinMode(pinCamReset, OUTPUT);
pinMode(ledpin, OUTPUT);

digitalWriteFast(pinCamReset, LOW);
delay(10);
digitalWriteFast(pinCamReset, HIGH); // subsequent resets via SCB

Serial.print("Initializing SD card...");

if (!SD.begin(BUILTIN_SDCARD)) {
Serial.println("initialization failed!");
while (1){
LEDON; delay(100);
LEDOFF; delay(100);
}
}
Serial.println("initialization done.");

if (OV7670.begin(VGA, cbuff1, cbuff2)) {
Serial.println("OV7670 camera initialized.");
Serial.printf("cbuff1 at %p\n", cbuff1);
Serial.printf("cbuff2 at %p\n", cbuff2);
Serial.printf("fcaptbuff at %p\n", fcaptbuff);
}
OV7670.ShowCamConfig();

LEDOFF
}

void loop() {
// put your main code here, to run repeatedly:

char ch;
if (Serial.available()) {
ch = Serial.read();
if (ch == 's') CMSI();
if (ch == 'c') CMCS();
if (ch == 'r') CMCR();
if (ch == 'f') CMGF();
}

}