X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-4032l%2Fapi.c;h=26a9315e5035024c9559f679a950576a72246b95;hb=deb7615262ac4f9cc0750a08351afa7cbf9c34d5;hp=9da338ab1cf4a8e5c63836b312587e3dc02e66cf;hpb=3f34a40268891f36f527832f78dcc49795a38329;p=libsigrok.git diff --git a/src/hardware/hantek-4032l/api.c b/src/hardware/hantek-4032l/api.c index 9da338ab..26a9315e 100644 --- a/src/hardware/hantek-4032l/api.c +++ b/src/hardware/hantek-4032l/api.c @@ -515,7 +515,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) else cmd_pkt->sample_rate = devc->sample_rate; - /* Set pwm channel values. */ + /* Set PWM channel values. */ devc->cmd_pkt.pwm_a = h4032l_voltage2pwm(devc->cur_threshold[0]); devc->cmd_pkt.pwm_b = h4032l_voltage2pwm(devc->cur_threshold[1]); @@ -587,25 +587,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) channel = channel->next; } - /* Compress range mask value and apply range settings. */ - if (range_mask) { - cmd_pkt->trigger[0].flags.data_range_enabled = 1; - cmd_pkt->trigger[0].data_range_mask |= (range_mask); - - uint32_t new_range_value = 0; - uint32_t bit_mask = 1; - while (range_mask) { - if ((range_mask & 1) != 0) { - new_range_value <<= 1; - if ((range_value & 1) != 0) - new_range_value |= bit_mask; - bit_mask <<= 1; - } - range_mask >>= 1; - range_value >>= 1; - } - cmd_pkt->trigger[0].data_range_max |= range_value; - } + cmd_pkt->trigger[0].flags.data_range_enabled = 1; + cmd_pkt->trigger[0].data_range_mask |= range_mask; + cmd_pkt->trigger[0].data_range_max = range_value; } usb_source_add(sdi->session, drvc->sr_ctx, 1000,