The capture contest entry from David Fries

.gitignore

@@ -1,11 +1,8 @@
+keypadContest
+keypadContest.wiki
+.*.swp
 *.d
-*.eep
-*.hex
-*.elf
-*.elf.old
-*.lss
-*.lst
-*.map
-*.sym
 *.o
-.*.swp
+moc_*.cc
+moc_*.d
+moc_*.o

include/ATtiny2313_clock.h

@@ -23,6 +23,8 @@ SOFTWARE.
 #ifndef ATtiny2313_clock_H
 #define ATtiny2313_clock_H
 
+#include <avr/io.h>
+
 /* Clock prescaler, MHz, and change logic for the ATtiny2313 assuming the
  * internal 8 MHz oscillator is selected for the clock source.
  */
@@ -45,7 +47,7 @@ SOFTWARE.
 
 /* Leave this undefined to catch non-constant (invalid) input values.
  */
-uint8_t hz_is_not_valid(void);
+uint8_t hz_is_not_valid(uint32_t hz);
 /* Takes the number of CPU cycles per second and returns the CPU prescaler
  * CLKPR value.  The hardware only supports 9 clock rates.
  * returns the prescale CLKPR value
@@ -68,7 +70,7 @@ inline uint8_t inline_cpu_hz_to_prescale(uint32_t hz)
 		hz==125000 ? CPU_125kHz :
 		hz==62500 ? CPU_62500Hz :
 		hz==31250 ? CPU_31250Hz :
-		hz_is_not_valid();
+		hz_is_not_valid(hz);
 }
 
 // Add -DF_CPU=8000000 (or a valid Hz) to the compile command line, and

src/cpu_clock/.gitignore

@@ -0,0 +1 @@
+cpu_clock

src/cpu_clock/Makefile

@@ -1,14 +1,14 @@
 MCU=attiny2313
 AVRDUDEMCU=attiny2313
-CC=avr-gcc
-CFLAGS=-g -Os -Wall -mcall-prologues -mmcu=$(MCU) -std=gnu99
+CXX=avr-g++
+CXXFLAGS=-g -Os -Wall -mcall-prologues -mmcu=$(MCU) -std=c++11
 ELF2HEX=avr-objcopy
 OBJDUMP=avr-objdump
 AVRDUDE=avrdude
 TARGET=cpu_clock
 SIZE=avr-size
 
-CFLAGS:=$(CFLAGS) -DF_CPU=8000000
+CXXFLAGS:=$(CXXFLAGS) -DF_CPU=8000000
 
 # always build
 .PHONY: all program
@@ -19,7 +19,7 @@ program : $(TARGET).hex
 	$(AVRDUDE) -p $(AVRDUDEMCU) -c usbtiny -U flash:w:$(TARGET).hex
 
 %.elf : %.o
-	$(CC) $(CFLAGS) $< -o $@
+	$(CXX) $(CXXFLAGS) $< -o $@
 
 %.hex : %.elf
 	$(ELF2HEX) -R .eeprom -O ihex $< $@

src/cpu_clock/cpu_clock.c → src/cpu_clock/cpu_clock.cc

@@ -185,4 +185,5 @@ int main(void)
 		if(leds >= 1<<10)
 			leds=1;
 	}
+	return 1;
 }

src/dfries_capture/Makefile

@@ -0,0 +1,52 @@
+MCU=attiny2313
+AVRDUDEMCU=attiny2313
+CXX=avr-g++
+CXXFLAGS=-g -Os -Wall -mcall-prologues -mmcu=$(MCU) -std=c++11
+ELF2HEX=avr-objcopy
+OBJDUMP=avr-objdump
+AVRDUDE=avrdude
+TARGET=capture
+SIZE=avr-size
+
+CXXFLAGS:=$(CXXFLAGS) -DF_CPU=8000000
+
+# always build
+.PHONY: all program
+
+all: sizebefore $(TARGET).hex $(TARGET).lss sizeafter program
+
+program : $(TARGET).hex
+	$(AVRDUDE) -p $(AVRDUDEMCU) -c usbtiny -U flash:w:$(TARGET).hex
+
+%.elf : %.o
+	$(CXX) $(CXXFLAGS) $< -o $@
+
+%.hex : %.elf
+	$(ELF2HEX) -R .eeprom -O ihex $< $@
+
+# Prints the previous and current executable sizes, useful to keep track of
+# the program growth.
+# text: program code and flash allocate data
+# data: constants used to initialize static variables, takes flash and ram
+# bss: static variables not assigned constants, ram only
+# dec: total in decimal
+# hex: total in hex
+sizebefore:
+	@cp $(TARGET).elf $(TARGET).elf.old 2> /dev/null || true
+
+sizeafter: $(TARGET).elf
+	@if test -f $(TARGET).elf; then \
+	if test -f $(TARGET).elf.old; then \
+		echo Size before:; $(SIZE) $(TARGET).elf.old; fi; \
+	if cmp --quiet $(TARGET).elf.old $(TARGET).elf; then \
+		echo Size after: file is identical; else \
+		echo Size after:; $(SIZE) $(TARGET).elf; \
+	fi 2>/dev/null; fi
+
+# extended assembly listing file
+%.lss: %.elf
+	$(OBJDUMP) -h -S -z $< > $@
+
+clean :
+	rm -f *.hex *.elf *.elf.old *.lss *.o *.d
+