Revision 10:b04f3444b794, committed 2010-08-30

Comitter:

shintamainjp

Date:

Mon Aug 30 13:45:20 2010 +0000

Parent:

9:217ce5bd94c5

Child:

11:0c80f5829565

Commit message:

Changed in this revision

--- a/CameraC328.cpp	Thu Jul 01 10:39:59 2010 +0000
+++ b/CameraC328.cpp	Mon Aug 30 13:45:20 2010 +0000
@@ -1,5 +1,5 @@
 /**
- * C328-7640 device driver class (Version 0.0.2)
+ * C328-7640 device driver class (Version 0.0.3)
  * Reference documents: C328-7640 User Manual v3.0 2004.8.19
  *
  * Copyright (C) 2010 Shinichiro Nakamura (CuBeatSystems)
@@ -227,14 +227,13 @@
         return en;
     }
 
-    WAITFUNC();
-
     char databuf[packageSize - 6];
     uint16_t pkg_total = length / (packageSize - 6);
     for (int i = 0; i <= (int)pkg_total; i++) {
         uint16_t checksum = 0;
         // ID.
         char idbuf[2];
+        WAITFUNC();
         if (!RECVFUNC(idbuf, sizeof(idbuf))) {
             return (ErrorNumber)UnexpectedReply;
         }
@@ -247,6 +246,7 @@
 
         // Size of the data.
         char dsbuf[2];
+        WAITFUNC();
         if (!RECVFUNC(dsbuf, sizeof(dsbuf))) {
             return (ErrorNumber)UnexpectedReply;
         }
@@ -255,6 +255,7 @@
         checksum += dsbuf[0];
         checksum += dsbuf[1];
         uint16_t ds = (dsbuf[1] << 8) | (dsbuf[0] << 0);
+        WAITFUNC();
         if (!RECVFUNC(&databuf[0], ds)) {
             return (ErrorNumber)UnexpectedReply;
         }
@@ -264,6 +265,7 @@
 
         // Verify code.
         char vcbuf[2];
+        WAITFUNC();
         if (!RECVFUNC(vcbuf, sizeof(vcbuf))) {
             return (ErrorNumber)UnexpectedReply;
         }
@@ -318,14 +320,13 @@
         return en;
     }
 
-    WAITFUNC();
-
     char databuf[packageSize - 6];
     uint16_t pkg_total = length / (packageSize - 6);
     for (int i = 0; i <= (int)pkg_total; i++) {
         uint16_t checksum = 0;
         // ID.
         char idbuf[2];
+        WAITFUNC();
         if (!RECVFUNC(idbuf, sizeof(idbuf))) {
             return (ErrorNumber)UnexpectedReply;
         }
@@ -338,6 +339,7 @@
 
         // Size of the data.
         char dsbuf[2];
+        WAITFUNC();
         if (!RECVFUNC(dsbuf, sizeof(dsbuf))) {
             return (ErrorNumber)UnexpectedReply;
         }
@@ -346,6 +348,7 @@
         checksum += dsbuf[0];
         checksum += dsbuf[1];
         uint16_t ds = (dsbuf[1] << 8) | (dsbuf[0] << 0);
+        WAITFUNC();
         if (!RECVFUNC(&databuf[0], ds)) {
             return (ErrorNumber)UnexpectedReply;
         }
@@ -355,6 +358,7 @@
 
         // Verify code.
         char vcbuf[2];
+        WAITFUNC();
         if (!RECVFUNC(vcbuf, sizeof(vcbuf))) {
             return (ErrorNumber)UnexpectedReply;
         }
@@ -645,4 +649,4 @@
     while (!serial.readable()) {
     }
     return true;
-}
\ No newline at end of file
+}

--- a/CameraC328.h	Thu Jul 01 10:39:59 2010 +0000
+++ b/CameraC328.h	Mon Aug 30 13:45:20 2010 +0000
@@ -1,5 +1,5 @@
 /**
- * C328-7640 device driver class (Version 0.0.2)
+ * C328-7640 device driver class (Version 0.0.3)
  * Reference documents: C328-7640 User Manual v3.0 2004.8.19
  *
  * Copyright (C) 2010 Shinichiro Nakamura (CuBeatSystems)

--- a/test.cpp	Thu Jul 01 10:39:59 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-/**
- * C328-7640 device driver class (Version 0.0.2)
- * Reference documents: C328-7640 User Manual v3.0 2004.8.19
- *
- * Copyright (C) 2010 Shinichiro Nakamura (CuBeatSystems)
- * http://shinta.main.jp/
- */
-
-#include "mbed.h"
-#include "CameraC328.h"
-
-Serial serial(USBTX, USBRX);
-LocalFileSystem fs ("fs");
-
-CameraC328 camera(p9, p10, CameraC328::Baud57600);
-const int IMG_X = 80;
-const int IMG_Y = 60;
-char buf[IMG_X * IMG_Y * 2];
-FILE *fp_jpeg;
-
-void uncompressed_callback(size_t done, size_t total, char c) {
-    buf[done - 1] = c;
-}
-
-void jpeg_callback(char *buf, size_t siz) {
-    for (int i = 0; i < (int)siz; i++) {
-        fprintf(fp_jpeg, "%c", buf[i]); 
-    }
-}
-
-void sync(void) {
-    CameraC328::ErrorNumber err = CameraC328::NoError;
-
-    err = camera.sync();
-    if (CameraC328::NoError == err) {
-        serial.printf("[ OK ] : CameraC328::sync\n");
-    } else {
-        serial.printf("[FAIL] : CameraC328::sync (Error=%02X)\n", (int)err);
-    }
-}
-
-void test_uncompressed_snapshot_picture(void) {
-    CameraC328::ErrorNumber err = CameraC328::NoError;
-
-    err = camera.init(CameraC328::Color16bit, CameraC328::RawResolution80x60, CameraC328::JpegResolution80x64);
-    if (CameraC328::NoError == err) {
-        serial.printf("[ OK ] : CameraC328::init\n");
-    } else {
-        serial.printf("[FAIL] : CameraC328::init (Error=%02X)\n", (int)err);
-    }
-
-    for (int i = 0; i < 10; i++) {
-        err = camera.getUncompressedSnapshotPicture(uncompressed_callback);
-        if (CameraC328::NoError == err) {
-            serial.printf("[ OK ] : CameraC328::getUncompressedSnapshotPicture\n");
-        } else {
-            serial.printf("[FAIL] : CameraC328::getUncompressedSnapshotPicture (Error=%02X)\n", (int)err);
-        }
-
-        char fname[64];
-        snprintf(fname, sizeof(fname), "/fs/ucss%04d.ppm", i);
-        FILE *fp = fopen(fname, "w");
-        fprintf(fp, "P3\n");
-        fprintf(fp, "%d %d\n", IMG_X, IMG_Y);
-        fprintf(fp, "%d\n", 255);
-        for (int y = 0; y < IMG_Y; y++) {
-            for (int x = 0; x < IMG_X; x++) {
-                int adrofs = y * (IMG_X * 2) + (x * 2);
-                uint16_t dat = (buf[adrofs + 0] << 8) | (buf[adrofs + 1] << 0);
-                uint8_t r = ((dat >> 11) & 0x1f) << 3;
-                uint8_t g = ((dat >> 5) & 0x3f) << 2;
-                uint8_t b = ((dat >> 0) & 0x1f) << 3;
-                fprintf(fp,"%d %d %d\n", r, g, b);
-            }
-        }
-        fclose(fp);
-    }
-}
-
-void test_uncompressed_preview_picture(void) {
-    CameraC328::ErrorNumber err = CameraC328::NoError;
-
-    err = camera.init(CameraC328::Color16bit, CameraC328::RawResolution80x60, CameraC328::JpegResolution80x64);
-    if (CameraC328::NoError == err) {
-        serial.printf("[ OK ] : CameraC328::init\n");
-    } else {
-        serial.printf("[FAIL] : CameraC328::init (Error=%02X)\n", (int)err);
-    }
-
-    for (int i = 0; i < 10; i++) {
-        err = camera.getUncompressedPreviewPicture(uncompressed_callback);
-        if (CameraC328::NoError == err) {
-            serial.printf("[ OK ] : CameraC328::getUncompressedPreviewPicture\n");
-        } else {
-            serial.printf("[FAIL] : CameraC328::getUncompressedPreviewPicture (Error=%02X)\n", (int)err);
-        }
-
-        char fname[64];
-        snprintf(fname, sizeof(fname), "/fs/ucpv%04d.ppm", i);
-        FILE *fp = fopen(fname, "w");
-        fprintf(fp, "P3\n");
-        fprintf(fp, "%d %d\n", IMG_X, IMG_Y);
-        fprintf(fp, "%d\n", 255);
-        for (int y = 0; y < IMG_Y; y++) {
-            for (int x = 0; x < IMG_X; x++) {
-                int adrofs = y * (IMG_X * 2) + (x * 2);
-                uint16_t dat = (buf[adrofs + 0] << 8) | (buf[adrofs + 1] << 0);
-                uint8_t r = ((dat >> 11) & 0x1f) << 3;
-                uint8_t g = ((dat >> 5) & 0x3f) << 2;
-                uint8_t b = ((dat >> 0) & 0x1f) << 3;
-                fprintf(fp,"%d %d %d\n", r, g, b);
-            }
-        }
-        fclose(fp);
-    }
-}
-
-void test_jpeg_snapshot_picture(void) {
-    CameraC328::ErrorNumber err = CameraC328::NoError;
-
-    err = camera.init(CameraC328::Jpeg, CameraC328::RawResolution80x60, CameraC328::JpegResolution640x480);
-    if (CameraC328::NoError == err) {
-        serial.printf("[ OK ] : CameraC328::init\n");
-    } else {
-        serial.printf("[FAIL] : CameraC328::init (Error=%02X)\n", (int)err);
-    }
-        
-    for (int i = 0; i < 10; i++) {
-        char fname[64];
-        snprintf(fname, sizeof(fname), "/fs/jpss%04d.jpg", i);
-        fp_jpeg = fopen(fname, "w");
-        
-        err = camera.getJpegSnapshotPicture(jpeg_callback);
-        if (CameraC328::NoError == err) {
-            serial.printf("[ OK ] : CameraC328::getJpegSnapshotPicture\n");
-        } else {
-            serial.printf("[FAIL] : CameraC328::getJpegSnapshotPicture (Error=%02X)\n", (int)err);
-        }
-
-        fclose(fp_jpeg);
-    }
-}
-
-void test_jpeg_preview_picture(void) {
-    CameraC328::ErrorNumber err = CameraC328::NoError;
-
-    err = camera.init(CameraC328::Jpeg, CameraC328::RawResolution80x60, CameraC328::JpegResolution640x480);
-    if (CameraC328::NoError == err) {
-        serial.printf("[ OK ] : CameraC328::init\n");
-    } else {
-        serial.printf("[FAIL] : CameraC328::init (Error=%02X)\n", (int)err);
-    }
-        
-    for (int i = 0; i < 10; i++) {
-        char fname[64];
-        snprintf(fname, sizeof(fname), "/fs/jppv%04d.jpg", i);
-        fp_jpeg = fopen(fname, "w");
-
-        err = camera.getJpegPreviewPicture(jpeg_callback);
-        if (CameraC328::NoError == err) {
-            serial.printf("[ OK ] : CameraC328::getJpegPreviewPicture\n");
-        } else {
-            serial.printf("[FAIL] : CameraC328::getJpegPreviewPicture (Error=%02X)\n", (int)err);
-        }
-
-        fclose(fp_jpeg);
-    }
-}
-
-int test() {
-    serial.baud(19200);
-    serial.printf("\n");
-    serial.printf("==========\n");
-    serial.printf("CameraC328\n");
-    serial.printf("==========\n");
-    
-    sync();
-    test_uncompressed_snapshot_picture();
-    test_uncompressed_preview_picture();
-    test_jpeg_preview_picture();
-    test_jpeg_snapshot_picture();
-    
-    return 0;
-}