From e30f2ba0c773b4b087da97b8ec57a0a1625972b9 Mon Sep 17 00:00:00 2001 From: MightyPork Date: Tue, 23 Dec 2014 16:41:05 +0100 Subject: [PATCH] typo fix in folder name, deleted old proj from devel --- devel/colorchase/lib | 1 - .../Makefile | 0 devel/{colorchase-anim => gamepad-test}/lib | 0 .../{colorchase-anim => gamepad-test}/main.c | 0 .../alive-color-wheel}/Makefile | 0 .../README.md | 0 .../lib/arduino_pins.h | 0 .../lib/calc.h | 0 .../lib/colors.h | 0 .../lib/debounce.h | 0 .../lib/meta.h | 0 .../lib/nsdelay.h | 0 .../lib/pins.h | 0 .../lib/ws2812.h | 0 .../alive-color-wheel}/main.c | 0 projects/alive-color-whell/Makefile | 166 ------------------ projects/alive-color-whell/main.c | 116 ------------ 17 files changed, 283 deletions(-) delete mode 120000 devel/colorchase/lib rename devel/{colorchase-anim => gamepad-test}/Makefile (100%) rename devel/{colorchase-anim => gamepad-test}/lib (100%) rename devel/{colorchase-anim => gamepad-test}/main.c (100%) rename {devel/colorchase => projects/alive-color-wheel}/Makefile (100%) rename projects/{alive-color-whell => alive-color-wheel}/README.md (100%) rename projects/{alive-color-whell => alive-color-wheel}/lib/arduino_pins.h (100%) rename projects/{alive-color-whell => alive-color-wheel}/lib/calc.h (100%) rename projects/{alive-color-whell => alive-color-wheel}/lib/colors.h (100%) rename projects/{alive-color-whell => alive-color-wheel}/lib/debounce.h (100%) rename projects/{alive-color-whell => alive-color-wheel}/lib/meta.h (100%) rename projects/{alive-color-whell => alive-color-wheel}/lib/nsdelay.h (100%) rename projects/{alive-color-whell => alive-color-wheel}/lib/pins.h (100%) rename projects/{alive-color-whell => alive-color-wheel}/lib/ws2812.h (100%) rename {devel/colorchase => projects/alive-color-wheel}/main.c (100%) delete mode 100644 projects/alive-color-whell/Makefile delete mode 100644 projects/alive-color-whell/main.c diff --git a/devel/colorchase/lib b/devel/colorchase/lib deleted file mode 120000 index dc598c5..0000000 --- a/devel/colorchase/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/devel/colorchase-anim/Makefile b/devel/gamepad-test/Makefile similarity index 100% rename from devel/colorchase-anim/Makefile rename to devel/gamepad-test/Makefile diff --git a/devel/colorchase-anim/lib b/devel/gamepad-test/lib similarity index 100% rename from devel/colorchase-anim/lib rename to devel/gamepad-test/lib diff --git a/devel/colorchase-anim/main.c b/devel/gamepad-test/main.c similarity index 100% rename from devel/colorchase-anim/main.c rename to devel/gamepad-test/main.c diff --git a/devel/colorchase/Makefile b/projects/alive-color-wheel/Makefile similarity index 100% rename from devel/colorchase/Makefile rename to projects/alive-color-wheel/Makefile diff --git a/projects/alive-color-whell/README.md b/projects/alive-color-wheel/README.md similarity index 100% rename from projects/alive-color-whell/README.md rename to projects/alive-color-wheel/README.md diff --git a/projects/alive-color-whell/lib/arduino_pins.h b/projects/alive-color-wheel/lib/arduino_pins.h similarity index 100% rename from projects/alive-color-whell/lib/arduino_pins.h rename to projects/alive-color-wheel/lib/arduino_pins.h diff --git a/projects/alive-color-whell/lib/calc.h b/projects/alive-color-wheel/lib/calc.h similarity index 100% rename from projects/alive-color-whell/lib/calc.h rename to projects/alive-color-wheel/lib/calc.h diff --git a/projects/alive-color-whell/lib/colors.h b/projects/alive-color-wheel/lib/colors.h similarity index 100% rename from projects/alive-color-whell/lib/colors.h rename to projects/alive-color-wheel/lib/colors.h diff --git a/projects/alive-color-whell/lib/debounce.h b/projects/alive-color-wheel/lib/debounce.h similarity index 100% rename from projects/alive-color-whell/lib/debounce.h rename to projects/alive-color-wheel/lib/debounce.h diff --git a/projects/alive-color-whell/lib/meta.h b/projects/alive-color-wheel/lib/meta.h similarity index 100% rename from projects/alive-color-whell/lib/meta.h rename to projects/alive-color-wheel/lib/meta.h diff --git a/projects/alive-color-whell/lib/nsdelay.h b/projects/alive-color-wheel/lib/nsdelay.h similarity index 100% rename from projects/alive-color-whell/lib/nsdelay.h rename to projects/alive-color-wheel/lib/nsdelay.h diff --git a/projects/alive-color-whell/lib/pins.h b/projects/alive-color-wheel/lib/pins.h similarity index 100% rename from projects/alive-color-whell/lib/pins.h rename to projects/alive-color-wheel/lib/pins.h diff --git a/projects/alive-color-whell/lib/ws2812.h b/projects/alive-color-wheel/lib/ws2812.h similarity index 100% rename from projects/alive-color-whell/lib/ws2812.h rename to projects/alive-color-wheel/lib/ws2812.h diff --git a/devel/colorchase/main.c b/projects/alive-color-wheel/main.c similarity index 100% rename from devel/colorchase/main.c rename to projects/alive-color-wheel/main.c diff --git a/projects/alive-color-whell/Makefile b/projects/alive-color-whell/Makefile deleted file mode 100644 index 82a8c47..0000000 --- a/projects/alive-color-whell/Makefile +++ /dev/null @@ -1,166 +0,0 @@ - -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 = - -## 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 -I. -I$(EXTRA_SOURCE_DIR) -CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -CFLAGS += -Wall -Wno-main -Wno-strict-prototypes -Wno-comment -CFLAGS += -g2 -Wextra -pedantic -Wfatal-errors -CFLAGS += -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--relax - -CFLAGS_BUILD = $(CFLAGS) -Os - -# 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))) -SRC1 = $(TARGET).c -SRC = $(SRC1) -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 -pre: $(TARGET).pre - -%.hex: %.elf - $(OBJCOPY) -R .eeprom -O ihex $< $@ - -%.elf: $(SRC) - $(CC) $(CFLAGS_BUILD) $(SRC) --output $@ - -%.pre: $(SRC1) - $(CC) $(CFLAGS) -E $(SRC1) --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 -lst: 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 diff --git a/projects/alive-color-whell/main.c b/projects/alive-color-whell/main.c deleted file mode 100644 index ac3a90c..0000000 --- a/projects/alive-color-whell/main.c +++ /dev/null @@ -1,116 +0,0 @@ -#include -#include -#include -#include -#include - -#include "lib/meta.h" -#include "lib/arduino_pins.h" -#include "lib/calc.h" -#include "lib/colors.h" -#include "lib/ws2812.h" - -#define WS1 D10 - -void render(); -void init_karts(); -void move_karts(); - - -void SECTION(".init8") init_io() -{ - // led strip data - as_output(WS1); - - // setup timer 10 ms - TCCR0A = _BV(WGM01); // CTC - TCCR0B = _BV(CS02) | _BV(CS00); // prescaler 512 - OCR0A = 100; // interrupt every 10 ms 156 - sbi(TIMSK0, OCIE0A); - sei(); -} - -/** timer 0 interrupt vector */ -ISR(TIMER0_COMPA_vect) -{ - move_karts(); - render(); -} - - -/** Unsigned int range struct */ -typedef struct { - uint8_t a; - uint8_t b; - int8_t dir; - uint8_t steptime; - uint8_t stepcnt; - xrgb_t color; -} kart_t; - -#define BLACK xrgb(0,0,0) - -#define karts_len 6 -#define screen_len 72 -kart_t karts[karts_len]; -xrgb_t screen[screen_len]; - - -void init_karts() -{ - karts[0] = (kart_t) { .a=0, .b=17, .dir=1, .steptime=2, .stepcnt=0, .color=xrgb(50, 0, 0) }; - karts[1] = (kart_t) { .a=10, .b=19, .dir=1, .steptime=3, .stepcnt=0, .color=xrgb(0, 50, 0) }; - karts[2] = (kart_t) { .a=20, .b=29, .dir=1, .steptime=7, .stepcnt=0, .color=xrgb(0, 0, 50) }; - karts[3] = (kart_t) { .a=40, .b=52, .dir=-1, .steptime=2, .stepcnt=0, .color=xrgb(50, 0, 50) }; - karts[4] = (kart_t) { .a=50, .b=69, .dir=-1, .steptime=11, .stepcnt=0, .color=xrgb(0, 20, 20) }; - karts[5] = (kart_t) { .a=25, .b=37, .dir=-1, .steptime=1, .stepcnt=0, .color=xrgb(60, 30, 0) }; - karts[5] = (kart_t) { .a=17, .b=25, .dir=1, .steptime=5, .stepcnt=0, .color=xrgb(25, 25, 0) }; -} - - -void move_karts() -{ - for (uint8_t j = 0; j < karts_len; j++) { - if (++karts[j].stepcnt >= karts[j].steptime) { - // move yo ass - - if (karts[j].dir > 0) { - inc_wrap(karts[j].a, 0, screen_len - 1); - inc_wrap(karts[j].b, 0, screen_len - 1); - } else { - dec_wrap(karts[j].a, 0, screen_len - 1); - dec_wrap(karts[j].b, 0, screen_len - 1); - } - - karts[j].stepcnt = 0; - } - } -} - - -void render() -{ - // build the screen - - // for each pixel - for (uint8_t i = 0; i < screen_len; i++) { - screen[i] = BLACK; - // for each kart - for (uint8_t j = 0; j < karts_len; j++) { - if (in_range_wrap(i, karts[j].a, karts[j].b)) { - screen[i] = add_xrgb(screen[i], karts[j].color); - } - } - } - - for (uint8_t i = 0; i < screen_len; i++) { - ws_send_xrgb(WS1, screen[i]); - } -} - - -void main() -{ - init_karts(); - while(1) {} // Timer interrupts do the rest -}