Patch for propgcc in blockly demo attempt 3

parallaxinc · Oct 10, 2017 · f330163 · f330163
1 parent c27ed80
commit f330163
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 8 deletions.
diff --git a/Learn/Simple Libraries/Misc/libpatch/cmm/libpatch.a b/Learn/Simple Libraries/Misc/libpatch/cmm/libpatch.a
diff --git a/Learn/Simple Libraries/Misc/libpatch/libpatch.c b/Learn/Simple Libraries/Misc/libpatch/libpatch.c
@@ -12,6 +12,7 @@
 
 #include "simpletools.h"
 #include "ping.h"
+#include "simplei2c.h"
 
 int main()
 {

diff --git a/Learn/Simple Libraries/Misc/libpatch/patch.c b/Learn/Simple Libraries/Misc/libpatch/patch.c
@@ -3,5 +3,7 @@
 void patch360forBlockly(void)
 {
   pause(1);
+  st_eeprom = i2c_newbus(28, 29, 0);
+  st_eeInitFlag = 1;  
 }
 
diff --git a/Learn/Simple Libraries/Robotics/ActivityBot360/libabdrive360/abdrive360.c b/Learn/Simple Libraries/Robotics/ActivityBot360/libabdrive360/abdrive360.c
@@ -35,16 +35,10 @@ volatile int abd360_rampStepGoto = ABD_GOTO_RAMP_STEP;
 
 volatile int abd360_gotoMode = ABD360_GOTO_BLOCK;
 
-i2c *simplei2c_temp;
-
-
 void drive_init(void)
 {
-
   patch360forBlockly();
-  st_eeprom = i2c_newbus(28, 29, 0);
-  st_eeInitFlag = 1;
-
+
   abdrive360_getEepromPins();
 
   int result, flag = 0;

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/version.txt b/version.txt
@@ -1 +1 @@
-v1.4.9
+v1.4.10