Diff: akmanalogsensor.cpp

Revision:

27:41aa9fb23a2f

Parent:

16:d85be9bafb80

Child:

29:b488d2c89fba

--- a/akmanalogsensor.cpp	Wed Feb 22 21:56:05 2017 +0000
+++ b/akmanalogsensor.cpp	Sat Mar 11 01:14:15 2017 +0000
@@ -7,11 +7,9 @@
  * Constructor.
  *
  */
-AkmAnalogSensor::AkmAnalogSensor(){
-    event = false;
+AkmAnalogSensor::AkmAnalogSensor() : AkmSensor(){
     ain = NULL;
     mcp3428 = NULL;
-    sensorName = "";
 }
 
 /**
@@ -44,12 +42,12 @@
     else if(primaryId == AKM_PRIMARY_ID_MISC_ANALOG && subId == AkmAnalogSensor::SUB_ID_EM3242)    sensorName = "EM3242";
     else if(primaryId == AKM_PRIMARY_ID_MISC_ANALOG && subId == AkmAnalogSensor::SUB_ID_AK9710)    sensorName = "AK9710";
     
-    if(primaryId == AKM_PRIMARY_ID_LINEAR_SENSOR_LEGACY){
-        // Internal ADC, Legacy
-        ain = new AnalogIn(ANALOG_IN_PIN);
-        sensorName = "EQ43XL";
-    }
-    else if(primaryId == AKM_PRIMARY_ID_LINEAR_SENSOR || 
+//    if(primaryId == AKM_PRIMARY_ID_LINEAR_SENSOR_LEGACY){
+//        // Internal ADC, Legacy
+//        ain = new AnalogIn(ANALOG_IN_PIN);
+//        sensorName = "EQ43XL";
+//    }
+    if(primaryId == AKM_PRIMARY_ID_LINEAR_SENSOR || 
             primaryId == AKM_PRIMARY_ID_MISC_ANALOG || 
             primaryId == AKM_PRIMARY_ID_CURRENT_SENSOR)
     {
@@ -82,10 +80,6 @@
     event = true;
 }
 
-bool AkmAnalogSensor::isEvent(){
-    return event;
-}
-
 AkmSensor::Status AkmAnalogSensor::startSensor(){
     ticker.attach(callback(this, &AkmAnalogSensor::eventCallback), interval);
     return AkmSensor::SUCCESS;
@@ -107,13 +101,13 @@
     
     msg->setCommand(Message::CMD_START_MEASUREMENT);
 
-    if(primaryId == AKM_PRIMARY_ID_LINEAR_SENSOR_LEGACY){
-        uint16_t value;
-        float s = *ain;
-        value = s*1024;
-        msg->setArgument( 0, (char)( value >> 8) );
-        msg->setArgument( 1, (char)( value & 0x00FF) );
-    }else if(primaryId == AKM_PRIMARY_ID_LINEAR_SENSOR || 
+//    if(primaryId == AKM_PRIMARY_ID_LINEAR_SENSOR_LEGACY){
+//        uint16_t value;
+//        float s = *ain;
+//        value = s*1024;
+//        msg->setArgument( 0, (char)( value >> 8) );
+//        msg->setArgument( 1, (char)( value & 0x00FF) );
+    if(primaryId == AKM_PRIMARY_ID_LINEAR_SENSOR || 
             primaryId == AKM_PRIMARY_ID_MISC_ANALOG || 
             primaryId == AKM_PRIMARY_ID_CURRENT_SENSOR){
         MCP342X::Data data;
@@ -135,6 +129,3 @@
 AkmSensor::Status AkmAnalogSensor::requestCommand(Message* in, Message* out){
     return AkmSensor::ERROR;
 }
-char* AkmAnalogSensor::getSensorName(){
-    return sensorName;
-}