Kenji Arai / GR-PEACH_test_ADC

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:  

Fork of GR-PEACH_test_wo_rtos by Kenji Arai

Diff: main.cpp

Revision:
6:849caec97744
Parent:
5:e8d4095d9c19
Child:
7:c87a84872d85
--- a/main.cpp	Fri Jan 09 22:37:38 2015 +0000
+++ b/main.cpp	Fri Jan 09 22:50:07 2015 +0000
@@ -6,7 +6,7 @@
  *  http://www.page.sannet.ne.jp/kenjia/index.html
  *  http://mbed.org/users/kenjiArai/
  *      Created: November  29th, 2014
- *      Revised: January    9th, 2015
+ *      Revised: January   10th, 2015
  *
  * 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
@@ -20,12 +20,10 @@
 #include    "L3GD20.h"
 #include    "LIS3DH.h"
 #include    "TextLCD.h"
-#include    "ST7565_SPI_LCD.h"
 
 //  Definition ------------------------------------------------------------------------------------
 #define USE_COM         // use Communication with PC(UART)
 #define USE_I2C_LCD
-//#define USE_SPI_LCD
 #define USE_I2C_SENSOR
  
 // Com
@@ -74,11 +72,6 @@
 // LCD
 TextLCD_I2C_N lcd0(&i2c, 0x7c, TextLCD::LCD16x2);  // LCD(Akizuki AQM0802A)
 #endif
-#ifdef USE_SPI_LCD
-// SPI LCD
-SPI         spi_lcd(D11, D12, D13); // mosi, miso, sck
-ST7565      lcd1(spi_lcd, D8, D9, D7, ST7565::AQM1248A); // spi,reset,a0,ncs, LCD(Akizuki AQM1248A)
-#endif
 
 //  RAM -------------------------------------------------------------------------------------------
 float fa[3];    // Acc  0:X, 1:Y, 2:Z
@@ -127,12 +120,6 @@
     lcd0.locate(0, 1);    // 2nd line top
     lcd0.printf("%8d",count++);
 #endif
-#ifdef USE_SPI_LCD
-    lcd1.locate(0,0);
-    lcd1.printf("G:%+6.1f,%+6.1f,%+6.1f \r\n", fg[0], fg[1], fg[2]);
-    lcd1.printf("A:%+6.1f,%+6.1f,%+6.1f \r\n", fa[0], fa[1], fa[2]);
-    lcd1.printf("%d\r\n", count++);
-#endif
 }
 
 void send_pc(void){
@@ -141,19 +128,6 @@
 }
 
 int main(void) {
-    // SPI LCD
-#ifdef USE_SPI_LCD
-    spi_lcd.frequency(100000);
-    lcd1.cls();
-    lcd1.set_contrast(0x2a);
-    lcd1.printf("test\r\n" );
-    lcd1.printf("Kenji Arai / JH1PJL\r\n" );
-    lcd1.printf("ABCDEFG 1234567890\r\n" );
-    lcd1.rect(5,30,120,62,1);
-    lcd1.circle(5,35,5,1);
-    lcd1.fillcircle(60,55,5,1);
-    lcd1.line(0,30,127,63,1);
-#endif
     // I2C LCD
 #ifdef USE_I2C_LCD
     lcd0.locate(0, 0);    // 1st line top