fixed error in chans setup (in f_ch_setup was adc_range value instead of channel mode). This error was breaking ADC setup process => ADC clock was internal, instead of SYN2_RISE
This commit is contained in:
BIN
BF_companion
BIN
BF_companion
Binary file not shown.
19
main.c
19
main.c
@ -161,7 +161,7 @@ static uint32_t f_ch_modes[ADC_LCH_CNT] = {X502_LCH_MODE_COMM, X502_LCH_MODE_COM
|
|||||||
//X502_LCH_MODE_ZERO
|
//X502_LCH_MODE_ZERO
|
||||||
|
|
||||||
// диапазоны измерения для каналов //
|
// диапазоны измерения для каналов //
|
||||||
static uint32_t f_ch_ranges[ADC_LCH_CNT] = {X502_ADC_RANGE_5, X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5};
|
static uint32_t f_ch_ranges[ADC_LCH_CNT] = {X502_ADC_RANGE_02, X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5};
|
||||||
//static uint32_t f_ch_ranges[ADC_LCH_CNT] = {X502_ADC_RANGE_1};
|
//static uint32_t f_ch_ranges[ADC_LCH_CNT] = {X502_ADC_RANGE_1};
|
||||||
//static uint32_t f_ch_ranges[ADC_LCH_CNT] = {X502_ADC_RANGE_1, X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1, X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1};
|
//static uint32_t f_ch_ranges[ADC_LCH_CNT] = {X502_ADC_RANGE_1, X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1, X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1};
|
||||||
//static uint32_t f_ch_ranges[ADC_LCH_CNT] = {X502_ADC_RANGE_5, X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5, X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5};
|
//static uint32_t f_ch_ranges[ADC_LCH_CNT] = {X502_ADC_RANGE_5, X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5, X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5};
|
||||||
@ -852,7 +852,7 @@ uint32_t X502_FlushRcv_buff(t_x502_hnd hnd){
|
|||||||
}
|
}
|
||||||
|
|
||||||
void insert_marker_to_file(char* logfilename, char* marker_text){
|
void insert_marker_to_file(char* logfilename, char* marker_text){
|
||||||
printf("marker %s \n", marker_text);
|
printf("marker %s <======================================\n", marker_text);
|
||||||
FILE* logfile_ptr = fopen(logfilename, "a");
|
FILE* logfile_ptr = fopen(logfilename, "a");
|
||||||
fprintf(logfile_ptr, "marker %s \n", marker_text);
|
fprintf(logfile_ptr, "marker %s \n", marker_text);
|
||||||
fclose(logfile_ptr);
|
fclose(logfile_ptr);
|
||||||
@ -1267,7 +1267,7 @@ int main(int argc, char** argv) {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//*
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1360,6 +1360,17 @@ int main(int argc, char** argv) {
|
|||||||
|
|
||||||
receive_to_file(hnd, logfilename, inp_buff, max_total_words);
|
receive_to_file(hnd, logfilename, inp_buff, max_total_words);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
insert_marker_to_file(logfilename, "enable SYNC_DETector");
|
insert_marker_to_file(logfilename, "enable SYNC_DETector");
|
||||||
printf("\nEnabled SYNC_DETector\n");
|
printf("\nEnabled SYNC_DETector\n");
|
||||||
BF_exec_cmd_simple(hnd, 0x8012, 2, 1); //enable FFT
|
BF_exec_cmd_simple(hnd, 0x8012, 2, 1); //enable FFT
|
||||||
@ -1412,7 +1423,7 @@ int main(int argc, char** argv) {
|
|||||||
printf("\n dbg value: ");
|
printf("\n dbg value: ");
|
||||||
BF_exec_cmd_simple(hnd, 0x800A, 10, 1);
|
BF_exec_cmd_simple(hnd, 0x800A, 10, 1);
|
||||||
|
|
||||||
|
//*/
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@ -4,7 +4,7 @@ from decimal import *
|
|||||||
from sys import argv
|
from sys import argv
|
||||||
|
|
||||||
|
|
||||||
t_x502_sync_mode = ["INTERNAL", "EXTERNAL_MASTER", "SYN1_RISE", "SYN1_FALL", "SYN2_RISE", "SYN2_FALL", "???"]
|
t_x502_sync_mode = ["INTERNAL", "EXTERNAL_MASTER", "SYN1_RISE", "SYN1_FALL", "none 1", "none 2","SYN2_RISE", "SYN2_FALL", "???"]
|
||||||
t_x502_lch_mode = ["COMM", "DIFF", "ZERO", "???"]
|
t_x502_lch_mode = ["COMM", "DIFF", "ZERO", "???"]
|
||||||
t_x502_adc_range = ["+-10V", "+-5V", "+-2V", "+-1V", "+-0.5V", "+-0.2V", "???"]
|
t_x502_adc_range = ["+-10V", "+-5V", "+-2V", "+-1V", "+-0.5V", "+-0.2V", "???"]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user