Merge pull request #13 from SenteraLLC/release-1.1.1

Release 1.1.1
SenteraLLC · Sep 18, 2015 · f5952c2 · f5952c2
2 parents c74cb47 + 09ca029
commit f5952c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
@@ -274,7 +274,7 @@
       </PICkit3PlatformTool>
       <RealICEPlatformTool>
         <property key="ADC 1" value="true"/>
-        <property key="AutoSelectMemRanges" value="auto"/>
+        <property key="AutoSelectMemRanges" value="manual"/>
         <property key="COMPARATOR" value="true"/>
         <property key="CTMU" value="true"/>
         <property key="I2C 1" value="true"/>
@@ -333,9 +333,9 @@
         <property key="programoptions.eraseb4program" value="true"/>
         <property key="programoptions.preservedataflash" value="false"/>
         <property key="programoptions.preserveeeprom" value="false"/>
-        <property key="programoptions.preserveprogramrange" value="false"/>
-        <property key="programoptions.preserveprogramrange.end" value="0x2ab7f"/>
-        <property key="programoptions.preserveprogramrange.start" value="0x0"/>
+        <property key="programoptions.preserveprogramrange" value="true"/>
+        <property key="programoptions.preserveprogramrange.end" value="0x2FF"/>
+        <property key="programoptions.preserveprogramrange.start" value="0x200"/>
         <property key="programoptions.preserveuserid" value="false"/>
         <property key="programoptions.programcalmem" value="false"/>
         <property key="programoptions.programuserotp" value="false"/>

diff --git a/src/ver.c b/src/ver.c
@@ -39,7 +39,7 @@ typedef struct
 /// The node type - value of '1' identifies node as a Servo CAN Node.
 static const uint8_t  node_type = 1;
 
-static const uint8_t  rev_ver   = 0;    ///< Version revision number.
+static const uint8_t  rev_ver   = 1;    ///< Version revision number.
 static const uint8_t  min_ver   = 1;    ///< Version minor number.
 static const uint8_t  maj_ver   = 1;    ///< Version major number.