ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add gamma calculation

Browse source
This commit is contained in:
TT 2016-09-19 09:50:03 +09:00
parent b0e8aee11e
commit 7c4c5a76dc
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dsp.c
View file

@ -94,9 +94,9 @@ void calclate_gamma(void)
acc_ref = __SMLAD(r0, r0, acc_ref); acc_ref = __SMLAD(r0, r0, acc_ref);
acc_ref = __SMLAD(r1, r1, acc_ref); acc_ref = __SMLAD(r1, r1, acc_ref);
} }
acc_ref = sqrt(acc_ref / SAMPLE_LEN) / 65536; //acc_ref = sqrt(acc_ref / SAMPLE_LEN) / 65536;
gamma_real = acc_r / acc_ref; gamma_real = acc_r / 65536;
gamma_imag = acc_i / acc_ref; gamma_imag = acc_i / 65536;
} }

31
main.c
View file

@ -169,13 +169,15 @@ static struct {
int16_t rx_buffer[AUDIO_BUFFER_LEN * 2]; int16_t rx_buffer[AUDIO_BUFFER_LEN * 2];
int16_t dump_buffer[AUDIO_BUFFER_LEN]; int16_t dump_buffer[AUDIO_BUFFER_LEN];
volatile int16_t request_dump = 0; volatile int16_t wait_count = 0;
int16_t dump_selection = 0; int16_t dump_selection = 0;
volatile int16_t request_calcgamma = 0; int16_t dsp_disabled = FALSE;
int32_t gamma_real; int32_t gamma_real;
int32_t gamma_imag; int32_t gamma_imag;
void i2s_end_callback(I2SDriver *i2sp, size_t offset, size_t n) void i2s_end_callback(I2SDriver *i2sp, size_t offset, size_t n)
{ {
#if PORT_SUPPORTS_RT #if PORT_SUPPORTS_RT
@ -187,25 +189,28 @@ void i2s_end_callback(I2SDriver *i2sp, size_t offset, size_t n)
(void)n; (void)n;
palClearPad(GPIOC, GPIOC_LED); palClearPad(GPIOC, GPIOC_LED);
dsp_process(p, n); if (!dsp_disabled)
dsp_process(p, n);
if (request_dump > 0) { if (wait_count > 0) {
if (dump_selection == 1) if (dump_selection == 1)
p = samp_buf; p = samp_buf;
else if (dump_selection == 2) else if (dump_selection == 2)
p = ref_buf; p = ref_buf;
else if (dump_selection == 3) else if (dump_selection == 3)
p = refiq_buf; p = refiq_buf;
if (request_dump == 1) if (wait_count == 1)
memcpy(dump_buffer, p, sizeof dump_buffer); memcpy(dump_buffer, p, sizeof dump_buffer);
--request_dump; --wait_count;
} }
#if 0
if (request_calcgamma > 0) { if (request_calcgamma > 0) {
if (request_calcgamma == 1) if (request_calcgamma == 1)
calclate_gamma(); calclate_gamma();
--request_calcgamma; --request_calcgamma;
} }
#endif
#if PORT_SUPPORTS_RT #if PORT_SUPPORTS_RT
cnt_e = port_rt_get_counter_value(); cnt_e = port_rt_get_counter_value();
@ -235,9 +240,9 @@ static void cmd_data(BaseSequentialStream *chp, int argc, char *argv[])
if (argc == 1) if (argc == 1)
dump_selection = atoi(argv[0]); dump_selection = atoi(argv[0]);
request_dump = 3; wait_count = 3;
//palClearPad(GPIOC, GPIOC_LED); //palClearPad(GPIOC, GPIOC_LED);
while (request_dump) while (wait_count)
; ;
len = AUDIO_BUFFER_LEN; len = AUDIO_BUFFER_LEN;
if (dump_selection == 1 || dump_selection == 2) if (dump_selection == 1 || dump_selection == 2)
@ -256,11 +261,13 @@ static void cmd_gamma(BaseSequentialStream *chp, int argc, char *argv[])
(void)argc; (void)argc;
(void)argv; (void)argv;
request_calcgamma = 3; wait_count = 3;
//palClearPad(GPIOC, GPIOC_LED); while (wait_count)
while (request_calcgamma)
; ;
dsp_disabled = TRUE;
calclate_gamma();
dsp_disabled = FALSE;
chprintf(chp, "%d %d\r\n", gamma_real, gamma_imag); chprintf(chp, "%d %d\r\n", gamma_real, gamma_imag);
} }