From f330163c105aa10ce9a9e12bb4e495422f130c77 Mon Sep 17 00:00:00 2001
From: Andy Lindsay <AndyLindsay@users.noreply.github.com>
Date: Tue, 10 Oct 2017 15:02:47 -0700
Subject: [PATCH] Patch for propgcc in blockly demo attempt 3

---
 .../Misc/libpatch/cmm/libpatch.a              | Bin 728 -> 872 bytes
 .../Simple Libraries/Misc/libpatch/libpatch.c |   1 +
 Learn/Simple Libraries/Misc/libpatch/patch.c  |   2 ++
 .../ActivityBot360/libabdrive360/abdrive360.c |   8 +-------
 .../libabdrive360/cmm/libabdrive360.a         | Bin 19318 -> 19122 bytes
 version.txt                                   |   2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Learn/Simple Libraries/Misc/libpatch/cmm/libpatch.a b/Learn/Simple Libraries/Misc/libpatch/cmm/libpatch.a
index 446eaa5d164b874d3c4a3c3738fd5fa142bc9191..fa320d00e89cc356b524fe2ea29808dfc244cd89 100644
GIT binary patch
delta 265
zcmcb?`hsnO44av`k%f`bM5Q2kFw0Ou!9W27Af%yzfti_^f`YlB*~H13j2#pAN{K9#
z-Lyc4je#MZfngb=Ks}HWtDktilu==_FQYQ+93}<^gUO|g%8VhC4>F2R-oPjTW~l?o
zmyGJHCm0zRCQKG(Qf7?+s&txc%T%l=!+-z+K&A$Q%K+jVPhQBR9TA^tlpLRzTAox|
z%n)B(5}%q{P?VnwWqRgimbm340v*G^3dGDH0tk44m>K9+5CECP%noKUh=bT15H<kd
C4l>{X

delta 138
zcmaFCc7t_-44Z+up_!@4M5Q2k2unf1Kmi0Gq@jU<nVFe_f~mRD#L1eBB@_2bO?+L-
z$TK;SQJK|%iGhJ<awnrQqr>F2jOwfo3_t*s5uW^pQ2;3R7bv!ck%1v$vL=%<s|ZlF
W%;Z3(;>ll_WO!JCN|`|f5C8zjP#uf_

diff --git a/Learn/Simple Libraries/Misc/libpatch/libpatch.c b/Learn/Simple Libraries/Misc/libpatch/libpatch.c
index 7a8a9de7..11042d7e 100644
--- 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
index f0819b84..35a9bae1 100644
--- 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
index 0d0d6f6d..c3b312dd 100644
--- 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
index c8282db99b1505084dc417df3645fb07e1270863..bfe8581b821f16f443b136090e62bb83b38c1ba2 100644
GIT binary patch
delta 1097
zcmbV~O=uHA6vyA}Za&(kb=$_o))>ZYwMCa0({#I3O`^40dMYSldnlz81g)h9FFi#>
z1Wz^$dQ!+mD5ww|&whZSD3mIt^dQxX9z?WWJQNSko82~Jjy_28`~TmYw{KtO_Z{;1
zHd#oPvaaJ$nxPo#H>Hm2N|(~fMgT|x7-#?QvttgRZ5bfu0(2|_?6CppRRC)REa(>I
z0Sb@_0`&d>=$`_}e*-u%0dVpI!0D0l%Xh4;d6fSow=_e{n`K2eW@P)_9LvOe$O?aD
z%#*M<{&WW5G9M4l678tQo)=SrTo~XX`xUYRbDDSrE4Nyt!j6TzwTi|*59|*_4FHps
z!&b0MG%z(*JwCxEX_(Q5@1;f}-rEmT{I&`m-O@!JQg!)4ogNc<mr_4dm%mo0*}r-a
z9tcAWD8noo@JuZbdRgemc3y`sLgSzqrWo)K;Vn%e!j42<%MDI9kCM^_QKXBP#khnl
zc7!pDjQ_NVdE|DFZy+~#d=t6J;{~PW9<slh3bNnxKC*vy5qT$+<mpE!VqT*s3co;(
zd;VKwe}C^4e+{|AtNEnxSL9C5-$35&@utGMcD|N~h&!=W6jeB(@IHmp3Li%Hcb`K}
zu(X-L>)DIflTVwc^lioR!#3Y&Pt_c5$ImJ1Zs$cs(d2+sIqbw}a*D6+U6WT|I{Z!7
zNG;Fpo+Tw0J-Djmj6)v@PSGc4+RQA;oK$SRVDpx~wCC`mdp%UETrZ4E-(l6EI6pHu
SCZFK&>d+OBWWW5dtN#TnRGzi~

delta 1291
zcmbW0Pe>GT6vy9hX58IWbYpG(yW6CTyO_xAHl%h@ESIfAm_Y{*X~v=(?zXfm*&zm^
zi-#ijR}w*?5E2BT`|}cnC|&vkVNl>9g213dffRL!pnh*=-2E}f9?Z<=``-Kg-pqUR
zE8Zc$=E<#~5!Ljls%k2lcvsbKt;h7L>R2TJ><3UL|Nrvp0KVG*{yzXsQviV-fCI-M
z457OKVeahM2GCvs=tY2@c7VPo07qK^2Im11HFN8)YjUY{b}E^Qogd97(^)o4K1oVc
zJJdr}&9B6I4{LNR5FuaKigJatECz}TEo&}-34kTS3#I|Q1{Z$A#bT}uAwzW0-R4^N
z0BlNhDB4P{({Ju@#i|70p&JL=q*aOTB-$$?3cwIedD<#w_;ztN=Q&Lbh47Zx=H<^?
zhYmWl=Fr_-*X^$Fmm%SZCmq`0x}ltJK*5pl$f2J)^jog^hnVK=SKza)(YF`A|NSZE
z^SFz*p}LeWLo?U-p=f-)3^9o<Rk}$C=aETX9-q#^Xf8jROlB`#Oxt)olgh`Z&P~wA
zRWBXmqqAg~0DE42iWq5LTlQIdXOZpBOe6F8pv@rTf5`1B@;-~NA@jMQ-9YwRd=Gh#
z#rKh`EPg2DtRUBeVMbO_*u}7UyNjP8+pXU~ZnQRfA@F<TCd>a3x!GcD@~;0Ya*O5v
zA@Fa)>&pQvpztosL5phyt`}GpI3lnnaIe4v0uLhFV@)9QQw=m-+gLhCY@s$TmsHVr
z(iFXT#@M9)jG(p}FO(HsR>#>|V9Pv_R`#-bq#S2T=!Bpq!*5EN4Q#mMoe=Bq`at*#
z=o(YCZS?D!Sv{za2&&MXahGB=sCTk>UzZt=n%Or8MzDfzDQWO*SrvSpR10ku>LTnx
HqE7k;zh=Tl

diff --git a/version.txt b/version.txt
index 2dc4063b..2f8dfc4e 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v1.4.9
+v1.4.10