fruchti/colorchord
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add image files and update to newest everything.

Browse source
This commit is contained in:
cnlohr 2017-09-10 23:10:37 -04:00
parent 71fd5c5aee
commit 1d86a1c52e
7 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
embedded8266/ccconfig.h
View file

@ -29,6 +29,7 @@
#define USE_NUM_LIN_LEDS CCS.gUSE_NUM_LIN_LEDS
#define COLORCHORD_OUTPUT_DRIVER CCS.gCOLORCHORD_OUTPUT_DRIVER
#define COLORCHORD_ACTIVE CCS.gCOLORCHORD_ACTIVE
#define INITIAL_AMP CCS.gINITIAL_AMP
//We are not enabling these for the ESP8266 port.
#define LIN_WRAPAROUND 0
@ -54,6 +55,7 @@ struct CCSettings
uint8_t gUSE_NUM_LIN_LEDS; // = NUM_LIN_LEDS
uint8_t gCOLORCHORD_ACTIVE;
uint8_t gCOLORCHORD_OUTPUT_DRIVER;
uint8_t gINITIAL_AMP;
};
extern struct CCSettings CCS;

2
embedded8266/esp82xx

@ -1 +1 @@
Subproject commit 6666ee94f388b9038fc9382b813287be65c20283
Subproject commit 248dcac4022bf1e3d3574f2f49626c99d794dd06

BIN
embedded8266/image.elf-0x00000.bin Normal file
View file

Binary file not shown.

BIN
embedded8266/image.elf-0x40000.bin Normal file
View file

Binary file not shown.

2
embedded8266/user.cfg
View file

@ -15,7 +15,7 @@ ESP_GCC_VERS = 4.8.5
#SDK = $(HOME)/esp8266/esp_iot_sdk_v1.5.2
PAGE_SCRIPTS = main.js
FWBURNFLAGS = -b 1500000
FWBURNFLAGS = -b 2000000
OPTS += -DICACHE_FLASH
OPTS += -DDISABLE_CHARRX #Saves about 48 bytes.

8
embedded8266/user/custom_commands.c
View file

@ -11,7 +11,7 @@ extern volatile uint8_t sounddata[];
extern volatile uint16_t soundhead;
#define CONFIGURABLES 17 //(plus1)
#define CONFIGURABLES 18 //(plus1)
struct SaveLoad
@ -22,17 +22,17 @@ struct SaveLoad
struct CCSettings CCS;
uint8_t gConfigDefaults[CONFIGURABLES] = { 0, 6, 1, 2, 3, 4, 7, 4, 2, 80, 64, 12, 15, NUM_LIN_LEDS, 1, 0, 0 };
uint8_t gConfigDefaults[CONFIGURABLES] = { 0, 6, 1, 2, 3, 4, 7, 4, 2, 80, 64, 12, 15, NUM_LIN_LEDS, 1, 0, 16, 0 };
uint8_t * gConfigurables[CONFIGURABLES] = { &CCS.gROOT_NOTE_OFFSET, &CCS.gDFTIIR, &CCS.gFUZZ_IIR_BITS, &CCS.gFILTER_BLUR_PASSES,
&CCS.gSEMIBITSPERBIN, &CCS.gMAX_JUMP_DISTANCE, &CCS.gMAX_COMBINE_DISTANCE, &CCS.gAMP_1_IIR_BITS,
&CCS.gAMP_2_IIR_BITS, &CCS.gMIN_AMP_FOR_NOTE, &CCS.gMINIMUM_AMP_FOR_NOTE_TO_DISAPPEAR, &CCS.gNOTE_FINAL_AMP,
&CCS.gNERF_NOTE_PORP, &CCS.gUSE_NUM_LIN_LEDS, &CCS.gCOLORCHORD_ACTIVE, &CCS.gCOLORCHORD_OUTPUT_DRIVER, 0 };
&CCS.gNERF_NOTE_PORP, &CCS.gUSE_NUM_LIN_LEDS, &CCS.gCOLORCHORD_ACTIVE, &CCS.gCOLORCHORD_OUTPUT_DRIVER, &CCS.gINITIAL_AMP, 0 };
char * gConfigurableNames[CONFIGURABLES] = { "gROOT_NOTE_OFFSET", "gDFTIIR", "gFUZZ_IIR_BITS", "gFILTER_BLUR_PASSES",
"gSEMIBITSPERBIN", "gMAX_JUMP_DISTANCE", "gMAX_COMBINE_DISTANCE", "gAMP_1_IIR_BITS",
"gAMP_2_IIR_BITS", "gMIN_AMP_FOR_NOTE", "gMINIMUM_AMP_FOR_NOTE_TO_DISAPPEAR", "gNOTE_FINAL_AMP",
"gNERF_NOTE_PORP", "gUSE_NUM_LIN_LEDS", "gCOLORCHORD_ACTIVE", "gCOLORCHORD_OUTPUT_DRIVER", 0 };
"gNERF_NOTE_PORP", "gUSE_NUM_LIN_LEDS", "gCOLORCHORD_ACTIVE", "gCOLORCHORD_OUTPUT_DRIVER", "gINITIAL_AMP", 0 };
void ICACHE_FLASH_ATTR CustomStart( )
{

6
embedded8266/user/user_main.c
View file

@ -99,9 +99,11 @@ static void procTask(os_event_t *events)
#endif
while( soundtail != soundhead )
{
int16_t samp = sounddata[soundtail];
int32_t samp = sounddata[soundtail];
samp_iir = samp_iir - (samp_iir>>10) + samp;
PushSample32( (samp - (samp_iir>>10))*16 );
samp = (samp - (samp_iir>>10))*16;
samp = (samp * CCS.gINITIAL_AMP) >> 4;
PushSample32( samp );
soundtail = (soundtail+1)&(HPABUFFSIZE-1);
wf++;