Jim Conner / Mbed 2 deprecated mbed_oled

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   Adafruit_GFX SPI_TFT_ILI9341 TFT_fonts hx711 mbed

main.cpp@5:1f0fc1bc6850, 2015-03-31 (annotated)

Committer:
jimconner
Date:
Tue Mar 31 13:57:31 2015 +0000
Revision:
5:1f0fc1bc6850
Parent:
4:89541d91cef1
Child:
6:f0ee0b0bc480
Rudimentary support for some buttons.

Who changed what in which revision?

UserRevisionLine numberNew contents of line
jimconner 0:3745349c0c83 1 /*
jimconner 0:3745349c0c83 2 * Copyright (c) 2012 Neal Horman - http://www.wanlink.com
jimconner 0:3745349c0c83 3 *
jimconner 0:3745349c0c83 4 * License: MIT open source (http://opensource.org/licenses/MIT)
jimconner 0:3745349c0c83 5 * Summary;
jimconner 0:3745349c0c83 6 * Use / modify / distribute / publish it how you want and
jimconner 0:3745349c0c83 7 * if you use it, or don't, you can't hold me liable for how
jimconner 0:3745349c0c83 8 * it does or doesn't work.
jimconner 0:3745349c0c83 9 * If it doesn't work how you want, don't use it, or change
jimconner 0:3745349c0c83 10 * it so that it does work.
jimconner 0:3745349c0c83 11 */
jimconner 0:3745349c0c83 12
jimconner 0:3745349c0c83 13 #include "mbed.h"
jimconner 0:3745349c0c83 14 #include "Adafruit_SSD1306.h"
jimconner 0:3745349c0c83 15 #include "Adafruit_GFX.h"
jimconner 0:3745349c0c83 16 #include "PinNames.h"
jimconner 3:6dcf74b20bed 17 #include "SPI_TFT_ILI9341.h"
jimconner 3:6dcf74b20bed 18 #include "string"
jimconner 3:6dcf74b20bed 19 #include "Arial12x12.h"
jimconner 3:6dcf74b20bed 20 #include "Arial24x23.h"
jimconner 3:6dcf74b20bed 21 #include "Arial28x28.h"
jimconner 3:6dcf74b20bed 22 #include "font_big.h"
jimconner 0:3745349c0c83 23
jimconner 2:c5f60c130f9a 24 DigitalOut led1(LED1);
jimconner 2:c5f60c130f9a 25 DigitalOut led2(LED2);
jimconner 0:3745349c0c83 26
jimconner 5:1f0fc1bc6850 27 DigitalIn sw_left(PTC8);
jimconner 5:1f0fc1bc6850 28 DigitalIn sw_right(PTC9);
jimconner 5:1f0fc1bc6850 29 DigitalIn sw_up(PTC0);
jimconner 5:1f0fc1bc6850 30 DigitalIn sw_down(PTC7);
jimconner 5:1f0fc1bc6850 31 DigitalIn sw_fire(PTC5);
jimconner 5:1f0fc1bc6850 32
jimconner 3:6dcf74b20bed 33 BusOut MuxPortOut(PTB11, PTB2, PTB10, PTB3);
jimconner 3:6dcf74b20bed 34
jimconner 3:6dcf74b20bed 35 DigitalOut LCD_LED(PTC3); // the TFT display has a backlight switch
jimconner 3:6dcf74b20bed 36
jimconner 3:6dcf74b20bed 37 extern unsigned char p1[]; // the mbed logo
jimconner 3:6dcf74b20bed 38 // the TFT is connected to SPI pin 5-7
jimconner 3:6dcf74b20bed 39 SPI_TFT_ILI9341 TFT(PTD2, PTD3, PTD1, PTD0, PTC4, PTE26,"TFT"); // mosi, miso, sck, cs, reset, dc
jimconner 3:6dcf74b20bed 40
jimconner 0:3745349c0c83 41
jimconner 0:3745349c0c83 42 // an SPI sub-class that provides a constructed default
jimconner 0:3745349c0c83 43 class SPIPreInit : public SPI
jimconner 0:3745349c0c83 44 {
jimconner 0:3745349c0c83 45 public:
jimconner 0:3745349c0c83 46 SPIPreInit(PinName mosi, PinName miso, PinName clk) : SPI(mosi,miso,clk)
jimconner 0:3745349c0c83 47 {
jimconner 0:3745349c0c83 48 format(8,3);
jimconner 0:3745349c0c83 49 frequency(2000000);
jimconner 0:3745349c0c83 50 };
jimconner 0:3745349c0c83 51 };
jimconner 0:3745349c0c83 52
jimconner 0:3745349c0c83 53 // an I2C sub-class that provides a constructed default
jimconner 0:3745349c0c83 54 class I2CPreInit : public I2C
jimconner 0:3745349c0c83 55 {
jimconner 0:3745349c0c83 56 public:
jimconner 3:6dcf74b20bed 57 I2CPreInit(PinName sda, PinName scl) : I2C(sda, scl)
jimconner 0:3745349c0c83 58 {
jimconner 0:3745349c0c83 59 frequency(800000);
jimconner 0:3745349c0c83 60 start();
jimconner 0:3745349c0c83 61 wait(0.1); // needed so that the displays initialise properly at power-on.
jimconner 0:3745349c0c83 62 };
jimconner 0:3745349c0c83 63 };
jimconner 0:3745349c0c83 64
jimconner 0:3745349c0c83 65 //SPIPreInit gSpi(p5,NC,p7);
jimconner 0:3745349c0c83 66 //Adafruit_SSD1306_Spi gOled1(gSpi,p26,p25,p24);
jimconner 0:3745349c0c83 67
jimconner 3:6dcf74b20bed 68 I2CPreInit gI2C(I2C_SDA,I2C_SCL);
jimconner 1:c09b25119427 69 //mux_SSD1306_I2c gOled1(gI2C,Reset_Pin,muxport, muxmask, 0, 0x78,64);
jimconner 1:c09b25119427 70
jimconner 3:6dcf74b20bed 71 mux_SSD1306_I2c gOled1(gI2C,PTC16,MuxPortOut, 0, 0x78,64);
jimconner 3:6dcf74b20bed 72 mux_SSD1306_I2c gOled2(gI2C,PTC16,MuxPortOut, 0, 0x7A,64);
jimconner 3:6dcf74b20bed 73 mux_SSD1306_I2c gOled3(gI2C,PTC16,MuxPortOut, 1, 0x78,64);
jimconner 3:6dcf74b20bed 74 mux_SSD1306_I2c gOled4(gI2C,PTC16,MuxPortOut, 1, 0x7A,64);
jimconner 3:6dcf74b20bed 75 mux_SSD1306_I2c gOled5(gI2C,PTC16,MuxPortOut, 2, 0x78,64);
jimconner 3:6dcf74b20bed 76 mux_SSD1306_I2c gOled6(gI2C,PTC16,MuxPortOut, 2, 0x7A,64);
jimconner 3:6dcf74b20bed 77 mux_SSD1306_I2c gOled7(gI2C,PTC16,MuxPortOut, 3, 0x78,64);
jimconner 3:6dcf74b20bed 78 mux_SSD1306_I2c gOled8(gI2C,PTC16,MuxPortOut, 3, 0x7A,64);
jimconner 3:6dcf74b20bed 79 mux_SSD1306_I2c gOled9(gI2C,PTC16,MuxPortOut, 4, 0x78,64);
jimconner 1:c09b25119427 80
jimconner 1:c09b25119427 81
jimconner 1:c09b25119427 82
jimconner 0:3745349c0c83 83
jimconner 0:3745349c0c83 84 void testdrawline() {
jimconner 0:3745349c0c83 85 for (int16_t i=0; i<gOled1.width(); i+=4) {
jimconner 0:3745349c0c83 86 gOled1.drawLine(0, 0, i, gOled1.height()-1, WHITE);
jimconner 0:3745349c0c83 87 gOled1.display();
jimconner 0:3745349c0c83 88 }
jimconner 0:3745349c0c83 89 for (int16_t i=0; i<gOled2.height(); i+=4) {
jimconner 0:3745349c0c83 90 gOled2.drawLine(0, 0, gOled2.width()-1, i, WHITE);
jimconner 0:3745349c0c83 91 gOled2.display();
jimconner 0:3745349c0c83 92 }
jimconner 0:3745349c0c83 93 for (int16_t i=0; i<gOled3.height(); i+=4) {
jimconner 0:3745349c0c83 94 gOled3.drawLine(0, 0, gOled3.width()-1, i, WHITE);
jimconner 0:3745349c0c83 95 gOled3.display();
jimconner 0:3745349c0c83 96 }
jimconner 3:6dcf74b20bed 97 for (int16_t i=0; i<gOled4.width(); i+=4) {
jimconner 3:6dcf74b20bed 98 gOled4.drawLine(0, 0, i, gOled4.height()-1, WHITE);
jimconner 3:6dcf74b20bed 99 gOled4.display();
jimconner 3:6dcf74b20bed 100 }
jimconner 1:c09b25119427 101 for (int16_t i=0; i<gOled5.width(); i+=4) {
jimconner 1:c09b25119427 102 gOled5.drawLine(0, 0, i, gOled5.height()-1, WHITE);
jimconner 1:c09b25119427 103 gOled5.display();
jimconner 1:c09b25119427 104 }
jimconner 1:c09b25119427 105 for (int16_t i=0; i<gOled6.width(); i+=4) {
jimconner 1:c09b25119427 106 gOled6.drawLine(0, 0, i, gOled6.height()-1, WHITE);
jimconner 1:c09b25119427 107 gOled6.display();
jimconner 1:c09b25119427 108 }
jimconner 2:c5f60c130f9a 109 for (int16_t i=0; i<gOled7.width(); i+=4) {
jimconner 2:c5f60c130f9a 110 gOled7.drawLine(0, 0, i, gOled7.height()-1, WHITE);
jimconner 2:c5f60c130f9a 111 gOled7.display();
jimconner 2:c5f60c130f9a 112 }
jimconner 1:c09b25119427 113 for (int16_t i=0; i<gOled8.width(); i+=4) {
jimconner 1:c09b25119427 114 gOled8.drawLine(0, 0, i, gOled8.height()-1, WHITE);
jimconner 1:c09b25119427 115 gOled8.display();
jimconner 1:c09b25119427 116 }
jimconner 3:6dcf74b20bed 117 for (int16_t i=0; i<gOled9.width(); i+=4) {
jimconner 3:6dcf74b20bed 118 gOled9.drawLine(0, 0, i, gOled9.height()-1, WHITE);
jimconner 3:6dcf74b20bed 119 gOled9.display();
jimconner 3:6dcf74b20bed 120 }
jimconner 0:3745349c0c83 121
jimconner 0:3745349c0c83 122 }
jimconner 0:3745349c0c83 123
jimconner 0:3745349c0c83 124
jimconner 0:3745349c0c83 125
jimconner 0:3745349c0c83 126 int main()
jimconner 3:6dcf74b20bed 127 {
jimconner 5:1f0fc1bc6850 128 // Set our imput buttons to pull-up mode
jimconner 5:1f0fc1bc6850 129 sw_left.mode(PullUp);
jimconner 5:1f0fc1bc6850 130 sw_right.mode(PullUp);
jimconner 5:1f0fc1bc6850 131 sw_up.mode(PullUp);
jimconner 5:1f0fc1bc6850 132 sw_down.mode(PullUp);
jimconner 5:1f0fc1bc6850 133 sw_fire.mode(PullUp);
jimconner 5:1f0fc1bc6850 134
jimconner 3:6dcf74b20bed 135 // ILI9341 Test Routine
jimconner 3:6dcf74b20bed 136 int i;
jimconner 3:6dcf74b20bed 137 LCD_LED = 1; // backlight on
jimconner 3:6dcf74b20bed 138
jimconner 3:6dcf74b20bed 139 TFT.claim(stdout); // send stdout to the TFT display
jimconner 3:6dcf74b20bed 140 //TFT.claim(stderr); // send stderr to the TFT display
jimconner 3:6dcf74b20bed 141 TFT.set_orientation(1);
jimconner 3:6dcf74b20bed 142 TFT.background(Black); // set background to black
jimconner 3:6dcf74b20bed 143 TFT.foreground(White); // set chars to white
jimconner 3:6dcf74b20bed 144 TFT.cls(); // clear the screen
jimconner 3:6dcf74b20bed 145
jimconner 3:6dcf74b20bed 146 //first show the 4 directions
jimconner 3:6dcf74b20bed 147 TFT.set_orientation(0);
jimconner 3:6dcf74b20bed 148 TFT.background(Black);
jimconner 3:6dcf74b20bed 149 TFT.cls();
jimconner 3:6dcf74b20bed 150
jimconner 3:6dcf74b20bed 151 TFT.set_font((unsigned char*) Arial12x12);
jimconner 3:6dcf74b20bed 152 TFT.locate(0,0);
jimconner 3:6dcf74b20bed 153 TFT.printf(" Hello Mbed 0");
jimconner 3:6dcf74b20bed 154 TFT.set_orientation(1);
jimconner 3:6dcf74b20bed 155 TFT.locate(0,0);
jimconner 3:6dcf74b20bed 156 TFT.printf(" Hello Mbed 1");
jimconner 3:6dcf74b20bed 157 TFT.set_orientation(2);
jimconner 3:6dcf74b20bed 158 TFT.locate(0,0);
jimconner 3:6dcf74b20bed 159 TFT.printf(" Hello Mbed 2");
jimconner 3:6dcf74b20bed 160 TFT.set_orientation(3);
jimconner 3:6dcf74b20bed 161 TFT.locate(0,0);
jimconner 3:6dcf74b20bed 162 TFT.printf(" Hello Mbed 3");
jimconner 4:89541d91cef1 163 TFT.set_orientation(2);
jimconner 3:6dcf74b20bed 164 TFT.set_font((unsigned char*) Arial24x23);
jimconner 4:89541d91cef1 165 TFT.locate(5,100);
jimconner 4:89541d91cef1 166 TFT.printf("The Mixologist");
jimconner 3:6dcf74b20bed 167
jimconner 3:6dcf74b20bed 168 // draw some graphics
jimconner 3:6dcf74b20bed 169 TFT.cls();
jimconner 3:6dcf74b20bed 170 TFT.set_font((unsigned char*) Arial24x23);
jimconner 4:89541d91cef1 171 TFT.locate(5,100);
jimconner 4:89541d91cef1 172 TFT.printf("The Mixologist");
jimconner 3:6dcf74b20bed 173
jimconner 3:6dcf74b20bed 174 TFT.line(0,0,100,0,Green);
jimconner 3:6dcf74b20bed 175 TFT.line(0,0,0,200,Green);
jimconner 3:6dcf74b20bed 176 TFT.line(0,0,100,200,Green);
jimconner 3:6dcf74b20bed 177
jimconner 3:6dcf74b20bed 178 TFT.rect(100,50,150,100,Red);
jimconner 3:6dcf74b20bed 179 TFT.fillrect(180,25,220,70,Blue);
jimconner 3:6dcf74b20bed 180
jimconner 3:6dcf74b20bed 181 TFT.circle(80,150,33,White);
jimconner 3:6dcf74b20bed 182 TFT.fillcircle(160,190,20,Yellow);
jimconner 3:6dcf74b20bed 183
jimconner 3:6dcf74b20bed 184 double s;
jimconner 3:6dcf74b20bed 185
jimconner 3:6dcf74b20bed 186 for (i=0; i<320; i++) {
jimconner 3:6dcf74b20bed 187 s =20 * sin((long double) i / 10 );
jimconner 3:6dcf74b20bed 188 TFT.pixel(i,100 + (int)s ,Red);
jimconner 3:6dcf74b20bed 189 }
jimconner 3:6dcf74b20bed 190 TFT.set_orientation(2);
jimconner 3:6dcf74b20bed 191 TFT.set_font((unsigned char*) Arial24x23);
jimconner 3:6dcf74b20bed 192
jimconner 3:6dcf74b20bed 193 /* // bigger text
jimconner 3:6dcf74b20bed 194 TFT.foreground(White);
jimconner 3:6dcf74b20bed 195 TFT.background(Blue);
jimconner 3:6dcf74b20bed 196 TFT.cls();
jimconner 3:6dcf74b20bed 197 TFT.set_font((unsigned char*) Arial24x23);
jimconner 3:6dcf74b20bed 198 TFT.locate(0,0);
jimconner 3:6dcf74b20bed 199 TFT.printf("Different Fonts :");
jimconner 3:6dcf74b20bed 200
jimconner 3:6dcf74b20bed 201 TFT.set_font((unsigned char*) Neu42x35);
jimconner 3:6dcf74b20bed 202 TFT.locate(0,30);
jimconner 3:6dcf74b20bed 203 TFT.printf("Hello Mbed 1");
jimconner 3:6dcf74b20bed 204 TFT.set_font((unsigned char*) Arial24x23);
jimconner 3:6dcf74b20bed 205 TFT.locate(20,80);
jimconner 3:6dcf74b20bed 206 TFT.printf("Hello Mbed 2");
jimconner 3:6dcf74b20bed 207 TFT.set_font((unsigned char*) Arial12x12);
jimconner 3:6dcf74b20bed 208 TFT.locate(35,120);
jimconner 3:6dcf74b20bed 209 TFT.printf("Hello Mbed 3");
jimconner 3:6dcf74b20bed 210 */
jimconner 3:6dcf74b20bed 211
jimconner 3:6dcf74b20bed 212 // start of OLED Code
jimconner 3:6dcf74b20bed 213 uint16_t x=0;
jimconner 0:3745349c0c83 214 uint16_t y=65535;
jimconner 0:3745349c0c83 215 uint16_t a=16348;
jimconner 0:3745349c0c83 216 uint16_t b=49152;
jimconner 0:3745349c0c83 217 led1=1;
jimconner 0:3745349c0c83 218 led2=1;
jimconner 0:3745349c0c83 219
jimconner 0:3745349c0c83 220 gOled1.clearDisplay();
jimconner 0:3745349c0c83 221 gOled2.clearDisplay();
jimconner 0:3745349c0c83 222 gOled3.clearDisplay();
jimconner 3:6dcf74b20bed 223 gOled4.clearDisplay();
jimconner 1:c09b25119427 224 gOled5.clearDisplay();
jimconner 1:c09b25119427 225 gOled6.clearDisplay();
jimconner 2:c5f60c130f9a 226 gOled7.clearDisplay();
jimconner 1:c09b25119427 227 gOled8.clearDisplay();
jimconner 3:6dcf74b20bed 228 gOled9.clearDisplay();
jimconner 0:3745349c0c83 229
jimconner 0:3745349c0c83 230 testdrawline();
jimconner 0:3745349c0c83 231
jimconner 0:3745349c0c83 232 gOled1.clearDisplay();
jimconner 0:3745349c0c83 233 gOled2.clearDisplay();
jimconner 0:3745349c0c83 234 gOled3.clearDisplay();
jimconner 3:6dcf74b20bed 235 gOled4.clearDisplay();
jimconner 1:c09b25119427 236 gOled5.clearDisplay();
jimconner 1:c09b25119427 237 gOled6.clearDisplay();
jimconner 2:c5f60c130f9a 238 gOled7.clearDisplay();
jimconner 1:c09b25119427 239 gOled8.clearDisplay();
jimconner 3:6dcf74b20bed 240 gOled9.clearDisplay();
jimconner 0:3745349c0c83 241
jimconner 1:c09b25119427 242 gOled1.printf(" Aqua Vega A \r\n\n\n\n", gOled1.width(), gOled1.height());
jimconner 1:c09b25119427 243 gOled2.printf(" Aqua Vega B \r\n\n\n\n", gOled2.width(), gOled2.height());
jimconner 1:c09b25119427 244 gOled3.printf(" Cannazyme \r\n\n\n\n", gOled3.width(), gOled3.height());
jimconner 3:6dcf74b20bed 245 gOled4.printf(" Rhizotonic \r\n\n\n\n", gOled4.width(), gOled4.height());
jimconner 1:c09b25119427 246 gOled5.printf(" Aqua Flores A \r\n\n\n\n", gOled5.width(), gOled5.height());
jimconner 1:c09b25119427 247 gOled6.printf(" Aqua Flores B \r\n\n\n\n", gOled6.width(), gOled6.height());
jimconner 2:c5f60c130f9a 248 gOled7.printf(" PK13/14 \r\n\n\n\n", gOled7.width(), gOled7.height());
jimconner 1:c09b25119427 249 gOled8.printf(" Cannaboost \r\n\n\n\n", gOled8.width(), gOled8.height());
jimconner 3:6dcf74b20bed 250 gOled9.printf(" pH-Down \r\n\n\n\n", gOled9.width(), gOled9.height());
jimconner 0:3745349c0c83 251 gOled1.setTextSize(2);
jimconner 0:3745349c0c83 252 gOled2.setTextSize(2);
jimconner 0:3745349c0c83 253 gOled3.setTextSize(2);
jimconner 3:6dcf74b20bed 254 gOled4.setTextSize(2);
jimconner 1:c09b25119427 255 gOled5.setTextSize(2);
jimconner 1:c09b25119427 256 gOled6.setTextSize(2);
jimconner 2:c5f60c130f9a 257 gOled7.setTextSize(2);
jimconner 1:c09b25119427 258 gOled8.setTextSize(2);
jimconner 3:6dcf74b20bed 259 gOled9.setTextSize(2);
jimconner 0:3745349c0c83 260
jimconner 4:89541d91cef1 261 TFT.cls();
jimconner 0:3745349c0c83 262 while(1)
jimconner 0:3745349c0c83 263 {
jimconner 2:c5f60c130f9a 264 led1 = 0;
jimconner 0:3745349c0c83 265 gOled1.printf(" %uml\r",x);
jimconner 0:3745349c0c83 266 gOled1.display();
jimconner 1:c09b25119427 267 gOled6.printf(" %uml\r",x);
jimconner 1:c09b25119427 268 gOled6.display();
jimconner 0:3745349c0c83 269 led1 = 1;
jimconner 2:c5f60c130f9a 270 led2 = 0;
jimconner 0:3745349c0c83 271 gOled2.printf(" %uml\r",y);
jimconner 0:3745349c0c83 272 gOled2.display();
jimconner 3:6dcf74b20bed 273 gOled4.printf(" %uml\r",y);
jimconner 3:6dcf74b20bed 274 gOled4.display();
jimconner 2:c5f60c130f9a 275 gOled7.printf(" %uml\r",y);
jimconner 2:c5f60c130f9a 276 gOled7.display();
jimconner 1:c09b25119427 277 gOled3.printf(" %uml\r",a);
jimconner 0:3745349c0c83 278 gOled3.display();
jimconner 1:c09b25119427 279 gOled8.printf(" %uml\r",a);
jimconner 1:c09b25119427 280 gOled8.display();
jimconner 1:c09b25119427 281 gOled5.printf(" %uml\r",b);
jimconner 1:c09b25119427 282 gOled5.display();
jimconner 3:6dcf74b20bed 283 gOled9.printf(" %uml\r",b);
jimconner 3:6dcf74b20bed 284 gOled9.display();
jimconner 0:3745349c0c83 285 led2 = 1;
jimconner 0:3745349c0c83 286 x++;
jimconner 0:3745349c0c83 287 y--;
jimconner 5:1f0fc1bc6850 288 if ( sw_up == 0 ){
jimconner 5:1f0fc1bc6850 289 a++;
jimconner 5:1f0fc1bc6850 290 }
jimconner 5:1f0fc1bc6850 291 if ( sw_down == 0 ){
jimconner 5:1f0fc1bc6850 292 a--;
jimconner 5:1f0fc1bc6850 293 }
jimconner 5:1f0fc1bc6850 294
jimconner 0:3745349c0c83 295 b--;
jimconner 4:89541d91cef1 296 TFT.locate(10,80);
jimconner 4:89541d91cef1 297 TFT.foreground(65535);
jimconner 3:6dcf74b20bed 298 TFT.printf("A Value:%d",a);
jimconner 4:89541d91cef1 299 TFT.locate(10,120);
jimconner 4:89541d91cef1 300 TFT.foreground(65504);
jimconner 3:6dcf74b20bed 301 TFT.printf("B Value:%d",b);
jimconner 4:89541d91cef1 302 TFT.locate(10,160);
jimconner 4:89541d91cef1 303 TFT.foreground(2016);
jimconner 3:6dcf74b20bed 304 TFT.printf("X Value:%d",x);
jimconner 4:89541d91cef1 305 TFT.locate(10,200);
jimconner 4:89541d91cef1 306 TFT.foreground(05535);
jimconner 3:6dcf74b20bed 307 TFT.printf("Y Value:%d",y);
jimconner 0:3745349c0c83 308 //wait(0.1);
jimconner 0:3745349c0c83 309 }
jimconner 0:3745349c0c83 310 }