Discard patch changes

parallaxinc · Oct 10, 2017 · 2c10836 · 2c10836
1 parent a9d9b61
commit 2c10836
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 139 deletions.
diff --git a/Learn/Simple Libraries/Motor/libservo360/cmm/libservo360.a b/Learn/Simple Libraries/Motor/libservo360/cmm/libservo360.a
diff --git a/Learn/Simple Libraries/Robotics/ActivityBot360/libabcalibrate360/abcalibrate360.c b/Learn/Simple Libraries/Robotics/ActivityBot360/libabcalibrate360/abcalibrate360.c
@@ -19,7 +19,6 @@ static volatile int abd360_pinFbRight = ABD360_PIN_FB_R;
 
 void cal_activityBot(void)                    
 {
-  patch360forBlockly();
   ee_putStr("AB360cstart", 12, _AB360_EE_Start_);
 
   // Left servo counterclockwise
@@ -224,7 +223,6 @@ void cal_activityBot(void)
 
 void cal_servoPins(int servoPinLeft, int servoPinRight) 
 {
-  patch360forBlockly();
   int eeAddr = _AB360_EE_Start_  + _AB360_EE_Pins_;
   unsigned char pinInfo[8] = {'s', 'p', 'L', 12, ' ', 'R', 13, ' '};  
   pinInfo[3] = (char) servoPinLeft;
@@ -239,7 +237,6 @@ void cal_servoPins(int servoPinLeft, int servoPinRight)
 
 void cal_encoderPins(int encPinLeft, int encPinRight)
 {
-  patch360forBlockly();
   int eeAddr = 8 + _AB360_EE_Start_  + _AB360_EE_Pins_;
   unsigned char pinInfo[8] = {'e', 'p', 'L', 14, ' ', 'R', 15, ' '};  
   pinInfo[3] = (char) encPinLeft;
@@ -253,7 +250,6 @@ void cal_encoderPins(int encPinLeft, int encPinRight)
 
 int cal_getEepromPins()
 {
-  patch360forBlockly();
   int eeAddr = _AB360_EE_Start_  + _AB360_EE_Pins_;
   unsigned char pinInfo[16];
 
@@ -314,7 +310,7 @@ int cal_getEepromPins()
 void cal_displayData(void)
 {
   //if(!abd_us) abd_us = CLKFREQ/1000000; 
-  patch360forBlockly();
+
   unsigned char str[12];
   ee_getStr(str, 12, _AB360_EE_Start_);
   str[11] = 0;
@@ -400,7 +396,7 @@ void cal_displayData(void)
 void cal_displayResults(void)
 {
   //if(!abd_us) abd_us = CLKFREQ/1000000; 
-  patch360forBlockly();
+
   unsigned char str[12];
   ee_getStr(str, 12, _AB360_EE_Start_);
   str[11] = 0;

diff --git a/Learn/Simple Libraries/Robotics/ActivityBot360/libabcalibrate360/abcalibrate360.h b/Learn/Simple Libraries/Robotics/ActivityBot360/libabcalibrate360/abcalibrate360.h
@@ -47,7 +47,6 @@ extern "C" {
 
 #include "simpletools.h"
 #include "servo360.h"
-#include "patch.h"
 
 
 #define ABD60_PIN_CTRL_L 12

diff --git a/Learn/Simple Libraries/Robotics/ActivityBot360/libabcalibrate360/cmm/libabcalibrate360.a b/Learn/Simple Libraries/Robotics/ActivityBot360/libabcalibrate360/cmm/libabcalibrate360.a
diff --git a/Learn/Simple Libraries/Robotics/ActivityBot360/libabdrive360/abdrive360.c b/Learn/Simple Libraries/Robotics/ActivityBot360/libabdrive360/abdrive360.c
@@ -38,7 +38,7 @@ volatile int abd360_gotoMode = ABD360_GOTO_BLOCK;
 
 void drive_init(void)
 {
-  patch360forBlockly();
+
   abdrive360_getEepromPins();
 
   int result, flag = 0;

diff --git a/Learn/Simple Libraries/Robotics/ActivityBot360/libabdrive360/abdrive360.h b/Learn/Simple Libraries/Robotics/ActivityBot360/libabdrive360/abdrive360.h
@@ -12,7 +12,6 @@
 
 #include "simpletools.h"  
 #include "servo360.h"
-#include "patch.h"
 
 #define ABD60_PIN_CTRL_L 12
 #define ABD60_PIN_FB_L 14

diff --git a/Learn/Simple Libraries/Robotics/ActivityBot360/libabdrive360/cmm/libabdrive360.a b/Learn/Simple Libraries/Robotics/ActivityBot360/libabdrive360/cmm/libabdrive360.a
diff --git a/Learn/Simple Libraries/Robotics/ActivityBot360/libabdrive360/drive_displayInterpolation.c b/Learn/Simple Libraries/Robotics/ActivityBot360/libabdrive360/drive_displayInterpolation.c
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v1.4.6
+v1.4.14