daniel/lolra
1
0
Fork 0
mirror of https://github.com/cnlohr/lolra.git synced 2026-06-17 00:09:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup - only store I/Q samples

Browse Source
This commit is contained in:
cnlohr
2024-07-07 04:00:49 -07:00
parent 0a6e76034f
commit d206128b38
1 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ch32v/ch32v203-goertzel/adcgoertzel.c
+21 -24
View File
@@ -138,8 +138,8 @@ const int32_t g_goertzel_coefficient_s = 2129111628;
int intensity_max = 1; int intensity_max = 1;
#define LOG_GOERTZEL_LIST 512 #define LOG_GOERTZEL_LIST 512
int32_t gertzellogs[LOG_GOERTZEL_LIST*2]; int16_t qibaselogs[LOG_GOERTZEL_LIST*2];
int gertzellogs_head; int qibaselogs_head;
void SetupADC() void SetupADC()
{ {
@@ -358,20 +358,32 @@ void DMA1_Channel1_IRQHandler( void )
g_goertzelp_store = goertzel - (g_goertzel_omega_per_sample>>(29-16)); g_goertzelp_store = goertzel - (g_goertzel_omega_per_sample>>(29-16));
g_goertzelp2_store = goertzelp; g_goertzelp2_store = goertzelp;
gertzellogs[gertzellogs_head++] = g_goertzelp_store; // gertzellogs[gertzellogs_head++] = g_goertzelp_store;
gertzellogs[gertzellogs_head++] = g_goertzelp2_store; // gertzellogs[gertzellogs_head++] = g_goertzelp2_store;
gertzellogs_head = gertzellogs_head & ((LOG_GOERTZEL_LIST*2)-1); // gertzellogs_head = gertzellogs_head & ((LOG_GOERTZEL_LIST*2)-1);
//
// int32_t zp = gertzellogs[glread++];
// int32_t zp2 = gertzellogs[glread++];
// int32_t rr = (((int64_t)(g_goertzel_coefficient ) * (int64_t)zp<<1)>>32) - (zp2);
// int32_t ri = (((int64_t)(g_goertzel_coefficient_s) * (int64_t)zp<<1)>>32);
int32_t zp = g_goertzelp_store; int32_t zp = g_goertzelp_store;
int32_t zp2 = g_goertzelp2_store; int32_t zp2 = g_goertzelp2_store;
int32_t rr = (((int64_t)(g_goertzel_coefficient ) * (int64_t)zp<<1)>>32) - (zp2); int32_t rr = (((int64_t)(g_goertzel_coefficient ) * (int64_t)zp<<1)>>32) - (zp2);
int32_t ri = (((int64_t)(g_goertzel_coefficient_s) * (int64_t)zp<<1)>>32); int32_t ri = (((int64_t)(g_goertzel_coefficient_s) * (int64_t)zp<<1)>>32);
qibaselogs[qibaselogs_head++] = rr;
qibaselogs[qibaselogs_head++] = ri;
qibaselogs_head = qibaselogs_head & ((LOG_GOERTZEL_LIST*2)-1);
rr>>=2; rr>>=2;
ri>>=2; ri>>=2;
int s = rr * rr + ri * ri; int s = rr * rr + ri * ri;
int intensity = 1<<( ( 32 - __builtin_clz(s) )/2); //int intensity = 1<<( ( 32 - __builtin_clz(s) )/2);
int intensity = (abs(rr) + abs(ri)) * 26100 / 32768;
intensity = (intensity + s/intensity)/2;
intensity = (intensity + s/intensity)/2; intensity = (intensity + s/intensity)/2;
intensity = (intensity + s/intensity)/2; intensity = (intensity + s/intensity)/2;
@@ -430,7 +442,7 @@ void InnerLoop()
// Only display half of the list so the other half could // Only display half of the list so the other half could
// be updated by the ISR. // be updated by the ISR.
int glread = gertzellogs_head+LOG_GOERTZEL_LIST*2/2; int glread = qibaselogs_head+LOG_GOERTZEL_LIST*2/2;
int intensity = 0; int intensity = 0;
@@ -438,18 +450,8 @@ void InnerLoop()
for( pxa = 0; pxa < LOG_GOERTZEL_LIST/2; pxa++ ) for( pxa = 0; pxa < LOG_GOERTZEL_LIST/2; pxa++ )
{ {
glread = (glread)&(LOG_GOERTZEL_LIST*2-1); glread = (glread)&(LOG_GOERTZEL_LIST*2-1);
int32_t zp = gertzellogs[glread++]; int rr = qibaselogs[glread++];
int32_t zp2 = gertzellogs[glread++]; int ri = qibaselogs[glread++];
int32_t rr = (((int64_t)(g_goertzel_coefficient ) * (int64_t)zp<<1)>>32) - (zp2);
int32_t ri = (((int64_t)(g_goertzel_coefficient_s) * (int64_t)zp<<1)>>32);
//rr>>=1;
//ri>>=1;
//int s = rr * rr + ri * ri;
//intensity = 1<<( ( 32 - __builtin_clz(s) )/2);
//intensity = (intensity + s/intensity)/2;
//intensity = (intensity + s/intensity)/2;
rr = rr * 100 / (intensity_max>>4); rr = rr * 100 / (intensity_max>>4);
ri = ri * 100 / (intensity_max>>4); ri = ri * 100 / (intensity_max>>4);
@@ -580,11 +582,6 @@ int main()
uint8_t scratchpad[256]; uint8_t scratchpad[256];