Committing dev changes

Author: Main Push Robot

examples/analogRead/analogRead.ino

@@ -11,7 +11,7 @@
  ***************************************************/
 
 #include "Hall-Effect-SOLDERED.h"
-#define HALL_EFFECT_PIN A0
+#define HALL_EFFECT_PIN 32
 
 // For this example, connect the Hall Effect Sensor to your Dasduino board as such:
 // VCC to VCC on Dasduino

examples/analogRead_easyC/analogRead_easyC.ino

@@ -47,7 +47,7 @@ void setup()
 void loop()
 {
     // Read raw measurement
-    int hallRawReading = hall.getRawReading();
+    uint16_t hallRawReading = hall.getRawReading();
 
     // Read milli Teslas
     float hallMilliTeslas = hall.getMilliTeslas();

keywords.txt

@@ -6,18 +6,18 @@
 # Datatypes (KEYWORD1)
 ##################################################
 
-HallEffect_Digital KEYWORD1
-HallEffect_Digital_EasyC KEYWORD1
-HallEffect_Analog KEYWORD1
-HallEffect_Analog_EasyC KEYWORD1
+HallEffect_Digital	KEYWORD1
+HallEffect_Digital_EasyC	KEYWORD1
+HallEffect_Analog	KEYWORD1
+HallEffect_Analog_EasyC	KEYWORD1
 
 ##################################################
 # Methods and Functions (KEYWORD2)
 ##################################################
 
-getReading      KEYWORD2
-getRawReading   KEYWORD2
-getMilliTeslas  KEYWORD2
+getReading	KEYWORD2
+getRawReading	KEYWORD2
+getMilliTeslas	KEYWORD2
 
 ##################################################
 # Constants (LITERAL1)

src/Hall-Effect-Analog-SOLDERED.cpp

@@ -27,17 +27,12 @@ HallEffect_Analog::HallEffect_Analog(int _pin)
 /**
  * @brief                   Reads hall effect sensor value
  *
- * @return                  Returns a unit16_4 sensor reading value.
- * 
+ * @return                  Returns a unit16_t sensor reading value.
+ *
  */
 uint16_t HallEffect_Analog::getReading()
 {
-    #ifdef ESP32
-        uint32_t value = analogReadMilliVolts(pin);
-        return map(value, 142, 3166, 0, 1024);
-    #else
-        return analogRead(pin);
-    #endif
+    return analogRead(pin);
 }
 
 /**
@@ -51,5 +46,17 @@ uint16_t HallEffect_Analog::getReading()
 float HallEffect_Analog::getMilliTeslas()
 {
     float value = float(getReading());
-    return 20.47 * (10 * (value / 1023.0) / 5.0 - 1);
+    // Fix for ESP32's ADC
+#ifdef ESP32
+    if(value >= 2710)
+    {
+        return (value - 2710.0) * (20.47 - 0.0) / (4095.0 - 2710.0) + 0.0;
+    }
+    else
+    {
+        return (value) * (20.47) / (2710.0) - 20.47;
+    }
+#else
+    return 20.47 * (NUM_BITS * (value / (ADC_MAX - 1)) / VOLTAGE_RES - 1);
+#endif
 }

src/Hall-Effect-Analog-SOLDERED.h

@@ -15,6 +15,35 @@
 
 #include "Arduino.h"
 
+/**
+ * Different boards use different ADC's with a different range and resolution
+ */
+#ifdef __AVR__
+
+#define VOLTAGE_RES 5
+#define ADC_MAX     1024
+#define NUM_BITS    10
+
+#elif ESP32
+
+#define VOLTAGE_RES 3.3
+#define ADC_MAX     4096
+#define NUM_BITS    12
+
+#elif ESP8266
+
+#define VOLTAGE_RES 3.3
+#define ADC_MAX     1024
+#define NUM_BITS    10
+
+#else
+
+#define VOLTAGE_RES 5
+#define ADC_MAX     1024
+#define NUM_BITS    10
+
+#endif
+
 /**
  *  @brief    Base class Analog Hall Effect Sensor
  *

src/Hall-Effect-Analog-easyC-SOLDERED.cpp

@@ -17,13 +17,12 @@
  *
  * @return                  Returns raw reading as a float
  */
-int HallEffect_Analog_EasyC::getRawReading()
+uint16_t HallEffect_Analog_EasyC::getRawReading()
 {
     // Reading register will always return two bytes
-    // Both must be read but we're only interested in the first one
-    char raw[2];
-    readRegister(ANALOG_READ_REG, raw, 2 * sizeof(uint8_t));
-    uint16_t value = raw[0] | (raw[1]) << 8;
+    uint8_t raw[2];
+    readRegister(ANALOG_READ_REG, (char *)raw, 2);
+    uint16_t value = ( (uint8_t)raw[1] << 8) | (uint8_t)raw[0];
     return value;
 }
 

src/Hall-Effect-Analog-easyC-SOLDERED.h

@@ -24,7 +24,7 @@ class HallEffect_Analog_EasyC : public EasyC
 {
   public:
     HallEffect_Analog_EasyC(){};
-    int getRawReading();
+    uint16_t getRawReading();
     float getMilliTeslas();
 
   protected: