KB8PMY
/
NanoVNA
mirror of https://github.com/ttrftech/NanoVNA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add sin_cos table for 6 or 12kHz offset for dsp

Browse Source 
Add support direct clock for AIC3204 from si5351
Now possible made calibration and not reset old calibration data, just made another calibration (not need reset or disable correction).
  Open - Short calibration depend from self, need recalibrate it together.
  Load calibration possible made alone
  Isoln, Thru also depend from self, need recalibrate it together.
pull/130/head
DiSlord 6 years ago
parent b3de8f0160
commit 237a329226
4 changed files with 77 additions and 50 deletions
Show Stats Download Patch File Download Diff File

24
dsp.c
Unescape View File

@ -27,7 +27,7 @@ int16_t ref_buf[SAMPLE_LEN];
#endif
#ifdef USE_VARIABLE_OFFSET
int16_t sincos_tbl[AUDIO_SAMPLES_COUNT][2];
static int16_t sincos_tbl[AUDIO_SAMPLES_COUNT][2];
void generate_DSP_Table(int offset){
float audio_freq = AUDIO_ADC_FREQ;
// N = offset * AUDIO_SAMPLES_COUNT / audio_freq; should be integer
@ -41,9 +41,25 @@ void generate_DSP_Table(int offset){
v+=step;
}
}
#elif FREQUENCY_OFFSET==6000*(AUDIO_ADC_FREQ/AUDIO_SAMPLES_COUNT/1000)
// static Table for 12kHz IF and 96kHz ADC (or 6kHz IF and 48kHz ADC) audio ADC
static const int16_t sincos_tbl[48][2] = {
{ 6393, 32138}, { 27246, 18205}, { 32138,-6393}, { 18205,-27246},
{-6393,-32138}, {-27246,-18205}, {-32138, 6393}, {-18205, 27246},
{ 6393, 32138}, { 27246, 18205}, { 32138,-6393}, { 18205,-27246},
{-6393,-32138}, {-27246,-18205}, {-32138, 6393}, {-18205, 27246},
{ 6393, 32138}, { 27246, 18205}, { 32138,-6393}, { 18205,-27246},
{-6393,-32138}, {-27246,-18205}, {-32138, 6393}, {-18205, 27246},
{ 6393, 32138}, { 27246, 18205}, { 32138,-6393}, { 18205,-27246},
{-6393,-32138}, {-27246,-18205}, {-32138, 6393}, {-18205, 27246},
{ 6393, 32138}, { 27246, 18205}, { 32138,-6393}, { 18205,-27246},
{-6393,-32138}, {-27246,-18205}, {-32138, 6393}, {-18205, 27246},
{ 6393, 32138}, { 27246, 18205}, { 32138,-6393}, { 18205,-27246},
{-6393,-32138}, {-27246,-18205}, {-32138, 6393}, {-18205, 27246}
};
#elif FREQUENCY_OFFSET==5000*(AUDIO_ADC_FREQ/AUDIO_SAMPLES_COUNT/1000)
// static Table for 10kHz IF and 96kHz ADC (or 5kHz IF and 48kHz ADC) audio ADC
const int16_t sincos_tbl[48][2] = {
static const int16_t sincos_tbl[48][2] = {
{ 10533, 31029 }, { 27246, 18205 }, { 32698, -2143 }, { 24636, -21605 },
{ 6393, -32138 }, {-14493, -29389 }, {-29389, -14493 }, {-32138, 6393 },
{-21605, 24636 }, { -2143, 32698 }, { 18205, 27246 }, { 31029, 10533 },
@ -59,7 +75,7 @@ const int16_t sincos_tbl[48][2] = {
};
#elif FREQUENCY_OFFSET==4000*(AUDIO_ADC_FREQ/AUDIO_SAMPLES_COUNT/1000)
// static Table for 8kHz IF and 96kHz audio ADC (or 4kHz IF and 48kHz ADC) audio ADC
const int16_t sincos_tbl[48][2] = {
static const int16_t sincos_tbl[48][2] = {
{ 4277, 32488}, { 19948, 25997}, { 30274, 12540}, { 32488, -4277},
{ 25997,-19948}, { 12540,-30274}, { -4277,-32488}, {-19948,-25997},
{-30274,-12540}, {-32488, 4277}, {-25997, 19948}, {-12540, 30274},
@ -75,7 +91,7 @@ const int16_t sincos_tbl[48][2] = {
};
#elif FREQUENCY_OFFSET==3000*(AUDIO_ADC_FREQ/AUDIO_SAMPLES_COUNT/1000)
// static Table for 6kHz IF and 96kHz audio ADC (or 3kHz IF and 48kHz ADC) audio ADC
const int16_t sincos_tbl[48][2] = {
static const int16_t sincos_tbl[48][2] = {
{ 3212, 32610}, { 15447, 28899}, { 25330, 20788}, { 31357, 9512},
{ 32610, -3212}, { 28899,-15447}, { 20788,-25330}, { 9512,-31357},
{ -3212,-32610}, {-15447,-28899}, {-25330,-20788}, {-31357, -9512},

76
main.c
Unescape View File

@ -80,13 +80,11 @@ static uint16_t get_sweep_mode(void);
static void cal_interpolate(int s);
static void update_frequencies(void);
static void set_frequencies(uint32_t start, uint32_t stop, uint16_t points);
static bool sweep(bool break_on_operation);
static bool sweep(bool break_on_operation, uint16_t sweep_mode);
static void transform_domain(void);
static int32_t my_atoi(const char *p);
static uint32_t my_atoui(const char *p);
#define FREQ_HARMONICS (config.harmonic_freq_threshold)
// Obsolete, always use interpolate
#define cal_auto_interpolate TRUE
@ -128,7 +126,7 @@ static THD_FUNCTION(Thread1, arg)
while (1) {
bool completed = false;
if (sweep_mode&(SWEEP_ENABLE|SWEEP_ONCE)) {
completed = sweep(true);
completed = sweep(true, get_sweep_mode());
sweep_mode&=~SWEEP_ONCE;
} else {
__WFI();
@ -335,7 +333,7 @@ VNA_SHELL_FUNCTION(cmd_reset)
;
}
const uint8_t gain_table[][2] = {
static const uint8_t gain_table[][2] = {
{ 0, 0 }, // 1st: 0 ~ 300MHz
{ 50, 50 }, // 2nd: 300 ~ 900MHz
{ 75, 75 }, // 3th: 900 ~ 1500MHz
@ -642,18 +640,15 @@ VNA_SHELL_FUNCTION(cmd_capture)
// read pixel count at one time (PART*2 bytes required for read buffer)
(void)argc;
(void)argv;
int i, y;
int y;
#if SPI_BUFFER_SIZE < (3*LCD_WIDTH + 1)
#error "Low size of spi_buffer for cmd_capture"
#endif
// read 2 row pixel time (read buffer limit by 2/3 + 1 from spi_buffer size)
for (y = 0; y < LCD_HEIGHT; y += 2) {
// use uint16_t spi_buffer[2048] (defined in ili9341) for read buffer
uint8_t *buf = (uint8_t *)spi_buffer;
ili9341_read_memory(0, y, LCD_WIDTH, 2, 2 * LCD_WIDTH, spi_buffer);
for (i = 0; i < 4 * LCD_WIDTH; i++) {
streamPut(shell_stream, *buf++);
}
streamWrite(shell_stream, (void*)spi_buffer, 2 * LCD_WIDTH * sizeof(uint16_t));
}
}
@ -841,12 +836,11 @@ static uint16_t get_sweep_mode(void){
}
// main loop for measurement
bool sweep(bool break_on_operation)
bool sweep(bool break_on_operation, uint16_t sweep_mode)
{
int delay;
uint16_t sweep_mode = SWEEP_CH0_MEASURE|SWEEP_CH1_MEASURE;
if (p_sweep>=sweep_points || break_on_operation == false) RESET_SWEEP;
if (break_on_operation && (sweep_mode = get_sweep_mode()) == 0)
if (break_on_operation && sweep_mode == 0)
return false;
// blink LED while scanning
@ -870,7 +864,7 @@ bool sweep(bool break_on_operation)
}
if (sweep_mode & SWEEP_CH1_MEASURE){
tlv320aic3204_select(1); // CH1:TRANSMISSION, reset and begin measure
DSP_START(st_delay+delay);
DSP_START(delay+st_delay);
//================================================
// Place some code thats need execute while delay
//================================================
@ -936,22 +930,24 @@ VNA_SHELL_FUNCTION(cmd_scan)
}
sweep_points = points;
}
uint16_t mask = 0;
uint16_t sweep_mode = SWEEP_CH0_MEASURE|SWEEP_CH1_MEASURE;
if (argc == 4) {
mask = my_atoui(argv[3]);
sweep_mode = (mask>>1)&3;
}
set_frequencies(start, stop, points);
if (cal_auto_interpolate && (cal_status & CALSTAT_APPLY))
cal_interpolate(lastsaveid);
pause_sweep();
sweep(false);
sweep(false, sweep_mode);
// Output data after if set (faster data recive)
if (argc == 4) {
uint16_t mask = my_atoui(argv[3]);
if (mask) {
for (i = 0; i < points; i++) {
if (mask & 1) shell_printf("%u ", frequencies[i]);
if (mask & 2) shell_printf("%f %f ", measured[0][i][0], measured[0][i][1]);
if (mask & 4) shell_printf("%f %f ", measured[1][i][0], measured[1][i][1]);
shell_printf("\r\n");
}
if (mask) {
for (i = 0; i < points; i++) {
if (mask & 1) shell_printf("%u ", frequencies[i]);
if (mask & 2) shell_printf("%f %f ", measured[0][i][0], measured[0][i][1]);
if (mask & 4) shell_printf("%f %f ", measured[1][i][0], measured[1][i][1]);
shell_printf("\r\n");
}
}
}
@ -1403,28 +1399,30 @@ static void apply_edelay(void)
void
cal_collect(int type)
{
ensure_edit_config();
//ensure_edit_config();
active_props = &current_props;
int dst, src;
switch (type) {
case CAL_LOAD: cal_status|= CALSTAT_LOAD; dst = CAL_LOAD; src = 0; break;
case CAL_OPEN: cal_status|= CALSTAT_OPEN; dst = CAL_OPEN; src = 0; cal_status&= ~(CALSTAT_ES|CALSTAT_APPLY); break;
case CAL_SHORT: cal_status|= CALSTAT_SHORT; dst = CAL_SHORT; src = 0; cal_status&= ~(CALSTAT_ER|CALSTAT_APPLY); break;
case CAL_OPEN: cal_status|= CALSTAT_OPEN; dst = CAL_OPEN; src = 0; cal_status&= ~(CALSTAT_ES); break;
case CAL_SHORT: cal_status|= CALSTAT_SHORT; dst = CAL_SHORT; src = 0; cal_status&= ~(CALSTAT_ER); break;
case CAL_THRU: cal_status|= CALSTAT_THRU; dst = CAL_THRU; src = 1; break;
case CAL_ISOLN: cal_status|= CALSTAT_ISOLN; dst = CAL_ISOLN; src = 1; break;
default:
return;
}
// Run sweep for collect data (use minimum BANDWIDTH_100, or bigger if set)
// Run sweep for collect data (use minimum BANDWIDTH_30, or bigger if set)
uint8_t bw = config.bandwidth; // store current setting
if (bw < BANDWIDTH_100)
config.bandwidth = BANDWIDTH_100;
uint16_t status = cal_status;
if (bw < BANDWIDTH_30)
config.bandwidth = BANDWIDTH_30;
cal_status&= ~(CALSTAT_APPLY);
// Set MAX settings for sweep_points on calibrate
// if (sweep_points != POINTS_COUNT)
// set_sweep_points(POINTS_COUNT);
sweep(false);
sweep(false, src == 0 ? SWEEP_CH0_MEASURE : SWEEP_CH1_MEASURE);
config.bandwidth = bw; // restore
cal_status = status;
// Copy calibration data
memcpy(cal_data[dst], measured[src], sizeof measured[0]);
redraw_request |= REDRAW_CAL_STATUS;
@ -1448,8 +1446,9 @@ cal_done(void)
eterm_set(ETERM_ES, 0.0, 0.0);
cal_status &= ~CALSTAT_SHORT;
eterm_calc_er(-1);
} else {
} else if (!(cal_status & CALSTAT_ER)){
eterm_set(ETERM_ER, 1.0, 0.0);
} else if (!(cal_status & CALSTAT_ES)) {
eterm_set(ETERM_ES, 0.0, 0.0);
}
@ -1457,7 +1456,7 @@ cal_done(void)
eterm_set(ETERM_EX, 0.0, 0.0);
if (cal_status & CALSTAT_THRU) {
eterm_calc_et();
} else {
} else if (!(cal_status & CALSTAT_ET)) {
eterm_set(ETERM_ET, 1.0, 0.0);
}
@ -2021,13 +2020,14 @@ VNA_SHELL_FUNCTION(cmd_test)
//extern int touch_x, touch_y;
//shell_printf("adc: %d %d\r\n", touch_x, touch_y);
#endif
#if 0
while (argc > 1) {
int x, y;
int16_t x, y;
touch_position(&x, &y);
shell_printf("touch: %d %d\r\n", x, y);
chThdSleepMilliseconds(200);
}
#endif
}
VNA_SHELL_FUNCTION(cmd_gain)

7
nanovna.h
Unescape View File

@ -120,9 +120,13 @@ extern const char *info_about[];
// 5ms @ 96kHz
// Define aic3204 source clock frequency (for 8MHz used fractional multiplier, and possible little phase error)
//#define AUDIO_CLOCK_REF ( 8000000U)
#define AUDIO_CLOCK_REF (10752000U)
//#define AUDIO_CLOCK_REF (10752000U)
// Disable AIC PLL clock, use input as CODEC_CLKIN
#define AUDIO_CLOCK_REF (86016000U)
// Define ADC sample rate
#define AUDIO_ADC_FREQ (96000)
//#define AUDIO_ADC_FREQ (48000)
// Define sample count for one step measure
#define AUDIO_SAMPLES_COUNT (48)
// Buffer contain left and right channel samples (need x2)
@ -511,7 +515,6 @@ void adc_init(void);
uint16_t adc_single_read(uint32_t chsel);
void adc_start_analog_watchdogd(uint32_t chsel);
void adc_stop(void);
void adc_interrupt(void);
int16_t adc_vbat_read(void);
/*

20
tlv320aic3204.c
Unescape View File

@ -112,29 +112,37 @@ static const uint8_t conf_data[] = {
// reg, data, // PLL clock config
0x00, 0x00, // Initialize to Page 0
0x01, 0x01, // Initialize the device through software reset
0x04, 0x03, // PLL Clock Low (80MHz - 137MHz), MCLK, PLL
//=======================================================
// Configure PLL clock
// PLL_CLKIN * R * J.D
// PLL_CLK = ---------------------
// P
#if AUDIO_CLOCK_REF == 8000000U
// 8.000MHz * 10.7520 = 86.016MHz,
// MCLK = 8.000MHz * 10.7520 = 86.016MHz,
0x04, 0x03, // PLL Clock Low (80MHz - 137MHz), MCLK pin is input to PLL, PLL as CODEC_CLKIN
0x05, 0x91, // Power up PLL, P=1,R=1
0x06, 0x0a, // J=10
0x07, 0x1D, // D=7520 = 0x1D60
0x08, 0x60,
#elif AUDIO_CLOCK_REF == 10752000U
// 10.752MHz * 4 * 2.0 / 1 = 86.016MHz
// MCLK = 10.752MHz * 4 * 2.0 / 1 = 86.016MHz
0x04, 0x03, // PLL Clock Low (80MHz - 137MHz),MCLK pin is input to PLL, PLL as CODEC_CLKIN
0x05, 0x94, // Power up PLL, P=1,R=4
0x06, 0x02, // J=2
0x07, 0x00, // D=0
0x08, 0x00,
#elif AUDIO_CLOCK_REF == 86016000U
// MCLK = 86.016MHz
0x04, 0x00, // MCLK as CODEC_CLKIN
0x05, 0x00, // Power down PLL
0x06, 0x00, // J=0
0x07, 0x00, // D=0
0x08, 0x00,
#else
#error "Need set correct PLL multiplier for aic3204"
#error "Need set correct CODEC_CLKIN for aic3204"
#endif
// Configure ADC clock
// PLL_CLK
// CODEC_CLKIN
// ADC_fs = --------------------
// NADC * MADC * AOSR
#if AUDIO_ADC_FREQ == 48000
@ -200,7 +208,7 @@ static const uint8_t conf_data[] = {
static const uint8_t conf_data_unmute[] = {
// reg, data,
0x00, 0x00, // Select Page 0
0x51, 0xc0, // Power up Left and Right ADC Channels
0x51, 0xc2, // Power up Left and Right ADC Channels, ADC Volume Control Soft-Stepping disabled
0x52, 0x00, // Unmute Left and Right ADC Digital Volume Control
0x00, 0x01, // Select Page 1 (should be set as default)
};

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.