From: Jan "Yenya" Kasprzak Date: Wed, 20 May 2015 19:34:28 +0000 (+0200) Subject: Directory layout X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=4fe29561e6b7b4c0726dceb1a46569ed43afa376;hp=76115d7cd2998520bce4b65094dd96fb67825c18;p=openparking.git Directory layout - PCB-related files in board/ - Arduino firmware in firmware/ - OpenSCAD objects in things/ --- diff --git a/board-20150430-2227.zip b/board-20150430-2227.zip deleted file mode 100644 index 21565f7..0000000 Binary files a/board-20150430-2227.zip and /dev/null differ diff --git a/1812.fp b/board/1812.fp similarity index 100% rename from 1812.fp rename to board/1812.fp diff --git a/Makefile b/board/Makefile similarity index 51% rename from Makefile rename to board/Makefile index 23528a0..076d26c 100644 --- a/Makefile +++ b/board/Makefile @@ -1,25 +1,3 @@ - -PROGRAM=firmware -SRC=firmware.c rs485.c -OBJ=$(SRC:.c=.o) - - -MCU=atmega328p -# AVRDUDE_MCU=$(MCU) -AVRDUDE_MCU=atmega328p -AVRDUDE_PROGRAMMER=arduino - -CFLAGS=-Wall -Os -mmcu=$(MCU) -DUSE_LOGGING=1 -DF_CPU=16000000UL -std=gnu99 -LDFLAGS= -AVRDUDE_FLAGS= -p$(AVRDUDE_MCU) -c $(AVRDUDE_PROGRAMMER) -P /dev/ttyUSB0 -b 57600 - -FORMAT=ihex - -CC=avr-gcc -OBJCOPY=avr-objcopy -OBJDUMP=avr-objdump -AVRDUDE=avrdude - WEB_DIR=/home/kas/html/board/ WEB_FILES=pcb-back.png pcb-front.png schematics.png handlebar.png GERBER_FILES=\ @@ -32,14 +10,13 @@ GERBER_FILES=\ board.outline.gbr \ board.plated-drill.cnc -all: $(PROGRAM).hex $(PROGRAM).eep +all: + @echo "Usage: make [clean|web|gerber|fab|board.pcb]" clean: rm -f board.cmd board.jpg board.net board.new.pcb board.pcb- \ board.png board.ps board.sch~ pcb-back.png pcb-front.png \ - schematics.png *.gbr *.cnc \ - $(PROGRAM).hex $(PROGRAM).eep $(PROGRAM).elf *.o *.s \ - eeprom.raw version.c + schematics.png *.gbr *.cnc web: $(WEB_FILES) test -d $(WEB_DIR) && install -m 644 $(WEB_FILES) $(WEB_DIR) @@ -84,49 +61,3 @@ fab: $(GERBER_FILES) echo "You may also want to do git tag gerber-fab-$$D" ' .PHONY: gerber - -program: $(PROGRAM).hex $(PROGRAM).eep - $(AVRDUDE) $(AVRDUDE_FLAGS) -U flash:w:$(PROGRAM).hex:i -U eeprom:w:$(PROGRAM).eep:i - -program_flash: $(PROGRAM).hex - $(AVRDUDE) $(AVRDUDE_FLAGS) -U flash:w:$(PROGRAM).hex:i - -program_eeprom: $(PROGRAM).eep - $(AVRDUDE) $(AVRDUDE_FLAGS) eeprom:w:$(PROGRAM).eep:i - -dump_eeprom: - $(AVRDUDE) $(AVRDUDE_FLAGS) -U eeprom:r:eeprom.raw:r - od -tx1 eeprom.raw - -objdump: $(PROGRAM).elf - $(OBJDUMP) --disassemble $< - -.PRECIOUS : $(OBJ) $(PROGRAM).elf - -%.hex: %.elf - $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@ - -%.eep: %.elf - $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ - --change-section-lma .eeprom=0 -O $(FORMAT) $< $@ - -%.elf: $(OBJ) - $(CC) $(CFLAGS) $(OBJ) -o $@ $(LDFLAGS) - -%.o: %.c lights.h Makefile - $(CC) -c $(CFLAGS) $< -o $@ - -%.s: %.c lights.h Makefile - $(CC) -S -c $(CFLAGS) $< -o $@ - -%.o: %.S - $(CC) -c $(CFLAGS) $< -o $@ - -clean: - -version.c: - ./version.pl > version.c - -.PHONY: all clean dump_eeprom program program_flash program_eeprom objdump \ - version.c - diff --git a/board-20150504-1149.zip b/board/board-20150504-1149.zip similarity index 100% rename from board-20150504-1149.zip rename to board/board-20150504-1149.zip diff --git a/board.pcb b/board/board.pcb similarity index 100% rename from board.pcb rename to board/board.pcb diff --git a/board.prj b/board/board.prj similarity index 100% rename from board.prj rename to board/board.prj diff --git a/board.sch b/board/board.sch similarity index 100% rename from board.sch rename to board/board.sch diff --git a/firmware/.gitignore b/firmware/.gitignore new file mode 100644 index 0000000..34692c7 --- /dev/null +++ b/firmware/.gitignore @@ -0,0 +1,4 @@ +firmware.eep +firmware.elf +firmware.hex +*.o diff --git a/firmware/Makefile b/firmware/Makefile new file mode 100644 index 0000000..40ec933 --- /dev/null +++ b/firmware/Makefile @@ -0,0 +1,69 @@ + +PROGRAM=firmware +SRC=firmware.c rs485.c +OBJ=$(SRC:.c=.o) + +MCU=atmega328p +# AVRDUDE_MCU=$(MCU) +AVRDUDE_MCU=atmega328p +AVRDUDE_PROGRAMMER=arduino + +CFLAGS=-Wall -Os -mmcu=$(MCU) -DUSE_LOGGING=1 -DF_CPU=16000000UL -std=gnu99 +LDFLAGS= +AVRDUDE_FLAGS= -p$(AVRDUDE_MCU) -c $(AVRDUDE_PROGRAMMER) -P /dev/ttyUSB0 -b 57600 + +FORMAT=ihex + +CC=avr-gcc +OBJCOPY=avr-objcopy +OBJDUMP=avr-objdump +AVRDUDE=avrdude + +all: $(PROGRAM).hex $(PROGRAM).eep + +program: $(PROGRAM).hex $(PROGRAM).eep + $(AVRDUDE) $(AVRDUDE_FLAGS) -U flash:w:$(PROGRAM).hex:i -U eeprom:w:$(PROGRAM).eep:i + +program_flash: $(PROGRAM).hex + $(AVRDUDE) $(AVRDUDE_FLAGS) -U flash:w:$(PROGRAM).hex:i + +program_eeprom: $(PROGRAM).eep + $(AVRDUDE) $(AVRDUDE_FLAGS) eeprom:w:$(PROGRAM).eep:i + +dump_eeprom: + $(AVRDUDE) $(AVRDUDE_FLAGS) -U eeprom:r:eeprom.raw:r + od -tx1 eeprom.raw + +objdump: $(PROGRAM).elf + $(OBJDUMP) --disassemble $< + +.PRECIOUS : $(OBJ) $(PROGRAM).elf + +%.hex: %.elf + $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@ + +%.eep: %.elf + $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ + --change-section-lma .eeprom=0 -O $(FORMAT) $< $@ + +%.elf: $(OBJ) + $(CC) $(CFLAGS) $(OBJ) -o $@ $(LDFLAGS) + +%.o: %.c lights.h Makefile + $(CC) -c $(CFLAGS) $< -o $@ + +%.s: %.c lights.h Makefile + $(CC) -S -c $(CFLAGS) $< -o $@ + +%.o: %.S + $(CC) -c $(CFLAGS) $< -o $@ + +clean: + rm -f *.o $(PROGRAM).hex $(PROGRAM).eep $(PROGRAM).elf + +version.c: + ./version.pl > version.c + +.PHONY: all clean dump_eeprom program program_flash program_eeprom objdump \ + version.c + diff --git a/firmware.c b/firmware/firmware.c similarity index 100% rename from firmware.c rename to firmware/firmware.c diff --git a/rs485.c b/firmware/rs485.c similarity index 100% rename from rs485.c rename to firmware/rs485.c diff --git a/rs485.h b/firmware/rs485.h similarity index 100% rename from rs485.h rename to firmware/rs485.h diff --git a/hc-sr04.scad b/things/hc-sr04.scad similarity index 100% rename from hc-sr04.scad rename to things/hc-sr04.scad diff --git a/semaphore.scad b/things/semaphore.scad similarity index 100% rename from semaphore.scad rename to things/semaphore.scad