Merge branch 'master' into feature/SCPI_99_21_8_Device_dependent_error_info...

Jan Breuer

2016-04-24 96f23737e877fa29efa1f1d9b03131fbc4ee1667

Merge branch 'master' into feature/SCPI_99_21_8_Device_dependent_error_information_73

 libscpi/inc/scpi/config.h

@@ -199,8 +199,10 @@
/* PIC32mx */
#if defined(__C32__)
#define HAVE_STRNLEN            0
#define HAVE_STRNCASECMP        1
#define HAVE_STRNCASECMP        0
#define HAVE_STRNICMP           0
#define isfinite                finite
#define signbit(x)              ((x)<0)
#endif

/* AVR libc */

 libscpi/src/error.c

@@ -134,7 +134,7 @@
struct error_reg {
    int16_t from;
    int16_t to;
    scpi_reg_val_t bit;
    scpi_reg_val_t esrBit;
};

#define ERROR_DEFS_N 9
@@ -170,7 +170,7 @@

    for (i = 0; i < ERROR_DEFS_N; i++) {
        if ((err <= errs[i].from) && (err >= errs[i].to)) {
            SCPI_RegSetBits(context, SCPI_REG_ESR, errs[i].bit);
            SCPI_RegSetBits(context, SCPI_REG_ESR, errs[i].esrBit);
        }
    }