From 3d64506fbac239f24917c15c817db52be97d93f3 Mon Sep 17 00:00:00 2001 From: William Toohey Date: Sun, 8 Jan 2017 21:35:47 +1000 Subject: [PATCH] Rename firmware folder --- Firmware/{Keyboard => PocketVoltex}/Config.c | 0 Firmware/{Keyboard => PocketVoltex}/Config.h | 0 .../Config/LUFAConfig.h | 0 .../DFU/hid_bootloader_loader.py | 0 .../{Keyboard => PocketVoltex}/Descriptors.c | 0 .../{Keyboard => PocketVoltex}/Descriptors.h | 0 Firmware/{Keyboard => PocketVoltex}/Encoder.c | 0 Firmware/{Keyboard => PocketVoltex}/Encoder.h | 0 .../{Keyboard => PocketVoltex}/FollowerGen.py | 0 Firmware/{Keyboard => PocketVoltex}/LED.c | 0 Firmware/{Keyboard => PocketVoltex}/LED.h | 0 .../{Keyboard => PocketVoltex}/LEDPatterns.c | 16 +++++++++++----- .../{Keyboard => PocketVoltex}/LEDPatterns.h | 0 Firmware/{Keyboard => PocketVoltex}/Macro.c | 0 Firmware/{Keyboard => PocketVoltex}/Macro.h | 2 +- .../Keyboard.c => PocketVoltex/PocketVoltex.c} | 2 +- .../Keyboard.h => PocketVoltex/PocketVoltex.h} | 0 Firmware/{Keyboard => PocketVoltex}/asciihid.c | 0 Firmware/{Keyboard => PocketVoltex}/asciihid.h | 0 Firmware/{Keyboard => PocketVoltex}/makefile | 4 ++-- 20 files changed, 15 insertions(+), 9 deletions(-) rename Firmware/{Keyboard => PocketVoltex}/Config.c (100%) rename Firmware/{Keyboard => PocketVoltex}/Config.h (100%) rename Firmware/{Keyboard => PocketVoltex}/Config/LUFAConfig.h (100%) rename Firmware/{Keyboard => PocketVoltex}/DFU/hid_bootloader_loader.py (100%) rename Firmware/{Keyboard => PocketVoltex}/Descriptors.c (100%) rename Firmware/{Keyboard => PocketVoltex}/Descriptors.h (100%) rename Firmware/{Keyboard => PocketVoltex}/Encoder.c (100%) rename Firmware/{Keyboard => PocketVoltex}/Encoder.h (100%) rename Firmware/{Keyboard => PocketVoltex}/FollowerGen.py (100%) rename Firmware/{Keyboard => PocketVoltex}/LED.c (100%) rename Firmware/{Keyboard => PocketVoltex}/LED.h (100%) rename Firmware/{Keyboard => PocketVoltex}/LEDPatterns.c (94%) rename Firmware/{Keyboard => PocketVoltex}/LEDPatterns.h (100%) rename Firmware/{Keyboard => PocketVoltex}/Macro.c (100%) rename Firmware/{Keyboard => PocketVoltex}/Macro.h (90%) rename Firmware/{Keyboard/Keyboard.c => PocketVoltex/PocketVoltex.c} (99%) rename Firmware/{Keyboard/Keyboard.h => PocketVoltex/PocketVoltex.h} (100%) rename Firmware/{Keyboard => PocketVoltex}/asciihid.c (100%) rename Firmware/{Keyboard => PocketVoltex}/asciihid.h (100%) rename Firmware/{Keyboard => PocketVoltex}/makefile (94%) diff --git a/Firmware/Keyboard/Config.c b/Firmware/PocketVoltex/Config.c similarity index 100% rename from Firmware/Keyboard/Config.c rename to Firmware/PocketVoltex/Config.c diff --git a/Firmware/Keyboard/Config.h b/Firmware/PocketVoltex/Config.h similarity index 100% rename from Firmware/Keyboard/Config.h rename to Firmware/PocketVoltex/Config.h diff --git a/Firmware/Keyboard/Config/LUFAConfig.h b/Firmware/PocketVoltex/Config/LUFAConfig.h similarity index 100% rename from Firmware/Keyboard/Config/LUFAConfig.h rename to Firmware/PocketVoltex/Config/LUFAConfig.h diff --git a/Firmware/Keyboard/DFU/hid_bootloader_loader.py b/Firmware/PocketVoltex/DFU/hid_bootloader_loader.py similarity index 100% rename from Firmware/Keyboard/DFU/hid_bootloader_loader.py rename to Firmware/PocketVoltex/DFU/hid_bootloader_loader.py diff --git a/Firmware/Keyboard/Descriptors.c b/Firmware/PocketVoltex/Descriptors.c similarity index 100% rename from Firmware/Keyboard/Descriptors.c rename to Firmware/PocketVoltex/Descriptors.c diff --git a/Firmware/Keyboard/Descriptors.h b/Firmware/PocketVoltex/Descriptors.h similarity index 100% rename from Firmware/Keyboard/Descriptors.h rename to Firmware/PocketVoltex/Descriptors.h diff --git a/Firmware/Keyboard/Encoder.c b/Firmware/PocketVoltex/Encoder.c similarity index 100% rename from Firmware/Keyboard/Encoder.c rename to Firmware/PocketVoltex/Encoder.c diff --git a/Firmware/Keyboard/Encoder.h b/Firmware/PocketVoltex/Encoder.h similarity index 100% rename from Firmware/Keyboard/Encoder.h rename to Firmware/PocketVoltex/Encoder.h diff --git a/Firmware/Keyboard/FollowerGen.py b/Firmware/PocketVoltex/FollowerGen.py similarity index 100% rename from Firmware/Keyboard/FollowerGen.py rename to Firmware/PocketVoltex/FollowerGen.py diff --git a/Firmware/Keyboard/LED.c b/Firmware/PocketVoltex/LED.c similarity index 100% rename from Firmware/Keyboard/LED.c rename to Firmware/PocketVoltex/LED.c diff --git a/Firmware/Keyboard/LED.h b/Firmware/PocketVoltex/LED.h similarity index 100% rename from Firmware/Keyboard/LED.h rename to Firmware/PocketVoltex/LED.h diff --git a/Firmware/Keyboard/LEDPatterns.c b/Firmware/PocketVoltex/LEDPatterns.c similarity index 94% rename from Firmware/Keyboard/LEDPatterns.c rename to Firmware/PocketVoltex/LEDPatterns.c index 79c8e66..54ef6c6 100644 --- a/Firmware/Keyboard/LEDPatterns.c +++ b/Firmware/PocketVoltex/LEDPatterns.c @@ -28,6 +28,9 @@ static KnobLights knobs[2] = { {{1,0,1}, {6,7}, {0, BRIGHTNESS_LEVELS-1}} }; +// TODO DEBUG DELETE +uint8_t debugG = 0, debugB = 0; + // Called every 1ms void led_frame(void) { if(++frameCounter < LED_MS_PER_FRAME) { @@ -86,15 +89,16 @@ void led_frame(void) { break; } - led_set_all(0,0,0); - for(uint8_t i = 0; i < 2; i++) { + //led_set_all(64,debugG,debugB); + // Knob lights, what shall I do with you? + /*for(uint8_t i = 0; i < 2; i++) { for(uint8_t led = 0; led < 2; led++) { uint8_t r = knobs[i].levels[led] * knobs[i].rgb[0]; uint8_t g = knobs[i].levels[led] * knobs[i].rgb[1]; uint8_t b = knobs[i].levels[led] * knobs[i].rgb[2]; led_set_max(ledCircleMap[knobs[i].leds[led]], r, g, b); } - } + }*/ } void led_knob_indiv(KnobLights* knob, int8_t value) { @@ -137,8 +141,10 @@ void led_knob_indiv(KnobLights* knob, int8_t value) { } void led_knobs_update(int8_t left, int8_t right) { - led_knob_indiv(&knobs[0], left*2); - led_knob_indiv(&knobs[1], right*2); + //led_knob_indiv(&knobs[0], left*2); + //led_knob_indiv(&knobs[1], right*2); + debugG += left; + debugB += right; } void led_anim_flash(void) { diff --git a/Firmware/Keyboard/LEDPatterns.h b/Firmware/PocketVoltex/LEDPatterns.h similarity index 100% rename from Firmware/Keyboard/LEDPatterns.h rename to Firmware/PocketVoltex/LEDPatterns.h diff --git a/Firmware/Keyboard/Macro.c b/Firmware/PocketVoltex/Macro.c similarity index 100% rename from Firmware/Keyboard/Macro.c rename to Firmware/PocketVoltex/Macro.c diff --git a/Firmware/Keyboard/Macro.h b/Firmware/PocketVoltex/Macro.h similarity index 90% rename from Firmware/Keyboard/Macro.h rename to Firmware/PocketVoltex/Macro.h index 375ab50..b9cfb5e 100644 --- a/Firmware/Keyboard/Macro.h +++ b/Firmware/PocketVoltex/Macro.h @@ -3,7 +3,7 @@ #include "Config.h" #include "asciihid.h" -#include "Keyboard.h" +#include "PocketVoltex.h" extern sdvx_config_t sdvxConfig; diff --git a/Firmware/Keyboard/Keyboard.c b/Firmware/PocketVoltex/PocketVoltex.c similarity index 99% rename from Firmware/Keyboard/Keyboard.c rename to Firmware/PocketVoltex/PocketVoltex.c index bdf9950..0a7c95c 100644 --- a/Firmware/Keyboard/Keyboard.c +++ b/Firmware/PocketVoltex/PocketVoltex.c @@ -1,4 +1,4 @@ -#include "Keyboard.h" +#include "PocketVoltex.h" #include "Config.h" #include "Encoder.h" #include "LED.h" diff --git a/Firmware/Keyboard/Keyboard.h b/Firmware/PocketVoltex/PocketVoltex.h similarity index 100% rename from Firmware/Keyboard/Keyboard.h rename to Firmware/PocketVoltex/PocketVoltex.h diff --git a/Firmware/Keyboard/asciihid.c b/Firmware/PocketVoltex/asciihid.c similarity index 100% rename from Firmware/Keyboard/asciihid.c rename to Firmware/PocketVoltex/asciihid.c diff --git a/Firmware/Keyboard/asciihid.h b/Firmware/PocketVoltex/asciihid.h similarity index 100% rename from Firmware/Keyboard/asciihid.h rename to Firmware/PocketVoltex/asciihid.h diff --git a/Firmware/Keyboard/makefile b/Firmware/PocketVoltex/makefile similarity index 94% rename from Firmware/Keyboard/makefile rename to Firmware/PocketVoltex/makefile index 1c2b2b5..4a3c460 100644 --- a/Firmware/Keyboard/makefile +++ b/Firmware/PocketVoltex/makefile @@ -17,7 +17,7 @@ BOARD = USER F_CPU = 16000000 F_USB = $(F_CPU) OPTIMIZATION = s -TARGET = Keyboard +TARGET = PocketVoltex SRC = $(TARGET).c asciihid.c Descriptors.c Config.c Encoder.c LED.c LEDPatterns.c Macro.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) LUFA_PATH = ../LUFA CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ @@ -65,4 +65,4 @@ flashboot: $(AVRDUDE) -U flash:w:DFU/BootloaderHID.hex:i flash: all - python DFU/hid_bootloader_loader.py atmega16u2 Keyboard.hex + python DFU/hid_bootloader_loader.py atmega16u2 PocketVoltex.hex