* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/*
return TRUE;
}
-static int parse_value(const uint8_t *buf, float *result)
+static int parse_value(const uint8_t *buf, float *result, int *exponent)
{
int i, sign, intval = 0, digits[4];
uint8_t digit_bytes[4];
/* Decimal point position. */
if ((buf[3] & (1 << 3)) != 0) {
- floatval /= 1000;
+ *exponent = -3;
sr_spew("Decimal point after first digit.");
} else if ((buf[5] & (1 << 3)) != 0) {
- floatval /= 100;
+ *exponent = -2;
sr_spew("Decimal point after second digit.");
} else if ((buf[7] & (1 << 3)) != 0) {
- floatval /= 10;
+ *exponent = -1;
sr_spew("Decimal point after third digit.");
} else {
+ *exponent = 0;
sr_spew("No decimal point in the number.");
}
}
static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
- const struct fs9721_info *info)
+ int *exponent, const struct fs9721_info *info)
{
/* Factors */
if (info->is_nano)
- *floatval /= 1000000000;
+ *exponent -= 9;
if (info->is_micro)
- *floatval /= 1000000;
+ *exponent -= 6;
if (info->is_milli)
- *floatval /= 1000;
+ *exponent -= 3;
if (info->is_kilo)
- *floatval *= 1000;
+ *exponent += 3;
if (info->is_mega)
- *floatval *= 1000000;
+ *exponent += 6;
+ *floatval *= powf(10, *exponent);
/* Measurement modes */
if (info->is_volt) {
if (info->is_auto)
analog->meaning->mqflags |= SR_MQFLAG_AUTORANGE;
if (info->is_diode)
- analog->meaning->mqflags |= SR_MQFLAG_DIODE;
+ analog->meaning->mqflags |= SR_MQFLAG_DIODE | SR_MQFLAG_DC;
if (info->is_hold)
analog->meaning->mqflags |= SR_MQFLAG_HOLD;
if (info->is_rel)
SR_PRIV int sr_fs9721_parse(const uint8_t *buf, float *floatval,
struct sr_datafeed_analog *analog, void *info)
{
- int ret;
+ int ret, exponent = 0;
struct fs9721_info *info_local;
- info_local = (struct fs9721_info *)info;
+ info_local = info;
- if ((ret = parse_value(buf, floatval)) != SR_OK) {
+ if ((ret = parse_value(buf, floatval, &exponent)) != SR_OK) {
sr_dbg("Error parsing value: %d.", ret);
return ret;
}
parse_flags(buf, info_local);
- handle_flags(analog, floatval, info_local);
+ handle_flags(analog, floatval, &exponent, info_local);
+
+ analog->encoding->digits = -exponent;
+ analog->spec->spec_digits = -exponent;
return SR_OK;
}
{
struct fs9721_info *info_local;
- info_local = (struct fs9721_info *)info;
+ info_local = info;
/* User-defined FS9721_LP3 flag 'c2c1_00' means temperature (C). */
if (info_local->is_c2c1_00) {
{
struct fs9721_info *info_local;
- info_local = (struct fs9721_info *)info;
+ info_local = info;
/* User-defined FS9721_LP3 flag 'c2c1_01' means temperature (C). */
if (info_local->is_c2c1_01) {
{
struct fs9721_info *info_local;
- info_local = (struct fs9721_info *)info;
+ info_local = info;
/* User-defined FS9721_LP3 flag 'c2c1_10' means temperature (C). */
if (info_local->is_c2c1_10) {
{
struct fs9721_info *info_local;
- info_local = (struct fs9721_info *)info;
+ info_local = info;
/* User-defined FS9721_LP3 flag 'c2c1_01' means temperature (F). */
if (info_local->is_c2c1_01) {
{
struct fs9721_info *info_local;
- info_local = (struct fs9721_info *)info;
+ info_local = info;
/* User-defined FS9721_LP3 flag 'c2c1_00' means MAX. */
if (info_local->is_c2c1_00)