X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=cd895ec0a2c0a988661a470047576fc55731da7b;hb=0f8bee7162f41095ca1975fec9a87975ce5a554a;hp=f3c58dcaacb03d5c6b0f1be1a0359ee627ecce65;hpb=ca314e060f653e6a0b5ec0f58914bac4d426217f;p=libsigrok.git diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c index f3c58dca..cd895ec0 100644 --- a/src/hardware/scpi-pps/profiles.c +++ b/src/hardware/scpi-pps/profiles.c @@ -204,9 +204,9 @@ static int chroma_62000p_probe_channels(struct sr_dev_inst *sdi, channel = g_malloc0(sizeof(struct channel_spec)); channel->name = "1"; channel->voltage[0] = channel->current[0] = channel->power[0] = 0.0; - channel->voltage[1] = (float)volts; - channel->current[1] = (float)amps; - channel->power[1] = (float)watts; + channel->voltage[1] = volts; + channel->current[1] = amps; + channel->power[1] = watts; channel->voltage[2] = channel->current[2] = 0.01; channel->voltage[3] = channel->voltage[4] = 3; channel->current[3] = channel->current[4] = 4; @@ -393,9 +393,9 @@ enum philips_pm2800_modules { static const struct philips_pm2800_module_spec { /* Min, max, programming resolution. */ - float voltage[5]; - float current[5]; - float power[5]; + double voltage[5]; + double current[5]; + double power[5]; } philips_pm2800_module_specs[] = { /* Autoranging modules. */ [PM2800_MOD_30V_10A] = { { 0, 30, 0.0075, 2, 4 }, { 0, 10, 0.0025, 2, 4 }, { 0, 60 } }, @@ -481,7 +481,7 @@ static int philips_pm2800_probe_channels(struct sr_dev_inst *sdi, spec->current[0], spec->current[1], spec->power[0], spec->power[1]); (*channels)[i].name = (char *)philips_pm2800_names[i]; - memcpy(&((*channels)[i].voltage), spec, sizeof(float) * 15); + memcpy(&((*channels)[i].voltage), spec, sizeof(double) * 15); (*channel_groups)[i].name = (char *)philips_pm2800_names[i]; (*channel_groups)[i].channel_index_mask = 1 << i; (*channel_groups)[i].features = PPS_OTP | PPS_OVP | PPS_OCP;