Merge branch 'ads131' into telestatic-v4

diff --cc src/kernel/ao.h
index 9ca2c60eac711c94734d199eca9603ac98ec5169,a02b74e4d7228bdcaaf2e403b05119de2f67f438..e140d6c9f8ecbfa5cc117ef84772aadcd35ced09
--- 1/src/kernel/ao.h
--- 2/src/kernel/ao.h
+++ b/src/kernel/ao.h
@@@ -80,9 -75,8 +80,9 @@@ typedef AO_PORT_TYPE ao_port_t
  #define AO_PANIC_SELF_TEST_HMC5883    0x40 | 2        /* Self test failure */
  #define AO_PANIC_SELF_TEST_MPU6000    0x40 | 3        /* Self test failure */
  #define AO_PANIC_SELF_TEST_MPU9250    0x40 | 3        /* Self test failure */
 +#define AO_PANIC_SELF_TEST_BMX160     0x40 | 3        /* Self test failure */
  #define AO_PANIC_SELF_TEST_MS5607     0x40 | 4        /* Self test failure */
- #define AO_PANIC_SELF_TEST_ADS124S0X  0x40 | 5        /* Self test failure */
+ #define AO_PANIC_SELF_TEST_ADS                0x40 | 5        /* Self test failure */
  
  /* Stop the operating system, beeping and blinking the reason */
  void

diff --cc src/kernel/ao_data.h
index 0f96cb897bcf521081c89e6007cc56444697ac73,7c5c20d016a6f0daa778957504bae550db95fc7d..6237982cf43c2e795b563c87ef6a4c45ed4fe847
--- 1/src/kernel/ao_data.h
--- 2/src/kernel/ao_data.h
+++ b/src/kernel/ao_data.h
@@@ -83,29 -76,19 +83,36 @@@
  #define AO_DATA_MAX6691 0
  #endif
  
 +#if HAS_BMX160
 +#include <ao_bmx160.h>
 +#define AO_DATA_BMX160        (1 << 2)
 +#else
 +#define AO_DATA_BMX160        0
 +#endif
 +
 +#ifndef HAS_SENSOR_ERRORS
 +#if HAS_IMU || HAS_MMA655X || HAS_MS5607 || HAS_MS5611
 +#define HAS_SENSOR_ERRORS     1
 +#endif
 +#endif
 +
 +#if HAS_SENSOR_ERRORS
 +extern uint8_t                        ao_sensor_errors;
 +#endif
 +
+ #if HAS_ADS131A0X
+ #include <ao_ads131a0x.h>
+ #define AO_DATA_ADS131A0X (1 << 4)
+ #else
+ #define AO_DATA_ADS131A0X 0
+ #endif
+ 
  #ifdef AO_DATA_RING
  
 -#define AO_DATA_ALL   (AO_DATA_ADC|AO_DATA_MS5607|AO_DATA_MPU6000|AO_DATA_HMC5883|AO_DATA_MMA655X|AO_DATA_MPU9250|AO_DATA_ADXL375)
 +#define AO_DATA_ALL   (AO_DATA_ADC|AO_DATA_MS5607|AO_DATA_MPU6000|AO_DATA_HMC5883|AO_DATA_MMA655X|AO_DATA_MPU9250|AO_DATA_ADXL375|AO_DATA_BMX160|AO_DATA_MMC5983)
  
  struct ao_data {
 -      uint16_t                        tick;
 +      AO_TICK_TYPE                    tick;
  #if HAS_ADC
        struct ao_adc                   adc;
  #endif

diff --cc src/telestatic-v3.0/Makefile
Simple merge

diff --cc src/telestatic-v3.0/ao_pins.h
Simple merge