Revision 1:23d22ebf52c0, committed 2018-02-08

Comitter:

Joeatsumi

Date:

Thu Feb 08 09:59:50 2018 +0000

Parent:

0:c7278239bae6

Commit message:

2018/2/8/

Changed in this revision

diff -r c7278239bae6 -r 23d22ebf52c0 SDFileSystem.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SDFileSystem.lib	Thu Feb 08 09:59:50 2018 +0000
@@ -0,0 +1,1 @@
+http://developer.mbed.org/users/mbed_official/code/SDFileSystem/#8db0d3b02cec

diff -r c7278239bae6 -r 23d22ebf52c0 TextLCD0420.cpp
--- a/TextLCD0420.cpp	Sat Feb 19 12:01:04 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-/* mbed TextLCD Library
- * Copyright (c) 2007-2009 sford
- * Released under the MIT License: http://mbed.org/license/mit
- */
- // for 04row*20line LCD
- 
-#include "TextLCD0420.h"
-
-#include "mbed.h"
-#include "error.h"
-
-using namespace mbed;
-
-/*
- * useful info found at http://www.a-netz.de/lcd.en.php
- *
- *
- * Initialisation
- * ==============
- *
- * After attaching the supply voltage/after a reset, the display needs to be brought in to a defined state
- *
- * - wait approximately 15 ms so the display is ready to execute commands
- * - Execute the command 0x30 ("Display Settings") three times (wait 1,64ms after each command, the busy flag cannot be queried now). 
- * - The display is in 8 bit mode, so if you have only connected 4 data pins you should only transmit the higher nibble of each command.
- * - If you want to use the 4 bit mode, now you can execute the command to switch over to this mode now.
- * - Execute the "clear display" command
- *
- * Timing
- * ======
- *
- * Nearly all commands transmitted to the display need 40us for execution. 
- * Exceptions are the commands "Clear Display and Reset" and "Set Cursor to Start Position" 
- * These commands need 1.64ms for execution. These timings are valid for all displays working with an 
- * internal clock of 250kHz. But I do not know any displays that use other frequencies. Any time you 
- * can use the busy flag to test if the display is ready to accept the next command.
- * 
- * _e is kept high apart from calling clock
- * _rw is kept 0 (write) apart from actions that uyse it differently
- * _rs is set by the data/command writes
- */
-
-TextLCD::TextLCD(PinName rs, PinName rw, PinName e, PinName d0, PinName d1, 
-    PinName d2, PinName d3, int columns, int rows) : _rw(rw), _rs(rs), 
-    _e(e), _d(d0, d1, d2, d3), _columns(columns), _rows(rows) {
-
-   
-    // Mon, 27 Apr 2009 23:32:34 +0200
-    // Kevin Konradt:
-    // When using a LCD with 1 row x 16 characters
-    // instead of 2x16, try changing _columns to 8.
-    // (display seems to split the 16 characters into 
-    // 2 virtual rows with 8 characters each.)
-
-    _rw = 0;
-    _e  = 1;
-    _rs = 0; // command mode
-
-    // Should theoretically wait 15ms, but most things will be powered up pre-reset
-    // so i'll disable that for the minute. If implemented, could wait 15ms post reset
-    // instead
-    // wait(0.015); 
-        
-    // send "Display Settings" 3 times (Only top nibble of 0x30 as we've got 4-bit bus)
-    for(int i=0; i<3; i++) {
-        writeNibble(0x3);
-        wait(0.00164);      // this command takes 1.64ms, so wait for it
-    }
-    writeNibble(0x2); // 4-bit mode
-            
-    writeCommand(0x28);    // Function set 001 BW N F - -  
-    writeCommand(0x0C);
-    writeCommand(0x6);  //  Cursor Direction and Display Shift : 0000 01 CD S (CD 0-left, 1-right S(hift) 0-no, 1-yes
-    
-    cls();
-}
-
-int TextLCD::_putc(int value) {
-    if(value == '\n') {
-        newline();
-    } else {
-        writeData(value);
-    }
-    return value;
-}
-
-int TextLCD::_getc() {
-    return 0;
-}
-
-void TextLCD::newline() {
-    _column = 0;
-    _row++;
-    if(_row >= _rows) {
-        _row = 0;
-    }
-    locate(_column, _row); 
-}
-
-void TextLCD::locate(int column, int row) {
-    int address;
-    if(column < 0 || column >= _columns || row < 0 || row >= _rows) {
-        error("locate(%d,%d) out of range on %dx%d display", column, row, _columns, _rows);
-        return;
-    }
-    
-    _row = row;  
-    _column = column;
-//  02*20 =>   int address = 0x80 + (_row * 40) + _column; // memory starts at 0x80, and is 40 chars long per row 
-
-
-      if(_row == 0 ){
-        address = 0x80+_column;
-      }
-      else if(_row == 1 ){
-        address = 0x80+ (0x40) + _column;
-      }
-      else if(_row == 2){
-        address = 0x80+(0x14)+_column;
-      }
-      else if(_row == 3){
-        address = 0x80+(0x54)+_column;
-      }
-
-      writeCommand(address);            
-}
-
-void TextLCD::cls() {
-    writeCommand(0x01); // Clear Display
-    wait(0.00164f);        // This command takes 1.64 ms
-      locate(0, 0);
-}
-
-void TextLCD::reset() {
-    cls();
-}
-
-void TextLCD::clock() {
-    wait(0.000040f);
-    _e = 0;
-    wait(0.000040f);  // most instructions take 40us
-    _e = 1;    
-}
-
-void TextLCD::writeNibble(int value) {
-    _d = value;
-    clock();
-}
-
-void TextLCD::writeByte(int value) {
-    writeNibble(value >> 4);
-    writeNibble(value >> 0);
-}
-
-void TextLCD::writeCommand(int command) {
-    _rs = 0;
-    writeByte(command);
-}
-
-void TextLCD::writeData(int data) {
-    _rs = 1;
-    writeByte(data);
-    _column++;
-    if(_column >= _columns) {
-        newline();
-    } 
-}

diff -r c7278239bae6 -r 23d22ebf52c0 TextLCD0420.h
--- a/TextLCD0420.h	Sat Feb 19 12:01:04 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/* mbed TextLCD Library
- * Copyright (c) 2007-2009 sford
- * Released under the MIT License: http://mbed.org/license/mit
- */
- 
-#ifndef MBED_TEXTLCD_H
-#define MBED_TEXTLCD_H
-
-#include "Stream.h"
-#include "DigitalOut.h"
-#include "BusOut.h"
-
-namespace mbed {
-
-/* Class: TextLCD
- * A 16x2 Text LCD controller
- *
- * Allows you to print to a Text LCD screen, and locate/cls. Could be
- * turned in to a more generic libray.
- *
- * If you are connecting multiple displays, you can connect them all in
- * parallel except for the enable (e) pin, which must be unique for each
- * display.
- *
- * Example:
- * > #include "mbed.h"
- * > #include "TextLCD.h"
- * >
- * > TextLCD lcd(p24, p25, p26, p27, p28, p29, p30); // rs, rw, e, d0, d1, d2, d3
- * >
- * > int main() {
- * >     lcd.printf("Hello World!");
- * > }
- */
-class TextLCD : public Stream {
-
-public:
-    /* Constructor: TextLCD
-     * Create a TextLCD object, connected to the specified pins
-     *
-     * All signals must be connected to DigitalIn compatible pins. 
-     *
-     * Variables:
-     *  rs -  Used to specify data or command
-     *  rw - Used to determine read or write
-     *  e - enable
-     *  d0..d3 - The data lines
-     */
-    TextLCD(PinName rs, PinName rw, PinName e, PinName d0, PinName d1, 
-        PinName d2, PinName d3, int columns , int rows );
-
-#if 0 // Inhereted from Stream, for documentation only
-    /* Function: putc
-     *  Write a character
-     *
-     * Variables:
-     *  c - The character to write to the serial port
-     */
-    int putc(int c);
-
-    /* Function: printf
-     *  Write a formated string
-     *
-     * Variables:
-     *  format - A printf-style format string, followed by the
-     *      variables to use in formating the string.
-     */
-    int printf(const char* format, ...);
-#endif
-        
-    /* Function: locate
-     * Locate to a certian position
-     *
-     * Variables:
-     *  column - the column to locate to, from 0..15
-     *  row - the row to locate to, from 0..1
-     */
-    virtual void locate(int column, int row);
-    
-    /* Function: cls
-     * Clear the screen, and locate to 0,0
-     */
-    virtual void cls();    
-    
-    virtual void reset();
-        
-protected:
-
-    void clock();
-    void writeData(int data);
-    void writeCommand(int command);
-    void writeByte(int value);
-    void writeNibble(int value);
-    virtual int _putc(int c);        
-    virtual int _getc();
-    virtual void newline();                
-            
-    int _row;
-    int _column;    
-    DigitalOut _rw, _rs, _e;
-    BusOut _d;
-    int _columns;
-    int _rows;
-
-};
-
-}
-
-#endif

diff -r c7278239bae6 -r 23d22ebf52c0 main.cpp
--- a/main.cpp	Sat Feb 19 12:01:04 2011 +0000
+++ b/main.cpp	Thu Feb 08 09:59:50 2018 +0000
@@ -1,28 +1,46 @@
 //GPS GT-720F Logger01
 #include "mbed.h"
-#include "TextLCD0420.h"
+
+#include "SDFileSystem.h"
+SDFileSystem sd(p5,p6,p7,p8,"sd");
+FILE* fp;
+
 
 #define ON 1
 #define OFF 0
 
 DigitalOut mled0(LED1);
 DigitalOut mled1(LED2);
-DigitalIn sw1(p5);
+DigitalIn sw1(p15);
+
+Serial pc(USBTX, USBRX); // tx, rx 
 
-TextLCD lcd(p24, p25, p26, p27, p28, p29, p30,20,4); // rs, rw, e, d0, d1, d2, d3
+
+
+
+
 Serial gps(p9,p10);
-LocalFileSystem local("local");
+//LocalFileSystem local("local");
 Ticker flipper;
-FILE *fp;
+
 float g_hokui,g_tokei;
 int fp_count=0;
 
+int h_time=0,m_time=0,s_time=0;
+
 void gps_rec() {
   mled0=ON;
-  fprintf(fp,"%4.6f,%3.6f,\n",g_tokei,g_hokui);
-  wait(1.0);
+ if(fp == NULL) {
+       error("Could not open file for write\n");
+    }
+
+  fprintf(fp,"%4.6f,%3.6f\r\n",g_tokei,g_hokui);
+ 
+  
   mled0=OFF;
   fp_count++;
+  
+
 }
 
 int main() {
@@ -38,30 +56,32 @@
       int rec_flag=0;
       
       gps.baud(9600);
-      lcd.cls();
-      lcd.printf("*** GPS GT-720F ****\n");    
-      lcd.locate(0,1);
-      lcd.printf("File open...\n");
-      wait(1.0);
-      fp=fopen("/local/GPS.txt","a");
-      if(!fp || sw1==0){
-        lcd.cls();
-        lcd.printf("Can't Loging ... \n");
-        lcd.printf("System close...\n");
-        lcd.printf(">\n");
-        exit(1);
-      }
-      lcd.printf("System start...\n");
-      lcd.printf("Loging ready ok...\n");
-      fprintf(fp,"\n");
-      wait(1.0);
+fp = fopen("/sd/test.csv", "w");
+    //  wait(1.0);
+ 
+
+ 
+ flipper.attach(&gps_rec, 1.0);
+ 
+    
+ //   fp = fopen("/sd/test.csv", "w");
+     // fp=fopen("/local/GPS.csv","w");
+   //   fp=fopen("/local/GPS.csv","w");
+ //fclose(fp);
+ //free(fp);
+
+     // fprintf(fp,"\n");
+      //wait(1.0);
       
     while (1) {
-      if(sw1==0){
+      /*
+      pc.putc(gps.getc());
+      */
+      
+      if(sw1!=1){
+        
         fclose(fp);
-        lcd.cls();
-        lcd.printf("System close...\n");
-        lcd.printf(">\n");
+       
         exit(1);    
       }
       
@@ -69,10 +89,11 @@
       while(gps.getc()!='$'){
       }
       
+      
       while( (gps_data[i]=gps.getc()) != '\r'){
         i++;
         if(i==256){
-           lcd.printf("*** Data read  Error! ***\n");
+           
            i=255;
            break;
          }
@@ -109,40 +130,24 @@
           
          // Record start
           if(rec_flag==0){
-           flipper.attach(&gps_rec, 10.0);
+            
+         //  flipper.attach(&gps_rec, 1.0);
+           
            rec_flag=1;
-           fprintf(fp,"JST %2d:%2d:%2d\n",h_time,m_time,s_time);
-           lcd.cls();
-           mled0=ON;
-           lcd.printf("Loging start....");
-           wait(5.0);
+         //  fp=fopen("/local/GPS.csv","w");
+          //  fprintf(fp,"%2d,%2d,%2d,%6.6f,%5.6f\r\n",h_time,m_time,s_time,g_tokei,g_hokui);
+          //fclose(fp);
+           //free(fp);
+        
            mled0=ON;
           }  
-
-          lcd.cls();
-          lcd.locate(0,0);
-          lcd.printf("*GPS JST %2d:%2d:%2d",h_time,m_time,s_time);  
-          lcd.locate(0,1);
-          lcd.printf("Lk(%d),St(%d),%d",rlock,stn,fp_count);  
-         //Latitude=Hokui
-          lcd.locate(0,2);
-          lcd.printf("Lat/d:%4.6f",g_hokui);
-         // Logitude=tokei 
-          lcd.locate(0,3);
-          lcd.printf("Log/d:%4.6f",g_tokei);
-        }
+          
         else{
-          flipper.detach(); 
+          //fp=fopen("/local/GPS.csv","w");
+        //  flipper.detach(); 
           rec_flag=0;
-          lcd.cls();
-          lcd.locate(0,0);
-          lcd.printf("*** GPS GT-720F ***");
-          lcd.locate(0,1);
-          lcd.printf("Lk(%d),St(%d)",rlock,stn);
-          lcd.locate(0,2);
-          for(i=0;i<40;i++){
-            lcd.printf("%c",gps_data[i]);
-          }
+         
+        }//else
         }
       }//if
     }//while

diff -r c7278239bae6 -r 23d22ebf52c0 mbed.bld
--- a/mbed.bld	Sat Feb 19 12:01:04 2011 +0000
+++ b/mbed.bld	Thu Feb 08 09:59:50 2018 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/9114680c05da
+http://mbed.org/users/mbed_official/code/mbed/builds/e1686b8d5b90
\ No newline at end of file