From 4f31bfbef768b29d249e98b69c8e9fa9c529fbb3 Mon Sep 17 00:00:00 2001 From: dschin Date: Mon, 16 Aug 2010 23:40:27 +0000 Subject: [PATCH] Fixes for the project files. Hopefully they don't break someone else. Eclipse Workspace: - Made project in Eclipse workspace point to trunk/flight - Re imported launch configurations from previous version OpenOCD - added "ft2232_device_desc "Dual RS232-HS"" back to jtag cfg files because windows didn't like it w/o it. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1305 ebee16cc-31ac-478f-84a7-5cbb03baadba --- flight/Project/Eclipse/OPWrkSpace.zip | Bin 6496 -> 6286 bytes flight/Project/OpenOCD/floss-jtag.ahrs.cfg | 2 +- .../Project/OpenOCD/floss-jtag.openpilot.cfg | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flight/Project/Eclipse/OPWrkSpace.zip b/flight/Project/Eclipse/OPWrkSpace.zip index 0148c7c6e856be2422a5f8f0ff7daa8664edbf07..a852d20838820880088c65db7d1416039ed6b154 100644 GIT binary patch delta 1736 zcmZvcdpOg39LIldo7u3bTLgEOUdr7PkNjUACIp=gvPtW;$pYP{+KcDaW^ZkCG&mXS|LXP2$E$~b@LQEV3 zY{XnT(js3*msy#CwAk@LD^yGZ07z&6kP)8ghf$;bj`&6U;q^nq14l{YE_x=IlN7Wd zt&~6G&+bML6L?<|yu6;&yiA`7I7gpzJVkLZc)-UArJ-^rbZc_Hd+mD;(dC1 zE7Y>mra#WkONX3jInFtp^y3TBy(9w+9dOrj$GJuAI{XF9n9-x zQ`W7q;`pi;j;D>(8|zm_!|RIdHvcwEM9r3_*v~11&3awPmps}Wqkrj6!DhBpid&FP za-YSgWAUG#+1AD-uN_b7xjaU~n>JU?U zD5H7`k3*#%b?q*hV5(sw+VJiCyYW=ZV$DeptWU!GA&=efGiX{G*%;??Ue%a0?aIrK zE;8d<=}JdQwZE5B0T93nz4??;%1DY%^zcz8P zZGQ{sW$AYZsV(_1uAuvdJbT$=-J`*EP^a@QhD(X-nksgcQ}&TEW4W)c`os7BuA8l7 z>{zQqO^pEcqoFoz`wLGLqp z%z@qc&xuw1334X3X?S_;kuwWFbyUfFq|w4ijCYU|v6a$DNbCP>ipM~_elfH~$d(Vt zudY+e+IF?H`>spK^|_C@L(76jaru$d>2-IAIoc@-O^3>b*8BSh#QB^J7EZZSHjIu%f%H zi{F{1at7C0K=P~oI_{BQKo%!eqFSWZq-5>q9EG0(r;RXD|larP6SSC5sbGgW_NKj~?S)Ae_ zA{ILc08<4+f|xFmx)dDZz;gr)Ax@M9rl2>7#SWezcUoqb+LK446NB}|6x%& z=jYjb`>^*K`i#l%jLnuS(gkx_rYHlBW2`Boi96=~nXaGrlv3)r?UmfJ{o_*>z*D)K zk_#zqJP{3l=H0EGcMnA3pbIr_o@z_xXI?HuJZT_(7)|wVP(vhgaK#sPs{2iWA{>dCuxn#M<0E$2-r9vSfSpn4EnkKtL{s)$1M*p)1(1`FgQJ}@7a&?SVbyHW2FoN5trrOk5)%Z} zqU{_1H3{>Zwg+^p`Ma#$cJ>6b9#^a=x38x^TLjP$=3DR|LH*-h8{Th$`X&IRP`wtW?;sx*7aB*$|Jbh5tlJJ-6S_CH`oH}e zLWMzraS&~=Oi>DKRZtUkK!ewzYT#D|slR3b!WET7lhEKSR2Otr{HI0{);uv_3ruUH r?XS61D=Oo2<-h+)3^g(;IGnB@Ob>Q-kbrEwDJ5KG!in*OMgaH|w$J9{ delta 1996 zcmZuyc{JN;7yc#I2qBhON>NK?s;L@lHAM)u)V@?(YnWIXYl1QryVep*>`iDfmR41! zifUD6;s7U3 zTq!i57D18Z)Nly8Z5i4#!2MH&FyXqPMR%(fbtYY6yPa?XvB%o_O4%<)N_I z>;zGHQ#D|8?natT0zELnm^kdOQk82lKbaJSU$1)pX&)Vyr$cZr)-=fIMx7G(d=@bj z)qskvTpsb?`yhLb!jjdabJb+b|L}Tk2Q1k_K17|FUa#?}RKzo?_f-AP%9y3qwMuN+ zj0buCLR->zF0}|_{*H)z7Cq$SX6hhEaYz`tSX&i0450^Ti7PftEn1b(EJf{8Fi0ZC zv?7+d%-p2htZvEPFG>Tms4+DE&v-eePSknum(%MBM#`V7B z{8UI@V4@X0Kz6w}xy2U~R(u^bbkO+X zPAN`G@;vvORS@WT!ebzmcVzbSy3}j7AL?h6ef{r|~ zBAD39d%KT`yX85CImqms9LUS#@Y0cFso7qKJG!_b)v=YV-2FPkJ-N<7p%QClCrDRO z*9X53YkTLa!oY5$Cgs(=v_b&8{M>3RK`eVARl!1Z7=Oe(OT;;Ob9%2EC6N(X{m8`FMKqcc0=Nay4MCRu-F2 zh|ru(F$*1}XYp&l^R4IOi06CIj ziN)dCH)Cq5#)yU&?$|I^K)WV(SbSf>itKduN{UYe{{bXR=50in0mejWy7WXdy;G;&rm!gMH<6-hm zrq;c?TsBR?7j0Gp$jfbWf~|_Bg_zcoCykxy7MdqnUD3|{y>Y<>9okgHq*IFA$Z3mf zKF_xjLfk2<<_1-!Em zmspdhnROWO`5NxjCjmO{RTUMXFTyJtI}w5gR?uD(?ZwAhzZA)5Z;j{X%B*-h$6@R zDD*f%=78^TX@{n>!M#wlorF!AT1rFz74?%>gZz@q@SmTbjFMSL2JtJVOSq|RPtD^x zTG2xKj7s@ZbjMA)dcJ4BFha=VzP!$!e{(zO+$@?e-SwXHZ9 zH;gYwk`uPxWauwccd|$^`BFCVs`wN>!{ts=XzZ$?vn~vVLYJX9R0M{#=K&Rwxqa8 zg5n|2w4ii1-)W{lu7>554P|0w{#f&Runo-=VUoH2afK*f2z5(D9UkRfXwZ)AhU~M= zfCKqFxH#2FQski{{0xZu3fns#=8BGjxOZ{v3NNk+;))J{P-zkv2KXkF3<8S-|F{gB z{&xufT`Byp`j^$MbQrU6fD*t3avz j2rZ>^LTq8U(D0BzKOE7{iiejoEWkcAFaR_lIJf@--M>bb diff --git a/flight/Project/OpenOCD/floss-jtag.ahrs.cfg b/flight/Project/OpenOCD/floss-jtag.ahrs.cfg index b431bbb76..f2555e55a 100644 --- a/flight/Project/OpenOCD/floss-jtag.ahrs.cfg +++ b/flight/Project/OpenOCD/floss-jtag.ahrs.cfg @@ -4,7 +4,7 @@ interface ft2232 ft2232_vid_pid 0x0403 0x6010 -#ft2232_device_desc "Dual RS232-HS" +ft2232_device_desc "Dual RS232-HS" #ft2232_bus_addr "002:103" #ft2232_serial "1234567890" ft2232_layout "usbjtag" diff --git a/flight/Project/OpenOCD/floss-jtag.openpilot.cfg b/flight/Project/OpenOCD/floss-jtag.openpilot.cfg index cd5f8a28e..d61d776b0 100644 --- a/flight/Project/OpenOCD/floss-jtag.openpilot.cfg +++ b/flight/Project/OpenOCD/floss-jtag.openpilot.cfg @@ -4,7 +4,7 @@ interface ft2232 ft2232_vid_pid 0x0403 0x6010 -#ft2232_device_desc "Dual RS232-HS" +ft2232_device_desc "Dual RS232-HS" #ft2232_bus_addr "002:088" #ft2232_serial "1234567890" ft2232_layout "usbjtag"