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: Peripherals SD_Lib_EffedUP_ERP Time_Lib_v2 Year3_Version5 BMP280 Network_Lib TextLCD BME280 Buffer
Revision 13:a89d4591af3f, committed 2019-01-02
- Comitter:
- erolleyparnell
- Date:
- Wed Jan 02 18:19:44 2019 +0000
- Parent:
- 12:cac14a3e396f
- Child:
- 14:433745616744
- Commit message:
- WORK IN PROGRESS - Functional but Serial Comms needs finishing ERP
Changed in this revision
--- a/Buffer.lib Fri Dec 07 15:29:23 2018 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -https://os.mbed.com/teams/ELEC351/code/Buffer/#2dee25144721
--- a/Peripherals.lib Fri Dec 07 15:29:23 2018 +0000 +++ b/Peripherals.lib Wed Jan 02 18:19:44 2019 +0000 @@ -1,1 +1,1 @@ -https://os.mbed.com/teams/ELEC351/code/Peripherals/#b358b85c532f +https://os.mbed.com/teams/ELEC351/code/Peripherals/#c1ac0a7595e7
--- a/SD_Lib.lib Fri Dec 07 15:29:23 2018 +0000 +++ b/SD_Lib.lib Wed Jan 02 18:19:44 2019 +0000 @@ -1,1 +1,1 @@ -https://os.mbed.com/teams/ELEC351/code/SD_Lib/#dca48f1523ad +https://os.mbed.com/teams/ELEC351/code/SD_Lib/#57a38cd7c65e
--- a/Serial_Lib.lib Fri Dec 07 15:29:23 2018 +0000 +++ b/Serial_Lib.lib Wed Jan 02 18:19:44 2019 +0000 @@ -1,1 +1,1 @@ -https://os.mbed.com/teams/ELEC351/code/Serial_Lib/#19cd85a93e81 +https://os.mbed.com/teams/ELEC351/code/Serial_Lib/#f32feebb9c4c
--- a/Threads_Lib.lib Fri Dec 07 15:29:23 2018 +0000 +++ b/Threads_Lib.lib Wed Jan 02 18:19:44 2019 +0000 @@ -1,1 +1,1 @@ -https://os.mbed.com/teams/ELEC351/code/Year3_Version5/#0e4c33e16eb7 +https://os.mbed.com/teams/ELEC351/code/Year3_Version5/#2e972a287878
--- a/main.cpp Fri Dec 07 15:29:23 2018 +0000 +++ b/main.cpp Wed Jan 02 18:19:44 2019 +0000 @@ -6,6 +6,14 @@ #include "SD_functions.hpp" #include "peripherals.hpp" +#ifndef SD_Present +#define SD_Present +#endif + +#ifndef DEBUG +#define DEBUG +#endif + //TextLCD lcd(D9, D8, D7, D6, D4, D2); // rs, e, d4-d7 //SDBlockDevice sd(PB_5, D12, D13, D10); // mosi, miso, sclk, cs Serial pc(SERIAL_TX, SERIAL_RX);
--- a/main.hpp Fri Dec 07 15:29:23 2018 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -#ifndef __main__ -#define __main__ - -#include "mbed.h" -#include "TextLCD.h" -#include "SDBlockDevice.h" -#include "FATFileSystem.h" -#include "sample_hardware.hpp" -#include "thread_functions.hpp" - -//Function declarations -extern void displayOnLcd(); -extern void updateRealTimeClock(char *buffer); -extern void getLineFromSerial(char *keyBuffer, int bufferLength); -extern void displayMessageOnConsole(); -extern void SettingTimeWithButtons (); -extern void FunctionSensor(); -extern void FunctionTime(); -extern void FunctionSerial(); - -extern TextLCD lcd(D9, D8, D7, D6, D4, D2); // rs, e, d4-d7 -extern SDBlockDevice sd(PB_5, D12, D13, D10); // mosi, miso, sclk, cs -extern Serial pc(SERIAL_TX, SERIAL_RX); -extern time_t currentTime; -extern char lcdBuffer[32]; -extern DigitalOut myled(LED1); -extern Ticker ticker; -extern DigitalIn SWUser(USER_BUTTON); -extern Mutex date_mutex; -extern int setting; -extern int t; -//InterruptIn SW1; - -extern Thread t1; -extern Thread t2; -extern Thread t3; - - -//LDR sensor -extern AnalogIn LDD_ADC_In(A1); -extern float fLDR = 0.0; -extern float volts = 0.0; - -#endif \ No newline at end of file