SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

fix: The disabled channel used another channel's data on analog mode

Browse Source
This commit is contained in:
dreamsourcelabTAI
2023-09-26 14:32:08 +08:00
parent 765ee7723b
commit 62a29ac5f4
6 changed files with 79 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libsigrok4DSL/output/csv.c
View File

@@ -305,6 +305,9 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
int ch_cfg_dex = 0;
double hw_offset = 0;
double mapRange = 0;
double mmax = 0;
double mmin = 0;
void *ptr;
for (i = 0; i < (uint64_t)analog->num_samples; i++) {
ch_cfg_dex = 0;
@@ -321,9 +324,12 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
continue;
}
p = analog->data + i * ch_num + j;
ptr = (unsigned char*)analog->data + i * ch_num + j;
p = (unsigned char*)ptr;
hw_offset = (double)ctx->channel_offset[ch_cfg_dex];
mapRange = (ctx->channel_mmax[ch_cfg_dex] - ctx->channel_mmin[ch_cfg_dex]);
mmax = ctx->channel_mmax[ch_cfg_dex];
mmin = ctx->channel_mmin[ch_cfg_dex];
mapRange = (mmax - mmin);
vf = (hw_offset - (double)(*p)) * mapRange / max_min_ref;
g_string_append_printf(*out, "%0.5f", vf);