Diff: main.cpp

Revision:

12:988bacb1c2a6

Parent:

11:f1a6cced30cf

Child:

13:f2dad2365841

diff -r f1a6cced30cf -r 988bacb1c2a6 main.cpp
--- a/main.cpp	Fri Feb 04 15:02:01 2022 +0000
+++ b/main.cpp	Fri Feb 04 15:56:47 2022 +0000
@@ -54,7 +54,7 @@
 
 void button_back_isr();
 
-volatile int S_flag, B_flag;
+volatile int S_flag, B_flag; // Global Variables
 volatile int g_buttonStart_flag = 0; 
 volatile int g_buttonBack_flag = 0; 
 
@@ -64,11 +64,11 @@
 
 void init_K64F(); // Setting up the on-board LEDs and switches
 
-void init_leds(); //Setting up the LEDs
+void init_leds(); // Setting up the LEDs
 
-void welcome();
+void welcome(); // Setting up welcome screen
 
-void startup();
+void startup(); // Setting up startup
 
 
 int main()
@@ -88,8 +88,8 @@
 lcd.init(); // initialise display
 
 lcd.setContrast(0.5); // Sets contrast to 0.5
-welcome();
-startup(); // USE VOID NOW
+welcome(); // Initialising Welcome Screen
+startup(); // Initialising Startup
 
 while (1) {
 
@@ -222,36 +222,34 @@
 lcd.printString(" View Data ", 0, 1);
 lcd.printString(" Live Data ", 0, 2);
 lcd.printString(" About ", 0, 3);
-lcd.refresh();
+lcd.refresh(); // Refresh display
 wait(0.3);}
 
 
 else if (select == 2) {
 lcd.printString(" Collection ", 0, 0);// Menu Selection, Printing to LCD
 lcd.printString(" >View Data ", 0, 1);
-lcd.refresh();
+lcd.printString(" Live Data ", 0, 2);
+lcd.refresh(); // Refresh display
 wait(0.3);}
 
 else if (select == 3) {
-lcd.printString(" Collection ", 0, 0);// Menu Selection, Printing to LCD
-lcd.printString(" View Data ", 0, 1);
+lcd.printString(" View Data ", 0, 1);// Menu Selection, Printing to LCD
 lcd.printString(" >Live Data ", 0, 2);
-lcd.refresh();
+lcd.printString(" About ", 0, 3);
+lcd.refresh(); // Refresh display
 wait(0.3);}
 
 else if (select == 4){
-lcd.clear();
 lcd.printString(" Collection ", 0, 0);// Menu Selection, Printing to LCD
-lcd.printString(" View Data ", 0, 1);
 lcd.printString(" Live Data ", 0, 2);
 lcd.printString(" >About ", 0, 3);
-lcd.refresh();
+lcd.refresh(); // Refresh display
 wait(0.3);}
 }
 }
 
-
-void welcome()
+void welcome() // Start Welcome screens
 {                           
 lcd.clear();
 lcd.printString(" Jack McGarley ", 0, 0); // Welcome Screen 1, Printing to LCD    
@@ -259,7 +257,7 @@
 lcd.printString(" Schneider ", 0, 2);
 lcd.printString(" Lincoln Uni ", 0, 3);
 lcd.printString(" February 2022 ", 0, 4);
-lcd.refresh();
+lcd.refresh(); // Refresh display
 wait(3);
 
 lcd.clear();
@@ -268,7 +266,7 @@
 lcd.printString(" Smart Device ", 0, 2);
 lcd.printString(" Health ", 0, 3);
 lcd.printString(" Monitoring ", 0, 4);
-lcd.refresh();
+lcd.refresh(); // Refresh display
 wait(3);
 }
 void button_start_isr()