Improved lib, color system, pin system.

This commit is contained in:
2014-12-22 19:21:26 +01:00
parent 34103b7065
commit e78d91a900
34 changed files with 1593 additions and 206 deletions
+158
View File
@@ -0,0 +1,158 @@
MCU = atmega328p
F_CPU = 16000000
LFUSE = 0xFF
HFUSE = 0xDE
EFUSE = 0x05
MAIN = main.c
## If you've split your program into multiple files,
## include the additional .c source (in same directory) here
## (and include the .h files in your foo.c)
LOCAL_SOURCE = lib/ws_driver.c
## Here you can link to one more directory (and multiple .c files)
# EXTRA_SOURCE_DIR = ../AVR-Programming-Library/
EXTRA_SOURCE_DIR =
EXTRA_SOURCE_FILES =
##########------------------------------------------------------##########
########## Programmer Defaults ##########
########## Set up once, then forget about it ##########
########## (Can override. See bottom of file.) ##########
##########------------------------------------------------------##########
#19200
PROGRAMMER_TYPE = arduino
PROGRAMMER_ARGS = -b 57600 -P /dev/ttyUSB0
##########------------------------------------------------------##########
########## Makefile Magic! ##########
########## Summary: ##########
########## We want a .hex file ##########
########## Compile source files into .elf ##########
########## Convert .elf file into .hex ##########
########## You shouldn't need to edit below. ##########
##########------------------------------------------------------##########
## Defined programs / locations
CC = avr-gcc
OBJCOPY = avr-objcopy
OBJDUMP = avr-objdump
AVRSIZE = avr-size
AVRDUDE = sudo avrdude
## Compilation options, type man avr-gcc if you're curious.
CFLAGS = -std=gnu99 -mmcu=$(MCU) -DF_CPU=$(F_CPU)UL -Os -I. -I$(EXTRA_SOURCE_DIR)
CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
CFLAGS += -Wall -Wstrict-prototypes -Wno-main -Wno-strict-prototypes -Wno-comment
CFLAGS += -g2 -ggdb
CFLAGS += -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--relax
CFLAGS += -std=gnu99
# CFLAGS += -lm
## CFLAGS += -Wl,-u,vfprintf -lprintf_flt -lm ## for floating-point printf
## CFLAGS += -Wl,-u,vfprintf -lprintf_min ## for smaller printf
## Lump target and extra source files together
TARGET = $(strip $(basename $(MAIN)))
SRC = $(TARGET).c
EXTRA_SOURCE = $(addprefix $(EXTRA_SOURCE_DIR), $(EXTRA_SOURCE_FILES))
SRC += $(EXTRA_SOURCE)
SRC += $(LOCAL_SOURCE)
## List of all header files
HEADERS = $(SRC:.c=.h)
## For every .c file, compile an .o object file
OBJ = $(SRC:.c=.o)
## Generic Makefile targets. (Only .hex file is necessary)
all: $(TARGET).hex size
%.hex: %.elf
$(OBJCOPY) -R .eeprom -O ihex $< $@
%.elf: $(SRC)
$(CC) $(CFLAGS) $(SRC) --output $@
%.eeprom: %.elf
$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O ihex $< $@
debug:
@echo
@echo "Source files:" $(SRC)
@echo "MCU, F_CPU, BAUD:" $(MCU), $(F_CPU), $(BAUD)
@echo
# Optionally create listing file from .elf
# This creates approximate assembly-language equivalent of your code.
# Useful for debugging time-sensitive bits,
# or making sure the compiler does what you want.
disassemble: $(TARGET).lst
dis: disassemble
eeprom: $(TARGET).eeprom
%.lst: %.elf
$(OBJDUMP) -S $< > $@
# Optionally show how big the resulting program is
size: $(TARGET).elf
$(AVRSIZE) -C --mcu=$(MCU) $(TARGET).elf
clean:
rm -f $(TARGET).elf $(TARGET).hex $(TARGET).obj \
$(TARGET).o $(TARGET).d $(TARGET).eep $(TARGET).lst \
$(TARGET).lss $(TARGET).sym $(TARGET).map $(TARGET)~ \
$(TARGET).eeprom
squeaky_clean:
rm -f *.elf *.hex *.obj *.o *.d *.eep *.lst *.lss *.sym *.map *~
##########------------------------------------------------------##########
########## Programmer-specific details ##########
########## Flashing code to AVR using avrdude ##########
##########------------------------------------------------------##########
flash: $(TARGET).hex
$(AVRDUDE) -c $(PROGRAMMER_TYPE) -p $(MCU) $(PROGRAMMER_ARGS) -U flash:w:$<
flash_eeprom: $(TARGET).eeprom
$(AVRDUDE) -c $(PROGRAMMER_TYPE) -p $(MCU) $(PROGRAMMER_ARGS) -U eeprom:w:$<
terminal:
$(AVRDUDE) -c $(PROGRAMMER_TYPE) -p $(MCU) $(PROGRAMMER_ARGS) -nt
flash_arduino: PROGRAMMER_TYPE = arduino
flash_arduino: PROGRAMMER_ARGS =
flash_arduino: flash
flash_dragon_isp: PROGRAMMER_TYPE = dragon_isp
flash_dragon_isp: PROGRAMMER_ARGS =
flash_dragon_isp: flash
##########------------------------------------------------------##########
########## Fuse settings and suitable defaults ##########
##########------------------------------------------------------##########
## Generic
FUSE_STRING = -U lfuse:w:$(LFUSE):m -U hfuse:w:$(HFUSE):m -U efuse:w:$(EFUSE):m
fuses:
$(AVRDUDE) -c $(PROGRAMMER_TYPE) -p $(MCU) \
$(PROGRAMMER_ARGS) $(FUSE_STRING)
show_fuses:
$(AVRDUDE) -c $(PROGRAMMER_TYPE) -p $(MCU) $(PROGRAMMER_ARGS) -nv
## Called with no extra definitions, sets to defaults
set_default_fuses: FUSE_STRING = -U lfuse:w:$(LFUSE):m -U hfuse:w:$(HFUSE):m -U efuse:w:$(EFUSE):m
set_default_fuses: fuses
@@ -0,0 +1,13 @@
WS2812B RGB LED strip driving code
==================================
This code is meant for 16MHz Arduino, but should work on any 16MHz AVR. It is in plain C, not the Arduino language.
All you need is `ws_driver.c` and `ws_driver.h`, and `config.c` where you define the port / pin information.
Connection
----------
Digital pin 8 on Arduino (PB0) is connected via a 200-500 R to WS2812B data input. In parallel to the LED strip is a 500-1000 uF capacitor that takes care of smoothening the power supply. Without the cap, the LEDs will flicker.
It is recommended to use stronger power supply for the LED strip, a 30-led one takes around to 1A when fully powered.
+16
View File
@@ -0,0 +1,16 @@
#pragma once
#include "lib/arduino_pins2.h"
#define WSDATA_in D8_in
#define WSDATA_out D8_out
#define WSDATA_dir D8_dir
#define WS_T_1H 700
#define WS_T_1L 150
#define WS_T_0H 150
#define WS_T_0L 700
#define WS_T_LATCH 6000
# define DEBOUNCE_COUNT 63
#define DEBOUNCE_SLOT_COUNT 4
@@ -0,0 +1,22 @@
#pragma once
#include "lib/arduino_pins.h"
#define PIN_LEFT PIN_D2
#define DDR_LEFT DDR_D2
#define PORT_LEFT PORT_D2
#define LEFT D2
#define PIN_RIGHT PIN_D3
#define DDR_RIGHT DDR_D3
#define PORT_RIGHT PORT_D3
#define RIGHT D3
#define PIN_UP PIN_D4
#define DDR_UP DDR_D4
#define PORT_UP PORT_D4
#define UP D4
#define PIN_DOWN PIN_D5
#define DDR_DOWN DDR_D5
#define PORT_DOWN PORT_D5
#define DOWN D5
+1
View File
@@ -0,0 +1 @@
/home/ondra/devel/avr/avr-projects/lib
+89
View File
@@ -0,0 +1,89 @@
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/pgmspace.h>
#include <avr/cpufunc.h>
#include <util/delay.h>
#include <util/delay_basic.h>
#include <stdbool.h>
#include <stdint.h>
#include <math.h>
#include "lib/arduino_pins2.h"
#include "lib/utils.h"
#include "lib/ws_driver.h"
#include "lib/debounce.h"
#include "config.h"
#include "gamepad_pins.h"
void init_io() SECTION(".init8")
{
// WS2182B data pin as output
set_bit(WS_dir, OUT);
// enable pullups on input pins
set_bit(LEFT_out);
sbi(PORT_RIGHT, RIGHT);
sbi(PORT_UP, UP);
sbi(PORT_DOWN, DOWN);
// init timer
TCCR0A = _BV(WGM01); // CTC mode
TCCR0B = _BV(CS02) | _BV(CS00); // prescaler 1024
OCR0A = 250; // interrupt every 16 ms
sbi(TIMSK0, OCIE0A); // enable interrupt from timer
// set up debouncer
debounce_register(0, &PIN)
}
/** timer 0 interrupt vector */
ISR(TIM0_COMPA_vect)
{
debounce_tick();
}
typedef struct
{
uint8_t r,
uint8_t g,
uint8_t b,
} color_t;
#define RED {.r=0xFF, .g=0x00, .b=0x00}
#define GREEN {.r=0xFF, .g=0x00, .b=0x00}
#define BLUE {.r=0xFF, .g=0x00, .b=0x00}
#define YELLOW {.r=0xFF, .g=0xFF, .b=0x00}
#define MAGENTA {.r=0xFF, .g=0x00, .b=0xFF}
#define CYAN {.r=0x00, .g=0xFF, .b=0xFF}
#define BLACK {.r=0x00, .g=0x00, .b=0x00}
#define WHITE {.r=0xFF, .g=0xFF, .b=0xFF}
#define BULB_COUNT 4;
color_t bulbs[BULB_COUNT];
void show_lights()
{
for (uint8_t i = 0; i < BULB_COUNT; i++) {
ws_send_rgb(bulbs[i].r, bulbs[i].g, bulbs[i].b);
}
ws_show();
}
void main()
{
while (1) {
show_lights();
}
}