Commit 29414b30 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

add timer-supported software i2c + arduino-nano timer

parent f6972a43
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -56,6 +56,11 @@ ifeq (${softi2c_pullup}, 1)
	COMMON_FLAGS += -DSOFTI2C_PULLUP
endif

ifeq (${softi2c_timer}, 1)
	arch_drivers += ,timer
	COMMON_FLAGS += -DSOFTI2C_TIMER
endif

ifeq (${kout_nop}, 1)
	COMMON_FLAGS += -DKOUT_NOP
endif
+28 −0
Original line number Diff line number Diff line
#include <avr/io.h>
#include <avr/interrupt.h>

#define ON_TIMER_INTERRUPT ISR(TIMER0_COMPA_vect)

class Timer {
	private:
		Timer(const Timer &copy);


	public:
		Timer() {}

		inline void setup(unsigned char const frequency) {
			OCR0A = frequency ? 255 / frequency : 1;
			TCCR0A = _BV(WGM01);
		}
		inline void start(unsigned char const interrupt) {
			TCNT0 = 0;
			TCCR0B = _BV(CS01) | _BV(CS00);
			if (interrupt) {
				TIMSK0 = _BV(OCIE0A);
			}
		}
		inline void stop() { TCCR0B = 0; TIMSK0 = 0; }
};

extern Timer timer;
+74 −0
Original line number Diff line number Diff line
# vim:ft=make

MCU = atmega168
PORT = /dev/ttyUSB0
BAUD = 19200

COMMON_FLAGS += -Werror=overflow
COMMON_FLAGS += -mmcu=${MCU} -DF_CPU=16000000UL -DMULTIPASS_ARCH_arduino_nano
COMMON_FLAGS += -flto
COMMON_FLAGS += -DMULTIPASS_ARCH_HAS_I2C

CC = avr-gcc
CXX = avr-g++
NM = avr-nm
OBJCOPY = avr-objcopy
OBJDUMP = avr-objdump

ifeq (${aspectc}, 1)
	CXX = ag++ -r build/repo.acp -v 0 --c_compiler avr-g++ -p . --Xcompiler
endif

TARGETS += src/arch/arduino-nano/arch.cc
TARGETS += src/arch/arduino-nano/driver/gpio.cc
TARGETS += src/arch/arduino-nano/driver/stdout.cc
TARGETS += src/arch/arduino-nano/driver/uptime.cc

ifneq ($(findstring softi2c,${drivers}), )
else ifneq ($(findstring i2c,${arch_drivers}), )
	TARGETS += src/arch/arduino-nano/driver/i2c.cc
endif

ifneq ($(findstring stdin,${arch_drivers}), )
	TARGETS += src/arch/arduino-nano/driver/stdin.cc
endif

ifneq ($(findstring timer,${arch_drivers}), )
	TARGETS += src/arch/arduino-nano/driver/timer.cc
endif

ifneq (${i2c_freq}, )
	COMMON_FLAGS += -DF_I2C=${i2c_freq}
endif

ifneq (${timer_freq}, )
	COMMON_FLAGS += -DF_TIMER=${timer_freq}
endif

OBJECTS = ${TARGETS:.cc=.o}

.cc.o:
	${CXX} ${INCLUDES} ${COMMON_FLAGS} ${CXXFLAGS} -c -o $@ ${@:.o=.cc}

build/system.elf: ${OBJECTS}
	${CXX} ${COMMON_FLAGS} ${CXXFLAGS} -Wl,--gc-sections -o $@ ${OBJECTS}
	avr-size --format=avr --mcu=${MCU} $@

build/system.hex: build/system.elf
	${OBJCOPY} -O ihex ${@:.hex=.elf} $@

program: build/system.hex
	avrdude -p ${MCU} -c arduino -P ${PORT} -b ${BAUD} -U flash:w:build/system.hex

arch_clean:
	rm -f ${OBJECTS} build/system.hex

monitor:
	screen ${PORT} 115200

arch_help:
	@echo "arduino-nano specific flags:"
	@echo "    PORT = ${PORT}"
	@echo "    BAUD = ${BAUD} (only used for programming)"

.PHONY: arch_clean arch_help monitor program
+1 −0
Original line number Diff line number Diff line
../arduino-nano/arch.cc
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
../arduino-nano/driver
 No newline at end of file
Loading