Changeset 279

Show
Ignore:
Timestamp:
12/30/06 14:29:01 (2 years ago)
Author:
anthony_rowe
Message:

Put some things back into the makefiles for normal lpc2106-cmucam2 compiling that I accidentally removed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/hal/Makefile

    r273 r279  
    1 #SUBDIRS=lpc2106-cmucam3 virtual-cam 
    2 SUBDIRS=virtual-cam 
     1SUBDIRS=lpc2106-cmucam3 virtual-cam 
     2#SUBDIRS=lpc2106-cmucam3 
     3#SUBDIRS=virtual-cam 
    34 
    45# Build rules 

  • trunk/hal/lpc2106-cmucam3/cc3.c

    r251 r279  
    519519int cc3_camera_init () 
    520520{ 
    521   REG (PCB_PINSEL0) = (REG (PCB_PINSEL0) & 0xFFFF0000) | UART0_PCB_PINSEL_CFG;  //| 0x50; 
     521  REG (PCB_PINSEL0) = (REG (PCB_PINSEL0) & 0xFFFF0000) | UART0_PCB_PINSEL_CFG | UART1_PCB_PINSEL_CFG;  //| 0x50; 
    522522  //REG (PCB_PINSEL0) = (REG (PCB_PINSEL0) & 0xFFFF0000) | UART0_PCB_PINSEL_CFG | UART1_PCB_PINSEL_CFG; //| 0x50; 
    523523  REG (GPIO_IODIR) = _CC3_DEFAULT_PORT_DIR; 

  • trunk/hal/lpc2106-cmucam3/defs.mk

    r273 r279  
    4242 
    4343LIBS+= 
    44 #override CFLAGS+=-I$(HALDIR)/../../include -Os -funit-at-a-time -mcpu=arm7tdmi-s -Wall -Wstrict-prototypes -Wcast-align -Wcast-qual -Wimplicit -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wswitch -Wredundant-decls -Wreturn-type -Wshadow -Wstrict-prototypes -Wunused -Wextra -Werror-implicit-function-declaration -ffreestanding -std=gnu99 -g -fdata-sections -ffunction-sections -msoft-float -mthumb-interwork $(THUMB_FLAGS) 
    45 #override LDFLAGS+=-nostartfiles -lm -T$(HALDIR)/lpc2106-rom.ln -mcpu=arm7tdmi-s -msoft-float $(THUMB_FLAGS) 
     44override CFLAGS+=-I$(HALDIR)/../../include -Os -funit-at-a-time -mcpu=arm7tdmi-s -Wall -Wstrict-prototypes -Wcast-align -Wcast-qual -Wimplicit -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wswitch -Wredundant-decls -Wreturn-type -Wshadow -Wstrict-prototypes -Wunused -Wextra -Werror-implicit-function-declaration -ffreestanding -std=gnu99 -g -fdata-sections -ffunction-sections -msoft-float -mthumb-interwork $(THUMB_FLAGS) 
     45override LDFLAGS+=-nostartfiles -lm -T$(HALDIR)/lpc2106-rom.ln -mcpu=arm7tdmi-s -msoft-float $(THUMB_FLAGS) 
    4646 
    4747HALLIB=libhal-$(HALNAME).a 

  • trunk/hal/lpc2106-cmucam3/gpio.c

    r272 r279  
    99void cc3_gpio_set_to_servo(uint8_t mask) 
    1010{ 
    11 printf( "set servo!\n" ); 
     11//printf( "set servo!\n" ); 
    1212} 
    1313 

  • trunk/hal/lpc2106-cmucam3/serial.c

    r271 r279  
    107107  // setup FIFO Control Register (fifo-enabled + xx trig)  
    108108  REG(UART1_FCR) = fmode; 
     109  uart0_write("setting uart1\r\n" ); 
     110  uart0_write("mode: " ); uart0_write_hex(mode);  
     111  uart0_write("\r\nfmode: " ); uart0_write_hex(fmode);  
     112 
    109113} 
    110114 
    …… 
    269273int uart1_getc() 
    270274{ 
    271   while ((REG (UART1_LSR) & LSR_RBR_EMPTY) == 0); 
     275  while ((REG (UART1_LSR) & LSR_RBR_EMPTY) == 0) ; 
    272276  return REG (UART1_RBR); 
    273277} 

  • trunk/hal/virtual-cam/Makefile

    r273 r279  
    2222hal: 
    2323        $(MAKE) -f hal.mk 
    24         #$(MAKE) -f hal.mk thumb=1 
    2524 
    2625libs: 
    2726        $(MAKE) -C ../../lib 
    28         #$(MAKE) -C ../../lib thumb=1 
    2927 
    3028clean: 
    3129        $(RM) *.a *.o 
    3230        $(MAKE) -C ../../lib clean 
    33         #$(MAKE) -C ../../lib clean thumb=1 
    3431 
    3532 

  • trunk/include/common.mk

    r273 r279  
    2323ifeq ($(strip $(hal)),) 
    2424  hal=lpc2106-cmucam3 
    25   #hal=virtual-cam 
    2625endif 
    2726 

  • trunk/lib/cc3_ilp/cc3_ilp.c

    r273 r279  
    2020 
    2121 
    22 #include <cc3.h> 
     22#include "cc3.h" 
    2323#include "cc3_ilp.h" 
    2424#include <stdbool.h> 

  • trunk/tools/cc3_image_viewer/Form1.vb

    r244 r279  
    33    Public jpeg_grab As Byte 
    44    Public myStr As String 
    5      
     5 
     6 
    67 
    78 
    …… 
    1213       ByVal e As System.EventArgs) _ 
    1314       Handles MyBase.Load 
     15 
    1416 
    1517        For i As Integer = 0 To _ 
    …… 
    7779            Dim buf() As Byte 
    7880 
     81 
    7982            jpeg_grab = 1 
    8083            serialPort.DiscardInBuffer() 

  • trunk/tools/cc3_image_viewer/obj/cc3_img_viewer.vbproj.FileList.txt

    r244 r279  
    99obj\Debug\CC3_GRAB.Resources.resources 
    1010obj\Debug\cc3_img_viewer.vbproj.GenerateResource.Cache 
     11bin\Release\CMUcam3 Frame Grabber.exe 
     12bin\Release\CMUcam3 Frame Grabber.pdb 
     13bin\Release\CMUcam3 Frame Grabber.xml 
     14obj\Release\ResolveAssemblyReference.cache 
     15obj\Release\CC3_GRAB.Form1.resources 
     16obj\Release\CC3_GRAB.Resources.resources 
     17obj\Release\cc3_img_viewer.vbproj.GenerateResource.Cache 
     18obj\Release\CMUcam3 Frame Grabber.exe 
     19obj\Release\CMUcam3 Frame Grabber.xml 
     20obj\Release\CMUcam3 Frame Grabber.pdb