Merge pull request #8 from johnsonb2/master

Minor changes to the Sweep library

Author: dcyoung

Sweep/Sweep.cpp

@@ -81,6 +81,7 @@ bool Sweep::getMotorReady()
         // readyCode == 0 indicates device is ready
         return _ascii_bytes_to_integer(readyCode) == 0;
     }
+    return false;
 }
 
 bool Sweep::waitUntilMotorReady()
@@ -177,14 +178,14 @@ void Sweep::reset()
     _writeCommand(_RESET_DEVICE);
 }
 
-bool Sweep::_writeCommand(const uint8_t cmd[2])
+void Sweep::_writeCommand(const uint8_t cmd[2])
 {
     const uint8_t command[3] = {cmd[0], cmd[1], _COMMAND_TERMINATION};
 
     _serial.write(command, 3);
 }
 
-bool Sweep::_writeCommandWithArgument(const uint8_t cmd[2], const uint8_t arg[2])
+void Sweep::_writeCommandWithArgument(const uint8_t cmd[2], const uint8_t arg[2])
 {
     const uint8_t command[5] = {cmd[0], cmd[1], arg[0], arg[1], _COMMAND_TERMINATION};
 
@@ -287,4 +288,4 @@ void Sweep::_flushInputBuffer()
     {
         _serial.read();
     }
-}
+}

Sweep/Sweep.h

@@ -12,6 +12,7 @@
 #define sweepArrLen(x) (sizeof(x) / sizeof(*x))
 
 // Available Motor Speed Codes for the setMotorSpeed method
+const uint8_t MOTOR_SPEED_CODE_0_HZ[2] = {'0', '0'};
 const uint8_t MOTOR_SPEED_CODE_1_HZ[2] = {'0', '1'};
 const uint8_t MOTOR_SPEED_CODE_2_HZ[2] = {'0', '2'};
 const uint8_t MOTOR_SPEED_CODE_3_HZ[2] = {'0', '3'};
@@ -161,9 +162,9 @@ class Sweep
     uint8_t _responseInfoSetting[5];
 
     // Write command without any argument
-    bool _writeCommand(const uint8_t cmd[2]);
+    void _writeCommand(const uint8_t cmd[2]);
     // Write command with a 2 character argument code
-    bool _writeCommandWithArgument(const uint8_t cmd[2], const uint8_t arg[2]);
+    void _writeCommandWithArgument(const uint8_t cmd[2], const uint8_t arg[2]);
 
     // Read various types of responses
     bool _readResponseHeader();
@@ -196,4 +197,4 @@ class Sweep
     }
 };
 
-#endif
+#endif

Sweep/keywords.txt

@@ -26,6 +26,7 @@ reset	KEYWORD2
 #######################################
 # Constants (LITERAL1)
 #######################################
+MOTOR_SPEED_CODE_0_HZ	LITERAL1
 MOTOR_SPEED_CODE_1_HZ	LITERAL1
 MOTOR_SPEED_CODE_2_HZ	LITERAL1
 MOTOR_SPEED_CODE_3_HZ	LITERAL1
@@ -39,4 +40,4 @@ MOTOR_SPEED_CODE_10_HZ	LITERAL1
 
 SAMPLE_RATE_CODE_500_HZ	LITERAL1
 SAMPLE_RATE_CODE_750_HZ	LITERAL1
-SAMPLE_RATE_CODE_1000_HZ	LITERAL1
+SAMPLE_RATE_CODE_1000_HZ	LITERAL1