Kazuhiro Ouchi
/
GMT_counter
mbed Geiger counter
Diff: main.cpp
- Revision:
- 1:a03717f88919
- Parent:
- 0:72fdbcde2fa0
--- a/main.cpp Sun Jun 05 06:08:07 2011 +0000 +++ b/main.cpp Sun Jun 05 06:16:31 2011 +0000 @@ -1,9 +1,5 @@ #include "mbed.h" -// LCD -//#include "TextLCD.h" -//TextLCD lcd( p24, p26, p27, p28, p29, p30 ); // rs, e, d0-d3 - // OLED #include "MARMEX_OB_oled.h" MARMEX_OB_oled oled1( p5, p7, p27, p24, p26 ); // mosi, sclk, cs, rst, power_control @@ -19,12 +15,6 @@ int cpm_cnt = 0; int cpm_old = 0; -//void splash_lcd(void) { -// lcd.cls(); -// lcd.locate(0, 0); -// lcd.printf("GM D3372 Counter"); -//} - void splash_oled(void) { oled1.background( 0x000000 ); oled1.cls(); @@ -53,8 +43,6 @@ led = !led; total_cnt++; cpm_cnt++; -// lcd.locate(0, 1); -// lcd.printf("Total:%d %d cpm", total_cnt, cpm_old); oled1.locate(0, 3); oled1.printf("Total:%d", total_cnt); @@ -63,10 +51,6 @@ int main() { -// int colorbar_width = MARMEX_OB_oled::WIDTH / 8; - - //splash_lcd(); - int x = 0; splash_oled(); @@ -84,12 +68,9 @@ wait(1); } min = !min; // 1min -// lcd.locate(0, 1); -// lcd.printf("Total:%d %d cpm", total_cnt, cpm_old); oled1.locate(0,4); oled1.printf("%d cpm", cpm_old); - //oled1.pixel(128 - x, 128 - (cpm_old * 10), 0x0000ff00); oled1.fill(x, MARMEX_OB_oled::HEIGHT - (cpm_old * 10), 1, (cpm_old * 10), 0x0000ff00); x++; if (x > MARMEX_OB_oled::WIDTH) { x = 0; }