leo/power-profiler-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix offsets (ADC1_XX -> ADC_XX)

Browse Source
This commit is contained in:
leo 2023-06-17 09:35:43 +02:00
parent ce2910a0b8
commit b0a5fab264
Signed by: leo
GPG Key ID: 0DD993BFB2B307DB
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
main/measure.c
View File

@ -75,13 +75,8 @@ void cali_get_one_chunk_avg(adc_continuous_handle_t handle, unsigned nb_samples,
for(int i = 0; i < ret_nb; i++){
adc_digi_output_data_t* res = (adc_digi_output_data_t*)(&res_r[i*sizeof(adc_digi_output_data_t)]);
int index = -1;
for(int j = 0; j < nb_inputs; j++){ // meh
if(inputs[j].channel == res->type2.channel){
index = j;
break;
}
}
index = get_input_index_from_channel(res->type2.channel);
if(index == -1)
continue;
@ -113,3 +108,17 @@ void start_zero_cali(measurements_ctxt* ctxt, unsigned int nb_samples, uint32_t
offsets[i] = meas[i] / meas_nb[i];
}
}
int get_input_index_from_channel(adc_channel_t channel){
switch(channel){
case ADC_CHANNEL_3:
return 0;
case ADC_CHANNEL_0:
return 1;
case ADC_CHANNEL_1:
return 2;
default:
return -1;
}
}

1
main/measure.h
View File

@ -26,3 +26,4 @@ typedef struct {
adc_continuous_handle_t init_measurement_inputs(measurement_input inputs[], int inputs_num);
void init_conv_driver(measurement_input inputs[], int inputs_num, adc_cali_handle_t* out);
void start_zero_cali(measurements_ctxt* ctxt, unsigned int nb_samples, uint32_t offsets[]);
int get_input_index_from_channel(adc_channel_t channel);

13
main/power_profiler.c
View File

@ -65,19 +65,6 @@ static spinlock_t adc_res_mutex;
volatile uint32_t meas_res[INPUTS_NUM];
volatile uint32_t meas_nb[INPUTS_NUM];
int get_input_index_from_channel(adc_channel_t channel){
switch(channel){
case ADC1_CHANNEL_3:
return 0;
case ADC1_CHANNEL_0:
return 1;
case ADC1_CHANNEL_1:
return 2;
default:
return -1;
}
}
static bool IRAM_ATTR on_conv_done(adc_continuous_handle_t handle, const adc_continuous_evt_data_t *edata, void *user_data){
adc_digi_output_data_t* res = (adc_digi_output_data_t*)edata->conv_frame_buffer;