Changeset 271

Timestamp:

07/25/06 14:59:04 (2 years ago)

Author:

anthony_rowe

Message:

Fixed jpeg prototype issue

Files:

• trunk/hal/lpc2106-cmucam3/hal.mk (modified) (1 diff)
• trunk/hal/lpc2106-cmucam3/serial.c (modified) (1 diff)
• trunk/include/cc3.h (modified) (1 diff)
• trunk/lib/cc3_ilp/cc3_jpg.c (modified) (1 diff)
• trunk/projects/hello_world/main.c (modified) (1 diff)

trunk/hal/lpc2106-cmucam3/hal.mk

@@ -21 +21 @@
-
-CSOURCES=interrupt.c cc3.c cc3_hal.c syscalls.c serial.c \
-
+ gpio.c
-INCLUDES=cc3_hal.h devices.h ioctl.h lpc_config.h rdcf2.h servo.h \
-        cc3_pin_defines.h interrupt.h LPC2100.h mmc_hardware.h serial.h spi.h \
-
+ gpio.h
-ASMSOURCES=startup.s
-

trunk/hal/lpc2106-cmucam3/serial.c

@@ -59 +59 @@
- *    mode - see typical modes (uart.h)
- *    fmode - see typical fmodes (uart.h)
- *    NOTE: uart0Init(UART_BAUD(9600), UART_8N1, UART_FIFO_8); 
- */
-void _cc3_uart0_setup(uint16_t baud, uint8_t mode, uint8_t fmode)

trunk/include/cc3.h

@@ -204 +204 @@
-void cc3_servo_disable (void);
-
+void cc3_gpio_set_to_servo(uint8_t mask);
+void cc3_gpio_set_to_input(uint8_t mask);
+void cc3_gpio_set_to_output(uint8_t mask);
+uint8_t cc3_gpio_set_pin(uint8_t pin);
+uint8_t cc3_gpio_get_pin(uint8_t pin);
-
-

trunk/lib/cc3_ilp/cc3_jpg.c

@@ -27 +27 @@
-#include <jpeglib.h>
-
+
+static void destroy_jpeg(void);
+static void init_jpeg(void); 
+static void capture_current_jpeg(FILE *f); 
-
-void cc3_jpeg_send_simple(void) {

trunk/projects/hello_world/main.c

@@ -33 +33 @@
-    cc3_set_auto_exposure(true);
-   
- 
+cc3_gpio_set_to_servo( 5);
-    printf("Hello World...\n");
-