Imported code for api v2.0.18

Author: scaryghost

README.md

@@ -20,10 +20,18 @@ Then, add the compile element to the dependencies closure in the module's *build
 
 ```gradle
 dependencies {
-    compile 'com.mbientlab:metawear:2.0.12'
+    compile 'com.mbientlab:metawear:2.0.18'
 }
 ```
 
+## Attaching Source Code ##
+The MetaWear API aar comes packaged with the library's source code.  To associate the source code with the AAR package:  
+
+1. Switch the project view to display the project structure  
+2. Expand the "External Libraries" tab  
+3. Right click "metawear-${version}" and select "Library Properties"  
+4. Press the add button (green plus icon) and select "sources.jar" under the "jar" tab  
+
 ## Declaring the Service ##
 Once your project has synced with the updated Gradle files, declare the MetaWear Bluetooth LE service in the module's *AndroidManifest.xml* file.
 ```xml

library/build.gradle

@@ -31,8 +31,8 @@ android {
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 22
-        versionCode 26
-        versionName "2.0.12"
+        versionCode 27
+        versionName "2.0.18"
     }
     buildTypes {
         release {

library/src/main/java/com/mbientlab/metawear/MetaWearBleService.java

@@ -74,6 +74,7 @@ public class MetaWearBleService extends Service {
             METAWEAR_SERVICE= UUID.fromString("326A9000-85CB-9195-D9DD-464CFBBAE75A"),
             METAWEAR_COMMAND= UUID.fromString("326A9001-85CB-9195-D9DD-464CFBBAE75A"),
             METAWEAR_NOTIFY= UUID.fromString("326A9006-85CB-9195-D9DD-464CFBBAE75A");
+    private final static long FUTURE_CHECKER_PERIOD= 1000L;
 
     private enum GattActionKey {
         NONE,
@@ -421,6 +422,8 @@ private void queueCommand(final int writeType, final byte[] command, final boole
                 public boolean execute() {
                     if (gatt != null && (override || gattConnectionStates.get(gatt.getDevice()).isReady.get())) {
                         gattManager.setExpectedGattKey(GattActionKey.CHAR_WRITE);
+                        mwBoards.get(gatt.getDevice()).wroteCommand(command);
+
                         BluetoothGattService service = gatt.getService(METAWEAR_SERVICE);
                         BluetoothGattCharacteristic mwCmdChar = service.getCharacteristic(METAWEAR_COMMAND);
                         mwCmdChar.setWriteType(writeType);
@@ -470,9 +473,9 @@ public void sendCommand(boolean writeMacro, byte[] command) {
                     queueCommand(BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT, macroBytes);
                 }
             } else {
-                queueCommand(command[0] == MacroRegister.ENABLE.moduleOpcode() ?
-                        BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE :
-                        BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT,
+                queueCommand(command[0] == InfoRegister.MACRO.moduleOpcode() ?
+                                BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT :
+                                BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE,
                         command);
             }
         }
@@ -693,8 +696,6 @@ public boolean execute() {
         public void onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
             gattManager.updateExecActionsState(false);
             gattManager.executeNext(GattActionKey.CHAR_WRITE);
-
-            mwBoards.get(gatt.getDevice()).wroteCommand(characteristic.getValue());
         }
 
         @Override
@@ -959,7 +960,7 @@ public void executeOnUiThread() {
         public void executeOnBackgroundThread() {
             useHandler= false;
             futureTimer = new Timer();
-            futureTimer.scheduleAtFixedRate(futureCheckerTask, 0, 1000);
+            futureTimer.scheduleAtFixedRate(futureCheckerTask, 0, FUTURE_CHECKER_PERIOD);
         }
     }
 
@@ -988,6 +989,7 @@ public IBinder onBind(Intent intent) {
     public void onCreate () {
         super.onCreate();
 
+        futureTimer.scheduleAtFixedRate(futureCheckerTask, 0, FUTURE_CHECKER_PERIOD);
         deviceStates= getSharedPreferences(DEVICE_STATE_KEY, MODE_PRIVATE);
     }
 }

library/src/main/java/com/mbientlab/metawear/impl/DefaultMetaWearBoard.java

@@ -72,9 +72,9 @@ private static String arrayToHexString(byte[] value) {
         }
 
         StringBuilder builder= new StringBuilder();
-        builder.append(String.format("[%02x", value[0]));
+        builder.append(String.format("[0x%02x", value[0]));
         for(int i= 1; i < value.length; i++) {
-            builder.append(String.format(", %02x", value[i]));
+            builder.append(String.format(", 0x%02x", value[i]));
         }
         builder.append("]");
 
@@ -968,7 +968,7 @@ protected byte[] processorConfigToBytes(ProcessorConfig newConfig) {
                             byte second = (byte) ((DataSignalImpl.this.outputSize - 1) & 0x3 | (isSigned() ? 0x4 : 0) |
                                     (params.mode.ordinal() << 3));
                             ByteBuffer buffer = ByteBuffer.allocate(8).order(ByteOrder.LITTLE_ENDIAN);
-                            Number firmwareValue = numberToFirmwareUnits(thsConfig.limit), firmwareHysteresis= numberToFirmwareUnits(thsConfig.hysteresis);
+                            Number firmwareValue = parent.numberToFirmwareUnits(thsConfig.limit), firmwareHysteresis= parent.numberToFirmwareUnits(thsConfig.hysteresis);
                             buffer.put((byte) 0xd).put(second).putInt(firmwareValue.intValue()).putShort(firmwareHysteresis.shortValue());
 
                             return buffer.array();
@@ -1054,7 +1054,7 @@ protected byte[] processorConfigToBytes(ProcessorConfig newConfig) {
                             ///< Do not allow the delta mode to be changed
                             byte second = (byte) (((this.outputSize - 1) & 0x3) | (isSigned() ? 0x4 : 0) |
                                     (params.mode.ordinal() << 3));
-                            Number firmware = numberToFirmwareUnits(deltaConfig.threshold);
+                            Number firmware = parent.numberToFirmwareUnits(deltaConfig.threshold);
                             ByteBuffer config = ByteBuffer.allocate(6).order(ByteOrder.LITTLE_ENDIAN).put((byte) 0xc).put(second).putInt(firmware.intValue());
                             return config.array();
 
@@ -1366,7 +1366,7 @@ public byte[] getFilterConfig() {
                         @Override
                         protected byte[] processorConfigToBytes(ProcessorConfig newConfig) {
                             Pulse pulseConfig= (Pulse) newConfig;
-                            Number firmwareThs= numberToFirmwareUnits(pulseConfig.threshold);
+                            Number firmwareThs= parent.numberToFirmwareUnits(pulseConfig.threshold);
 
                             ///< Do not allow output type to switch
                             ByteBuffer buffer= ByteBuffer.allocate(10).put((byte) 0xb).put(parent.outputSize).put((byte) 0).put((byte) params.mode.ordinal())
@@ -1557,7 +1557,7 @@ public void setState(State newState) {
                 } else if (newState instanceof Average.State) {
                     stateBytes= new byte[0];
                 } else if (newState instanceof Delta.State) {
-                    Number firmware= numberToFirmwareUnits(((Delta.State) newState).newPreviousValue);
+                    Number firmware= parent.numberToFirmwareUnits(((Delta.State) newState).newPreviousValue);
 
                     stateBytes= ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN).putInt(firmware.intValue()).array();
                 } else if (newState instanceof Passthrough.State) {
@@ -1744,6 +1744,11 @@ protected byte[] processorConfigToBytes(ProcessorConfig newConfig) {
                                     rmsMode};
                         }
 
+                        @Override
+                        public Number numberToFirmwareUnits(Number input) {
+                            return parent.numberToFirmwareUnits(input);
+                        }
+
                         @Override
                         public boolean isSigned() {
                             return false;
@@ -2279,7 +2284,9 @@ protected DefaultMetaWearBoard(final Connection conn) {
         final ResponseProcessor idProcessor= new ResponseProcessor() {
             @Override
             public Response process(byte[] response) {
-                pendingRoutes.peek().receivedId(response[2]);
+                if (!pendingRoutes.isEmpty()) {
+                    pendingRoutes.peek().receivedId(response[2]);
+                }
                 return null;
             }
         };
@@ -2297,7 +2304,9 @@ public Response process(byte[] response) {
         responses.put(new ResponseHeader(EventRegister.ENTRY), new ResponseProcessor() {
             @Override
             public Response process(byte[] response) {
-                currEventListener.receivedCommandId(response[2]);
+                if (currEventListener != null) {
+                    currEventListener.receivedCommandId(response[2]);
+                }
                 return null;
             }
         });
@@ -2354,9 +2363,9 @@ public Response process(byte[] response) {
             @Override
             public Response process(byte[] response) {
                 try {
-                    byte[] respBody= new byte[response.length - 3];
+                    byte[] respBody = new byte[response.length - 3];
                     System.arraycopy(response, 3, respBody, 0, respBody.length);
-                    ResponseHeader header= new ResponseHeader(response[0], response[1], response[2]);
+                    ResponseHeader header = new ResponseHeader(response[0], response[1], response[2]);
 
                     if (bmi160AccMessageClasses.contains(dataProcMsgClasses.get(header))) {
                         Constructor<?> cTor = dataProcMsgClasses.get(header).getConstructor(byte[].class, float.class);
@@ -2370,6 +2379,8 @@ public Response process(byte[] response) {
 
                     Constructor<?> cTor = dataProcMsgClasses.get(header).getConstructor(byte[].class);
                     return new Response((Message) cTor.newInstance(respBody), header);
+                } catch (NullPointerException ex) {
+                    return null;
                 } catch (Exception ex) {
                     throw new RuntimeException("Cannot create a message processor for filter output: " + Arrays.toString(response), ex);
                 }

library/src/main/java/com/mbientlab/metawear/module/Accelerometer.java

@@ -42,7 +42,7 @@ public interface Accelerometer extends MetaWearBoard.Module {
      */
     void setOutputDataRate(float frequency);
     /**
-     * Sets the sampling range for the accelerometer.  The closet, valid range will be chosen depending
+     * Sets the sampling range for the accelerometer.  The closest, valid range will be chosen depending
      * on the underlying sensor
      * @param range    Sampling range, in G's
      */