New architecture: lora32u4ii (4f6973b8) · Commits · derf / multipass

include/arch/lora32u4ii/arch_types.h

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		#ifndef ARCH_TYPES_H
		#define ARCH_TYPES_H

		typedef uint8_t native_uint_t;
		typedef int8_t native_int_t;

		#endif

include/arch/lora32u4ii/driver/gpio.h

0 → 100644

+196 −0

Original line number	Diff line number	Diff line
		#ifndef GPIO_H
		#define GPIO_H

		#include <avr/io.h>

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

		public:
		GPIO () {}

		enum Pin : unsigned char {
		pb0 = 8,
		pb1 = 9,
		pb2 = 10,
		pb3 = 11,
		pb4 = 12,
		pb5 = 13,
		pb6 = 14,
		pb7 = 15,
		pc6 = 22,
		pc7 = 23,
		pd0 = 24,
		pd1 = 25,
		pd2 = 26,
		pd3 = 27,
		pd4 = 28,
		pd5 = 29,
		pd6 = 30,
		pd7 = 31,
		pe2 = 34,
		pe6 = 38,
		pf0 = 40,
		pf1 = 41,
		pf4 = 44,
		pf5 = 45,
		pf6 = 46,
		pf7 = 47
		};

		inline void setup() {
		DDRB = _BV(PB5);
		}
		inline volatile uint8_t * pinToPort(uint8_t pin) {
		if (pin <= pb7) {
		return &PORTB;
		}
		if (pin <= pc6) {
		return &PORTC;
		}
		return &PORTD;
		}
		inline unsigned char pinToBitmask(uint8_t pin) {
		return _BV(pin % 8);
		}
		#pragma GCC diagnostic ignored "-Wunused-parameter"
		inline void led_on(unsigned char id) {
		PORTC \|= _BV(PC7);
		}
		inline void led_off(unsigned char id) {
		PORTC &= ~_BV(PC7);
		}
		inline void led_toggle(unsigned char id) {
		PINC = _BV(PC7);
		}
		inline void input(unsigned char const pin) {
		if (pin < 8) {
		} else if (pin < 16) {
		DDRB &= ~_BV(pin - 8);
		} else if (pin < 24) {
		DDRC &= ~_BV(pin - 16);
		} else if (pin < 32) {
		DDRD &= ~_BV(pin - 24);
		} else if (pin < 40) {
		DDRE &= ~_BV(pin - 32);
		} else if (pin < 48) {
		DDRF &= ~_BV(pin - 40);
		}
		}
		#pragma GCC diagnostic pop
		inline void input(unsigned char const pin, unsigned char const pull) {
		if (pin < 8) {
		} else if (pin < 16) {
		DDRB &= ~_BV(pin - 8);
		PORTB \|= _BV(pin - 8);
		} else if (pin < 24) {
		DDRC &= ~_BV(pin - 16);
		PORTC \|= _BV(pin - 16);
		} else if (pin < 32) {
		DDRD &= ~_BV(pin - 24);
		PORTD \|= _BV(pin - 24);
		} else if (pin < 40) {
		DDRE &= ~_BV(pin - 32);
		PORTE \|= _BV(pin - 32);
		} else if (pin < 48) {
		DDRF &= ~_BV(pin - 40);
		PORTF \|= _BV(pin - 40);
		}
		}
		inline void output(unsigned char const pin) {
		if (pin < 8) {
		} else if (pin < 16) {
		DDRB \|= _BV(pin - 8);
		} else if (pin < 24) {
		DDRC \|= _BV(pin - 16);
		} else if (pin < 32) {
		DDRD \|= _BV(pin - 24);
		} else if (pin < 40) {
		DDRE \|= _BV(pin - 32);
		} else if (pin < 48) {
		DDRF \|= _BV(pin - 40);
		}
		}
		inline void output(unsigned char const pin, unsigned char const value) {
		if (pin < 8) {
		} else if (pin < 16) {
		PORTB = value ? (PORTB \| _BV(pin - 8)) : (PORTB & ~_BV(pin - 8));
		DDRB \|= _BV(pin - 8);
		} else if (pin < 24) {
		PORTC = value ? (PORTC \| _BV(pin - 16)) : (PORTC & ~_BV(pin - 16));
		DDRC \|= _BV(pin - 16);
		} else if (pin < 32) {
		PORTD = value ? (PORTD \| _BV(pin - 24)) : (PORTD & ~_BV(pin - 24));
		DDRD \|= _BV(pin - 24);
		} else if (pin < 40) {
		PORTE = value ? (PORTE \| _BV(pin - 32)) : (PORTE & ~_BV(pin - 32));
		DDRE \|= _BV(pin - 32);
		} else if (pin < 48) {
		PORTF = value ? (PORTF \| _BV(pin - 40)) : (PORTF & ~_BV(pin - 40));
		DDRF \|= _BV(pin - 40);
		}
		}
		inline unsigned char read(unsigned char const pin) {
		if (pin < 8) {
		}
		if (pin < 16) {
		return (PINB & _BV(pin - 8));
		}
		if (pin < 24) {
		return (PINC & _BV(pin - 16));
		}
		if (pin < 32) {
		return (PIND & _BV(pin - 24));
		}
		if (pin < 40) {
		return (PINE & _BV(pin - 32));
		}
		if (pin < 48) {
		return (PINF & _BV(pin - 40));
		}
		return 0;
		}
		inline void write(unsigned char const pin, unsigned char value) {
		if (pin < 8) {
		} else if (pin < 16) {
		if (value) {
		PORTB \|= _BV(pin - 8);
		} else {
		PORTB &= ~_BV(pin - 8);
		}
		} else if (pin < 24) {
		if (value) {
		PORTC \|= _BV(pin - 16);
		} else {
		PORTC &= ~_BV(pin - 16);
		}
		} else if (pin < 32) {
		if (value) {
		PORTD \|= _BV(pin - 24);
		} else {
		PORTD &= ~_BV(pin - 24);
		}
		} else if (pin < 40) {
		if (value) {
		PORTE \|= _BV(pin - 32);
		} else {
		PORTE &= ~_BV(pin - 32);
		}
		} else if (pin < 48) {
		if (value) {
		PORTF \|= _BV(pin - 40);
		} else {
		PORTF &= ~_BV(pin - 40);
		}
		}
		}
		inline void enable_int(unsigned char const pin) {
		}
		inline void disable_int(unsigned char const pin) {
		}
		};

		extern GPIO gpio;

		#endif

include/arch/lora32u4ii/driver/stdout.h

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		#ifndef STANDARDOUTPUT_H
		#define STANDARDOUTPUT_H

		#include "object/outputstream.h"

		class StandardOutput : public OutputStream {
		private:
		StandardOutput(const StandardOutput &copy);

		public:
		StandardOutput () {}
		void setup();

		virtual void put(char c) override;
		};

		extern StandardOutput kout;

		#endif

include/arch/lora32u4ii/driver/uptime.h

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		#ifndef UPTIME_H
		#define UPTIME_H

		#include <avr/io.h>

		class Uptime {
		private:
		Uptime(const Uptime &copy);
		#ifdef TIMER_S
		uint8_t seconds;
		#endif

		public:
		#ifdef TIMER_S
		Uptime () : seconds(0) {}
		#else
		Uptime () {}
		#endif
		#ifdef TIMER_S
		inline uint8_t get_s() { return seconds; }
		inline void tick_s() { seconds++; }
		#endif
		};

		extern Uptime uptime;

		#endif

src/arch/lora32u4ii/Makefile.inc

0 → 100644

+121 −0

Original line number	Diff line number	Diff line
		# vim:ft=make
		#
		# Copyright 2021 Daniel Friesel
		#
		# SPDX-License-Identifier: BSD-2-Clause

		MCU = atmega32u4
		SERIAL_PORT ?= /dev/ttyUSB0

		ifdef CONFIG_arch_lora32u4ii_cpufreq
		cpu_freq = ${CONFIG_arch_lora32u4ii_cpufreq}
		endif

		cpu_freq ?= 8000000

		COMMON_FLAGS += -Werror=overflow
		COMMON_FLAGS += -mmcu=${MCU} -DMULTIPASS_ARCH_lora32u4ii
		COMMON_FLAGS += -DF_CPU=${cpu_freq}UL
		COMMON_FLAGS += -DMULTIPASS_ARCH_HAS_I2C

		ifeq (${stack_usage}, )
		COMMON_FLAGS += -flto
		endif

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

		ARCH_SHORTNAME = avr

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

		CXX_TARGETS += src/arch/lora32u4ii/arch.cc
		CXX_TARGETS += src/arch/lora32u4ii/driver/gpio.cc
		CXX_TARGETS += src/arch/lora32u4ii/driver/stdout.cc

		# Command-line driver selection

		ifeq (${timer_s}, 1)
		CONFIG_arch_lora32u4ii_driver_uptime = y
		endif

		# Kconfig driver selection

		ifdef CONFIG_arch_lora32u4ii_driver_uptime
		COMMON_FLAGS += -DTIMER_S
		CXX_TARGETS += src/arch/lora32u4ii/driver/uptime.cc
		endif

		ifeq (${cpu_freq}, 8000000)
		uart_baud = 19200
		else ifeq (${cpu_freq}, 4000000)
		uart_baud = 19200
		else ifeq (${cpu_freq}, 2000000)
		uart_baud = 19200
		else ifeq (${cpu_freq}, 1000000)
		uart_baud = 9600
		else ifeq (${cpu_freq}, 500000)
		uart_baud = 4800
		else ifeq (${cpu_freq}, 250000)
		uart_baud = 2400
		else ifeq (${cpu_freq}, 125000)
		uart_baud = 1200
		else ifeq (${cpu_freq}, 62500)
		uart_baud = 300
		else
		uart_baud = 9600
		endif

		COMMON_FLAGS += -DBAUD=${uart_baud}UL

		OBJECTS = ${CXX_TARGETS:.cc=.o} ${C_TARGETS:.c=.o}

		%.o : %.cc \| include/config.h
		${QUIET}${CXX} ${INCLUDES} ${COMMON_FLAGS} ${CXXFLAGS} -c -o $@ ${@:.o=.cc}

		%.o : %.c \| include/config.h
		${QUIET}${CC} ${INCLUDES} ${COMMON_FLAGS} ${CFLAGS} -c -o $@ ${@:.o=.c}

		build/system.elf: ${OBJECTS}
		${QUIET}mkdir -p build
		${QUIET}${CXX} ${COMMON_FLAGS} ${CXXFLAGS} -Wl,--gc-sections -o $@ ${OBJECTS}
		${QUIET}avr-size --format=avr --mcu=${MCU} $@
		${QUIET}test $$(avr-size --format=avr --mcu=${MCU} build/system.elf \| fgrep Program \| grep -o '[0-9.]*%' \| cut -d . -f 1) -lt 100

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

		program: build/system.hex
		${QUIET}avrdude -p ${MCU} -c usbasp -U flash:w:build/system.hex

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

		cat:
		${QUIET}script/cat.py ${SERIAL_PORT} ${uart_baud} ${cpu_freq} 65536

		monitor:
		${QUIET}screen ${SERIAL_PORT} ${uart_baud}

		size: build/system.elf
		${QUIET}avr-size --format=avr --mcu=${MCU} build/system.elf \| fgrep Program \| perl -nE 'if (m{(\d+) bytes \(([0-9.]+%)}) { print("$$1;$$2;") }'
		${QUIET}avr-size --format=avr --mcu=${MCU} build/system.elf \| fgrep Data \| perl -nE 'if (m{(\d+) bytes \(([0-9.]+%)}) { print("$$1;$$2;") }'
		${QUIET}echo

		arch_help:
		@echo "lora32u4ii specific flags:"
		@echo " SERIAL_PORT = ${SERIAL_PORT}"

		arch_info:
		@echo "CPU Freq: ${cpu_freq} Hz"
		@echo "Timer Freq: ${timer_freq} Hz"
		@echo "I2C Freq: ${i2c_freq} Hz"
		@echo "Counter Overflow: 65536/255"
		@echo "Monitor: ${SERIAL_PORT} ${uart_baud}"

		.PHONY: arch_clean arch_help arch_info monitor program

Admin message