Revision 27:7c4478225857, committed 2018-11-01

Comitter:

bunikewicz

Date:

Thu Nov 01 15:17:27 2018 +0000

Parent:

26:e4d2567200db

Commit message:

updates

Changed in this revision

--- a/FATFileSystem.lib	Mon Aug 29 15:05:27 2016 +0000
+++ b/FATFileSystem.lib	Thu Nov 01 15:17:27 2018 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/teams/mbed-official/code/FATFileSystem/#c4baca9a2c3d
+http://mbed.org/teams/mbed-official/code/FATFileSystem/#28e685e5ff7f

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OCE560Input.cpp	Thu Nov 01 15:17:27 2018 +0000
@@ -0,0 +1,9 @@
+// OCE560Input.cpp code for Exercise 6
+#include "OCE560Input.h"
+#define mV_Volt1 3300
+#define TMP36_calib1 500
+#define Ten 10
+
+AnalogIn ain(p20); // TMP36 sensor
+DigitalIn boolSwitch(p9); // Switch
+Serial pc(USBTX, USBRX); // communication to host PC
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OCE560Input.h	Thu Nov 01 15:17:27 2018 +0000
@@ -0,0 +1,13 @@
+// OCE560Input.h file for Exercise 6
+#ifndef OCE560INPUT_H
+#define OCE560INPUT_H
+
+#include "mbed.h"
+
+extern AnalogIn ain; // allow pc to be manipulated by other files
+extern DigitalIn boolSwitch; // allow pc to be manipulated by other files
+extern Serial pc; // allow pc to be manipulated by other files
+void Convert_mV_C(void); // function prototype
+void Boolean_ON_OFF(void); // function prototype
+
+#endif
\ No newline at end of file

--- a/SDFileSystem.cpp	Mon Aug 29 15:05:27 2016 +0000
+++ b/SDFileSystem.cpp	Thu Nov 01 15:17:27 2018 +0000
@@ -932,3 +932,5 @@
     deselect();
     return false;
 }
+
+SDFileSystem sd(p5, p6, p7, p8, "sd"); // SD card (SPI pins)
\ No newline at end of file

--- a/SDFileSystem.h	Mon Aug 29 15:05:27 2016 +0000
+++ b/SDFileSystem.h	Thu Nov 01 15:17:27 2018 +0000
@@ -222,4 +222,6 @@
     bool enableHighSpeedMode();
 };
 
+extern SDFileSystem sd;
+
 #endif