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

Separate out code to handle web menu interface.

Browse source
This commit is contained in:
cnlohr 2015-08-08 00:20:22 -04:00
parent 6967f23349
commit 3b00d9e087
8 changed files with 597 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

4
embedded8266/user/user_main.c
View file

@ -83,8 +83,6 @@ static void procTask(os_event_t *events)
hpa_running = 0;
}
CSTick( 0 );
//For profiling so we can see how much CPU is spent in this loop.
#ifdef PROFILE
WRITE_PERI_REG( PERIPHS_GPIO_BASEADDR + GPIO_ID_PIN(0), 1 );
@ -109,6 +107,8 @@ static void procTask(os_event_t *events)
if( events->sig == 0 && events->par == 0 )
{
CSTick( 0 );
//Idle Event.
struct station_config wcfg;
char stret[256];

75
embedded8266/user/ws2812_i2s.c
View file

@ -45,8 +45,16 @@ Extra copyright info:
//Creates an I2S SR of 93,750 Hz, or 3 MHz Bitclock (.333us/sample)
// 12000000L/(div*bestbck*2)
//It is likely you could speed this up a little.
#define WS_I2S_BCK 16
#ifdef WS2812_THREE_SAMPLE
#define WS_I2S_BCK 22 //Seems to work as low as 19, but is shakey at 18.
#define WS_I2S_DIV 4
#elif defined( WS2812_FOUR_SAMPLE )
#define WS_I2S_BCK 17 //Seems to work as low as 14, shoddy at 13.
#define WS_I2S_DIV 4
#else
#error You need to either define WS2812_THREE_SAMPLE or WS2812_FOUR_SAMPLE
#endif
#ifndef i2c_bbpll
#define i2c_bbpll 0x67
@ -400,7 +408,16 @@ void ICACHE_FLASH_ATTR ws2812_init()
//All functions below this line are Public Domain 2015 Charles Lohr.
//this code may be used by anyone in any way without restriction or limitation.
#ifdef WS2812_THREE_SAMPLE
static const uint16_t bitpatterns[16] = {
0b100100100100, 0b100100100110, 0b100100110100, 0b100100110110,
0b100110100100, 0b100110100110, 0b100110110100, 0b100110110110,
0b110100100100, 0b110100100110, 0b110100110100, 0b110100110110,
0b110110100100, 0b110110100110, 0b110110110100, 0b110110110110,
};
#elif defined(WS2812_FOUR_SAMPLE)
//Tricky, send out WS2812 bits with coded pulses, one nibble, then the other.
static const uint16_t bitpatterns[16] = {
0b1000100010001000, 0b1000100010001110, 0b1000100011101000, 0b1000100011101110,
@ -408,14 +425,67 @@ static const uint16_t bitpatterns[16] = {
0b1110100010001000, 0b1110100010001110, 0b1110100011101000, 0b1110100011101110,
0b1110111010001000, 0b1110111010001110, 0b1110111011101000, 0b1110111011101110,
};
#endif
void ws2812_push( uint8_t * buffer, uint16_t buffersize )
{
uint16_t * bufferpl = (uint16_t*)&i2sBlock[0];
uint16_t place;
// while( !ws2812_dma_complete );
#ifdef WS2812_THREE_SAMPLE
uint8_t * bufferpl = (uint8_t*)&i2sBlock[0];
// buffersize += 3;
// if( buffersize * 4 + 1 > WS_BLOCKSIZE ) return;
int pl = 0;
int quit = 0;
//Once for each led.
for( place = 0; !quit; place++ )
{
uint8_t b;
b = buffer[pl++]; uint16_t c1a = bitpatterns[(b&0x0f)]; uint16_t c1b = bitpatterns[(b>>4)];
b = buffer[pl++]; uint16_t c2a = bitpatterns[(b&0x0f)]; uint16_t c2b = bitpatterns[(b>>4)];
b = buffer[pl++]; uint16_t c3a = bitpatterns[(b&0x0f)]; uint16_t c3b = bitpatterns[(b>>4)];
b = buffer[pl++]; uint16_t c4a = bitpatterns[(b&0x0f)]; uint16_t c4b = bitpatterns[(b>>4)];
if( pl >= buffersize )
{
quit = 1;
if( pl-1 >= buffersize ) c4a = c4b = 0;
if( pl-2 >= buffersize ) c3a = c3b = 0;
if( pl-3 >= buffersize ) c2a = c2b = 0;
if( pl-4 >= buffersize ) c1a = c1b = 0;
}
//Order of bits on wire: Reverse from how they appear here.
#define STEP1(x) (c##x##b >> 4 )
#define STEP2(x) ((c##x##b << 4 ) | ( c##x##a>>8 ))
#define STEP3(x) (c##x##a & 0xff )
*(bufferpl++) = STEP1(2);
*(bufferpl++) = STEP3(1);
*(bufferpl++) = STEP2(1);
*(bufferpl++) = STEP1(1);
*(bufferpl++) = STEP2(3);
*(bufferpl++) = STEP1(3);
*(bufferpl++) = STEP3(2);
*(bufferpl++) = STEP2(2);
*(bufferpl++) = STEP3(4);
*(bufferpl++) = STEP2(4);
*(bufferpl++) = STEP1(4);
*(bufferpl++) = STEP3(3);
}
while( bufferpl < &((uint8_t*)i2sBlock)[WS_BLOCKSIZE] ) *(bufferpl++) = 0;
#elif defined(WS2812_FOUR_SAMPLE)
uint16_t * bufferpl = (uint16_t*)&i2sBlock[0];
if( buffersize * 4 > WS_BLOCKSIZE ) return;
for( place = 0; place < buffersize; place++ )
@ -424,6 +494,7 @@ void ws2812_push( uint8_t * buffer, uint16_t buffersize )
*(bufferpl++) = bitpatterns[(btosend&0x0f)];
*(bufferpl++) = bitpatterns[(btosend>>4)&0x0f];
}
#endif
#ifdef USE_2812_INTERRUPTS

12
embedded8266/user/ws2812_i2s.h
View file

@ -13,9 +13,19 @@
//#define I2SDMABUFLEN (32*2) //Length of one buffer, in 32-bit words.
//NOTE: Blocksize MUST be divisible by 4. Cannot exceed 4092
//Each LED takes up 12 block bytes.
//Each LED takes up 12 block bytes in WS2812_FOUR_SAMPLE
//Or 9 block bytes in WS2812_THREE_SAMPLE
#define WS_BLOCKSIZE 4000
//You can either have 3 or 4 samples per bit for WS2812s.
//3 sample can't go quite as fast as 4.
//3 sample uses more processing when updating than 4.
//4 takes up more RAM per LED than 3.
//3 has slightly more restrictve timing requirements.
//4 has more DMA load when running.
#define WS2812_THREE_SAMPLE
//#define WS2812_FOUR_SAMPLE
void ICACHE_FLASH_ATTR ws2812_init();
void ws2812_push( uint8_t * buffer, uint16_t buffersize ); //Buffersize = Nr LEDs * 3