A squashed, should only change a few lines and no mucking about with submodules

This commit is contained in:
bbkiwi 2019-04-24 22:07:28 +12:00
parent 0a172502fe
commit 80d6b40a7d
4 changed files with 8 additions and 8 deletions

View file

@ -6,9 +6,9 @@
#define HPABUFFSIZE 512
#define CCEMBEDDED
#define NUM_LIN_LEDS 541
#define NUM_LIN_LEDS 16
#define DFREQ 16000
#define LUXETRON 0
#define memcpy ets_memcpy
#define memset ets_memset

View file

@ -45,9 +45,8 @@ 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 LUXETRON
#ifdef LUXETRON
#if LUXETRON == 1
#define INVERT
#define WS_I2S_BCK 14
#define WS_I2S_DIV 5

View file

@ -192,6 +192,7 @@ void UpdateOutputBins32()
isps = isps<0? -isps : isps;
ispc = ispc<0? -ispc : ispc;
uint32_t rmux = isps>ispc? isps + (ispc>>1) : ispc + (isps>>1);
rmux = rmux>>16;
#else
uint32_t rmux = ( (isps) * (isps)) + ((ispc) * (ispc));
rmux = SquareRootRounded( rmux );

View file

@ -61,17 +61,17 @@ void UpdateLinearLEDs()
{
if( note_peak_freqs[ sorted_note_map[j] ] > nff )
{
break;
break; // so j is correct place to insert
}
}
for( k = sorted_map_count; k > j; k-- )
for( k = sorted_map_count; k > j; k-- ) // make room
{
sorted_note_map[k] = sorted_note_map[k-1];
}
sorted_note_map[j] = i;
sorted_note_map[j] = i; // insert in correct place
#else
sorted_note_map[sorted_map_count] = i; // insert at end
#endif
sorted_note_map[sorted_map_count] = i;
sorted_map_count++;
}