Merge branch 'master' of ssh://in.ufactory.cc:29418/app_dpt/api/uarm4arduino

Author: altjz

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 .orig
 html/
+deploy.sh

HISTORY.md

@@ -1,5 +1,19 @@
 # uArm Arduino Library Release Note
 
+## [1.7.3] - 2016-07-07
+
+### Fix
+- Fix write serial number CONFIRM_FLAG
+- uArm won't move if no LINEAR Calibration
+
+## [1.7.2] - 2016-06-30
+
+### Fix
+- attach servo even not calibrate
+- rewrite set_servo_status replace attach_servo detach_servo
+- execute write_stretch_height event not calibrate
+- Doxygen Document Support
+
 ## [1.7.1] - 2016-06-28
 
 ### Fix

PROTOCOL.md

@@ -168,7 +168,7 @@ STRIP_FROM_INC_PATH    =
 # support long names like on DOS, Mac, or CD-ROM.
 # The default value is: NO.
 
-SHORT_NAMES            = NO
+SHORT_NAMES            = YES
 
 # If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
 # first line (until the first dot) of a Javadoc-style comment as the brief
@@ -771,7 +771,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = ../README.MD ../HISTORY.MD ../src ../examples
+INPUT                  = ../README.MD ../HISTORY.MD ../PROTOCOL.md ../src ../examples
 #INPUT                  = ../
 
 # This tag can be used to specify the character encoding of the source files
@@ -1077,7 +1077,7 @@ HTML_FILE_EXTENSION    = .html
 # of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_HEADER            = header.html
+HTML_HEADER            = ./doxygen/header.html
 
 # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
 # generated HTML page. If the tag is left blank doxygen will generate a standard
@@ -1087,7 +1087,7 @@ HTML_HEADER            = header.html
 # that doxygen normally uses.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_FOOTER            = footer.html
+HTML_FOOTER            = ./doxygen/footer.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
 # sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1112,7 +1112,7 @@ HTML_STYLESHEET        =
 # list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = customdoxygen.css
+HTML_EXTRA_STYLESHEET  = ./doxygen/customdoxygen.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1122,7 +1122,7 @@ HTML_EXTRA_STYLESHEET  = customdoxygen.css
 # files will be copied as-is; there are no commands or markers available.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_FILES       = doxy-boot.js
+HTML_EXTRA_FILES       = ./doxygen/doxy-boot.js
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to

docs/doxy.conf

@@ -20,7 +20,7 @@
 
 #define UARM_FIRMWARE_MAJOR_VERSION 1
 #define UARM_FIRMWARE_MINOR_VERSION 7
-#define UARM_FIRMWARE_BUGFIX        1
+#define UARM_FIRMWARE_BUGFIX        2
 
 #define START_SYSEX             0xF0 // start a MIDI Sysex message
 #define END_SYSEX               0xF7 // end a MIDI Sysex message
@@ -320,6 +320,7 @@ boolean handleSysex(byte command, byte argc, byte *argv)
             for(byte i=0; i<14; i++){
                 EEPROM.write(SERIAL_NUMBER_ADDRESS+i+1, argv[i+1]);
             }
+            EEPROM.write(SERIAL_NUMBER_ADDRESS, CONFIRM_FLAG);
             return true;
         }
         //0X21 READ_SERIAL_NUMBER

docs/customdoxygen.css docs/doxygen/customdoxygen.cssdocs/customdoxygen.css renamed to docs/doxygen/customdoxygen.css

@@ -1,5 +1,5 @@
 name=uArmLibrary
-version=1.7.1
+version=1.7.3
 author=UFactory <developer@ufactory.cc>
 maintainer=Joey Song <joey@ufactory.cc>, Alex Tan<alex@ufactory.cc>, Dave Corboy<dave@corboy.com>
 sentence=uArm Library for Arduino