From 2c10836af9b48c9379843330f5d53e8be6e7ecb2 Mon Sep 17 00:00:00 2001 From: Andy Lindsay Date: Tue, 10 Oct 2017 16:14:32 -0700 Subject: [PATCH] Discard patch changes --- .../Motor/libservo360/cmm/libservo360.a | Bin 46860 -> 46860 bytes .../libabcalibrate360/abcalibrate360.c | 8 +- .../libabcalibrate360/abcalibrate360.h | 1 - .../libabcalibrate360/cmm/libabcalibrate360.a | Bin 10404 -> 10276 bytes .../ActivityBot360/libabdrive360/abdrive360.c | 2 +- .../ActivityBot360/libabdrive360/abdrive360.h | 1 - .../libabdrive360/cmm/libabdrive360.a | Bin 19122 -> 19074 bytes .../drive_displayInterpolation.c | 129 ------------------ version.txt | 2 +- 9 files changed, 4 insertions(+), 139 deletions(-) delete mode 100644 Learn/Simple Libraries/Robotics/ActivityBot360/libabdrive360/drive_displayInterpolation.c diff --git a/Learn/Simple Libraries/Motor/libservo360/cmm/libservo360.a b/Learn/Simple Libraries/Motor/libservo360/cmm/libservo360.a index d74f650a3aaece343551b3a751df9ef091886138..4ce17f3972b365a115bec460673244f34e9033cd 100644 GIT binary patch delta 667 zcmeBq$JFzVX@V@PsfC%T(MF~HTr5DA$>fV=;+y|)U6q3IBo@C_WrlIYH*;v7MdE$X z*~x;CJ7Va_0y56TWb(Rfr_DZQqRde4KYORmD=eQf!DYoKuT9jR{2^O(^Gh26sH)BX z?A4)WH%=4Z?BL7^H5CWvhy`3YVZkyO|C)gpM41*&v5I|RLis$RH2 zVzX-~2UOm0w)p0Zh`p>3lR!L&xIl#5WQRD{$*K8bo7t1TLELLT`JcV`X310wh&v(N z+zcBick{aJa3q<@Z&kH7`{ZAR>0M_izS*{D0@N!XHN-c+DC31%2jU4-i6ZeFY9*0) zB@GWD##lm~@SJgTL~9@;I2bKAuWNIMSZq0YU7N&ap)O-&Zc;A_chdx8u*s&AC)$W_ zno<6 zvz)xnP<-=8ogFL??&fud;ZWw}b=gjveau8*3jf(VZC+vdlnG>t`Q*lF;*%ZXbS8hu z7Tx^PMgVNK`Q(KQBqrBdYHxOMKvK8a!I_f+t$!il`Ccm|j-n=00BNJHI2qe6DZDIgKlhNdV z_Trl*Q!S9WxfwQ4?&fvb;ZPTR)DYjSkk5$3vniSgbv;P#MHw%WoIsT*63?Ml63Uxs zBfhz$;UP4vK)ixxOC-4?ZH7oZfi6>sLrf>HYm?ZV)N72)-82EgH5A)4r555tpjtz* z%`>L)B6APS$c5S&7$LsdW40g?uVk(!)J~Axjs>zvybp^tp(+_u#W$NQYlO;yco$Zd q!g&&tMT4{_J2;3=-fJnldEeUYa9uDNyUo8gtcHtu+Ij7CA!Xo^))8;IxMb8a}@NxFRJKmW{}nLBrO z>0jEvWLK8EGB7g`cq2E#@`7f1y?!qmf0p_ERaI49@2pwnRo>uY%QxkGk_oqp@aI$$ zYuv`w<+;3O;Oc5)UiNG@X8i?s=mo25oaaDn!sp-rk!<$gXH2jnx^S$pF?w2PUv#1s zdM)NZD|j?+F!WG-Y>ah2_;^a5yFbI2lHj3~Jj)aOG{tB22d{)bGg5u-^b})`2kTSw z+=CO1847Jm?X;{Jp}*2{qEb3yxI8o8GFvQTz6lmg{M9~BO&WaccC9{NafFi81lb z#te)RjQN;iPpC3|$O`3VCR%nZjpdR8#)H#%aQx$HWTwqFt_jRp;MXR*o0pw0kBL~1D4g-fn^()E6*yW-wT#q+z6H;wu5Dy zXTY*^du;^qyn4LLPKRS)DdHn=0(;IX&)3TH9atu~2$o&B43=FP0ZT#uia)&m>#D02q>=oWPr zfE(3$Q#?vf0?VUJ2ivmZNeJW||b6D?CdNrJ%o+ zK1yu6@_2$My0x60aD($%_b5FZyqxuXu$+Tp@Cw%bV0_V2D+d=a&j!mQm0LwrZm3|p416@)2pWqT6XjJLf!7@$^U0TkHvk;yc_r$>b2+g{>CNC8*6&t&3wR#u_k-s%w}Pdh&EQ*E-wKwwwt;K0 z|J3lm5GU~@xQ;t?f)_A9t312G^{n?Qy${^L`T?aM0m~ipy5f_uWOfn*D)FA;PZWQq I_^jgp0rJ@=r2qf` delta 4055 zcmZXW4NR3~6vv;}*9#Xx;9d*G&nu`1pP;cgA})>g{xWX{O>t09&XRZ<#+z)Jm;L}d7t;W z_fYAfvc?gf(B!<}v`^FGtw4kVfnWfGKXZb?P$(1#;Q!=siItJron#_oa^!Qo@fwe@ zw_?7O1H7?TclZTgy60-DF&o0Wed$&pe8QJuoeE!ze0uyDo@}2n z?cp4Mx~DtEm^*DN{97$6ukFU5QT=>-W4UcJ$1=5+F}K3Ll-te?B6lPcbVu3$M%g~< z#vO9JLRb=n)&n1$n)w(Eu1KAgqe<#^-o`>T&_^()Bg*b1dsv%qNT=n0sd7VAb#5s5d~IF9y4tFmbsO8dQj;wQy+Wot~hvA7KuFicLX%Rd6YN(AYwMZp==w=(|uKhZduW{@kQT!IJ1C zSa#?vm~pqtYRmY75^@?-sjV8|*{z_QBGU|D5`JAvY}ReX+$ zFHrHtU@2A#mc=Xu%j(wmL@iXCC}Rq4B5I5zyo;oc=g>0tzc>5 z3vfKge5YcrshFE!DbNL$UAYaGUFiW+Ly`4AP!lZs;e=#x0v8(&mKBTvOG8;;DK-f# zyD}9l3oBIdMM__6Q+;X{@&@{RCJV`dsNZi5<72yUOt=SQ_d_ucW&ZvEXzr zkf?MYcns@9l%5Wjt)2j0&M~=QJ~xh;4r2v7^1=9(K%)RWmbnNlk7E&dDeF&zS29;9 zUaPoHaf9Mb5yt-0*r6PI6z>I(e96P>z9MNtB}WRInsU zQ~Fr&1a2r>>65^cXNJ;egC$RKEbf2V(h@i(a-woIVHtQ5>lI3`1P58KR(cIMhxIz8 zzYKny_1AlKdj1ZKTy|{fbr`c9EYGr0>0$76j(-=7pSUzWQZa|Yd8~h;^j2_)_0PbL zto|$vxrjQzQ#j}{cq;RcV2Qt@;{Q?cG2VyqKCr|GzzaD~7Fb?ICkR9C@F`$<6=#BH z@Pv6_x=t|)RZIyOKjdkYgQeIq@GRCVlwJv*&3ZNK{QlLz$Y;kZ;5p12!P3wh;JK`C z1xv9V-~!fnEBzhtJl6Mv=QAHrF$cX=-(J9uBg%0MT*&%yrJn}Nh10J1g5qx!UsC+N O;_EIaQH`HmgZMuP2Q|z9 diff --git a/Learn/Simple Libraries/Robotics/ActivityBot360/libabdrive360/abdrive360.c b/Learn/Simple Libraries/Robotics/ActivityBot360/libabdrive360/abdrive360.c index 268aa924..2998c700 100644 --- 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 index 24c07eee..80e2d8fb 100644 --- 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 index a84f04892b3b535365bc79933771f9409d7a8468..eeda4c6ad3cbf5e1c25e7cfa5eb0be7fd4b94464 100644 GIT binary patch delta 968 zcmZ9KPiPZC6vn^(W3p|<#%7I8ZNrilT5X8=*8~b`2)2p`DIT;`5EX=2wcgZ&5K!=@ z)C@%slu+!YBBY(0Nbn$d3l^&M&|7=(pwNTprGoQzw%IWc7JlFRzIi({%<6*nXhEBg znW=O-|2%%}L=otz0TBy`J^=c60cQ#rd;<)N-q9W4_%|Ti016r4j!B2sZm{`-3=2m zZgW%NE#j!m|0M2{{6}Hv)4tK6`+QL0sKRlDM-@&IdpDjYKEh_Z`&&(Fbx-;(jQkg^N6jdH>wvxU4!m)M5D<(HJnli?n z)VA9nbLYi!Gm5Gf=7MgDJQm9(_~fai;y)|RxPOpq^@%I4%2T=;PO#L_m#RI&U!S%0 EfA|NAxBvhE delta 1003 zcmZ9KOK1~87=ZtMkfceWYpmNu6Im0bQbJz4m`y+%La|W6gNK3zLz@;~jcpJ?3PM5; ziWjL4ISO8c-~-h4>;pV`D6!SOR1+ZF0*EF6v<5)D129QrQyM_p1E6;Saut9xKLJW*fSDbD*}2yr zo=J3)nJ2xJDra-1LDJEa)+_n85TH%;dshXxK~kRWN8V2!!w2v}Bw8j$etGW*3c2Qs zdydm8MI^<-JXuWmNYA%d{{#J_Q1lCfet`P86H= ' ') - { - print("%c", str[i]); - } - else - { - print("[%d]", str[i]); - } - } - */ - - - int mVccwL = ee_getInt(_AB360_EE_Start_ + _AB360_EE_mVccwL_); - int bVccwL = ee_getInt(_AB360_EE_Start_ + _AB360_EE_bVccwL_); - int mVcwL = ee_getInt(_AB360_EE_Start_ + _AB360_EE_mVcwL_); - int bVcwL = ee_getInt(_AB360_EE_Start_ + _AB360_EE_bVcwL_); - - int mVccwR = ee_getInt(_AB360_EE_Start_ + _AB360_EE_mVccwR_); - int bVccwR = ee_getInt(_AB360_EE_Start_ + _AB360_EE_bVccwR_); - int mVcwR = ee_getInt(_AB360_EE_Start_ + _AB360_EE_mVcwR_); - int bVcwR = ee_getInt(_AB360_EE_Start_ + _AB360_EE_bVcwR_); - - /* - servo360_setTransferFunction(abd360_pinCtrlLeft, S360_SETTING_VM_CCW, mVccwL); - servo360_setTransferFunction(abd360_pinCtrlLeft, S360_SETTING_VB_CCW, bVccwL); - servo360_setTransferFunction(abd360_pinCtrlLeft, S360_SETTING_VM_CW, mVcwL); - servo360_setTransferFunction(abd360_pinCtrlLeft, S360_SETTING_VB_CW, -bVcwL ); - - servo360_setTransferFunction(abd360_pinCtrlRight, S360_SETTING_VM_CCW, mVccwR ); - servo360_setTransferFunction(abd360_pinCtrlRight, S360_SETTING_VB_CCW, bVccwR); - servo360_setTransferFunction(abd360_pinCtrlRight, S360_SETTING_VM_CW, mVcwR); - servo360_setTransferFunction(abd360_pinCtrlRight, S360_SETTING_VB_CW, -bVcwR); - */ - - /* - print("Inverse Transfer Function Constants\r"); - print("for y = mx + b\r"); - print("y: offset from 15,000 in 0.1 us units\r"); - print("m: Slope in 0.1us/4096 rps\r"); - print("x: Desired speed in 4096ths of a revolution/second\r"); - print("b: number of 0.1 us increments added to 15000\r"); - print("\r===================================\r"); - print("\rLeft Servo, Counterclockwise\r"); - print("m = %d\r", mVccwL); - print("b = %d\r", bVccwL); - print("\rLeft Servo, Clockwise\r"); - print("m = %d\r", mVcwL); - print("b = %d\r", bVcwL); - - print("\rRight Servo, Counterclockwise\r"); - print("m = %d\r", mVccwR); - print("b = %d\r", bVccwR); - print("\rRight Servo, Clockwise\r"); - print("m = %d\r", mVcwR); - print("b = %d\r", bVcwR); - */ -} - - - -/** - * TERMS OF USE: MIT License - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ diff --git a/version.txt b/version.txt index 2aca8c01..a557cb67 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v1.4.6 +v1.4.14