Example of using Hexiwear buttons and declaring screens.

Dependencies:   FXOS8700 FXAS21002 Hexi_KW40Z Hexi_OLED_SSD1351

Revision:
3:53c096a80151
Parent:
2:824ed4ae8d52
--- a/main.cpp	Mon Feb 05 16:14:13 2018 +0000
+++ b/main.cpp	Wed Nov 21 17:56:31 2018 +0000
@@ -16,7 +16,6 @@
 #include "OLED_types.h"         // Text attributs
 #include "string.h"
 #include "OpenSans_Font.h"
-#include "MAX30101.h"
 
 
 /* We need to confirm whether it's better to include and
@@ -27,15 +26,7 @@
 // Definitions
 #define LED_ON          0
 #define LED_OFF         1
-#define SCRN_TIME       10.0
-#define Debug           1 // If "Debug" is defined, our code will compile for debug.  Comment out for Production code.
-#define HIGHEST_ZONE    4
-#define LOWEST_ZONE     1
-#define ENTER_BELOW     25
-#define ENTER_ABOVE     50
-#define EXIT_BELOW      75
-#define EXIT_ABOVE      100
-#define VIB_OPT_2       75
+#define SCRN_TIME       60.0
 
 
 void StartHaptic(void);
@@ -43,61 +34,24 @@
 void StopHaptic(void const *n);
 void error_screen(void);
 void update_display(void);
-void Decrement_Age();
-void Set_Max_Bpm();
-void Set_Zone_Boundaries();
-void Increment_Age();
-void Increment_Target_Zone();
-void Decrement_Target_Zone();
-void Increment_HR_Vibr_Pref();
-void Decrement_HR_Vibr_Pref();
-void Determine_Current_Zone();
-void Heart_Rate_Vibrations();
-void Increment_Heart_Rate();
-void Decrement_Heart_Rate();
-void Enable_Heart_Rate();
-void Disable_Heart_Rate();
-void Led_Zone_Indicator();
 
 
 // *****************  Global variables  ***********************
 char text_1[20];            // Text buffer - Do we need more?
 char display_buff[30];      //Buffer for conversion to char to display
-bool Led_Zones = 1;
-bool HR_Enable = 0;
-bool OLED_ON = 1;           // Turn OLED power on/off
-bool Fall_Alert = 0;        // Initialize as no active alert
-bool Panic_Alert = 0;        // Initialize as no active alert
-bool Fall_Alert_Mode = 1;   //  Initialize with fall alert mode on
-bool Heart_Rate_Mode = 0;   //  Initialize with Heart rate off
-float Accel_Mag=0.0;        // Vector magnitude calculated from sensor data
-float Accel_Data[3];        // Accel Data from sensor
-float Gyro_Mag=0.0;        // Vector magnitude calculated from sensor data
-float Gyro_Data[3];        // Gyro data from sensor
-float Fall_Thresh=0.5;        // Initialize Fall detect Threshold
-float Impact_Thresh=3.0;        // Initialize Impact detect Threshold
-float Movement_Thresh=50.0;        // Initialize Movement detect Threshold
-uint8_t Current_Zone = 1;
-uint8_t Prev_Zone = 1;
-uint8_t Heart_Rate = 100;
-uint8_t HR_buff[250];
-uint8_t *HR_return;
-uint8_t Age = 50;            // Initialize age
-uint8_t Max_Bpm = 220 - Age;      // Initialize Max BPM
+bool OLED_ON = 1;
 uint8_t Screen_Num = 0;      // Initialize to main screen
-uint8_t Error_Num = 0;         // Error num for debug
-uint8_t HR_Vibration = 2;       //Choose Heart Rate Vibration Options
-uint8_t Target_Zone = 2;        //Initialize Target Heart Rate Zone to Zone 3
-uint8_t HR_Zone1[2] = {Max_Bpm * .50, Max_Bpm * .60};       //Heart Rate Zone 1
-uint8_t HR_Zone2[2] = {HR_Zone1[1] + 1, Max_Bpm * .70};       //Heart Rate Zone 2
-uint8_t HR_Zone3[2] = {HR_Zone2[1] + 1, Max_Bpm * .80};       //Heart Rate Zone 3
-uint8_t HR_Zone4[2] = {HR_Zone3[1] + 1, Max_Bpm};       //Heart Rate Zone 4
+uint8_t variableExample = 0;
+
+
 // ***************** Define pins *****************************
+DigitalOut chips(PTB12);
+
 FXAS21002 gyro(PTC11,PTC10); // Gyroscope
 SSD1351 oled(PTB22,PTB21,PTC13,PTB20,PTE6, PTD15); // SSD1351 OLED Driver (MOSI,SCLK,POWER,CS,RST,DC)
 FXOS8700 accel(PTC11, PTC10); // Accelorometer
 FXOS8700 mag(PTC11, PTC10);   // Mag (same chip as Accel)
-//MAX30101 heart(PTB1, PTB0); //Heart Rate Chip
+
 
 DigitalOut RED_Led(LED1);
 DigitalOut GRN_Led(LED2);
@@ -129,127 +83,15 @@
     } else {
         switch(Screen_Num) {
             case 0: {// We're in Main Screen
-                // do nothing, wrong button
-                break;
-            }
-            case 1: {// Panic Alert option
                 StartHaptic();
-                Screen_Num = 26;  //Change to screen 5
-#ifdef Debug    // in debug show debug/diagnostic screens                         
-                Screen_Num = 26;  //Change to screen 20
-#endif
-
-                update_display();
-                break;
-            }
-            case 2: {// Fall Alert option
-                StartHaptic();
-                Screen_Num = 1;  //Change to screen 1
-                update_display();
-                break;
-            }
-            case 3: {// Heart Rate Monitoring option
-                StartHaptic();
-                Screen_Num = 2;  //Change to screen 2
-                update_display();
-                break;
-            }
-            case 4: {// Alert History option
-                StartHaptic();
-                Screen_Num = 3; //Change to screen 3
-                update_display();
-                break;
-            }
-            case 5: {// About HexiHeart
-                StartHaptic();
-                Screen_Num = 4; //Change to screen 4
-                update_display();
-                break;
-            }
-            case 6: {// Panic Alert
-                StartHaptic();
-                Panic_Alert = !Panic_Alert;
                 update_display();
                 break;
             }
-            case 7: {// Heart Rate Zone
-                StartHaptic(50);
-                Enable_Heart_Rate();
-                //heart.enable();
-                //HR_Enable = 1;
-                //while(HR_Enable == 1)
-                //    heart.readRawData(HR_buff, HR_return);
-                //update_display();
-                break;
-            }
-            case 8: {// Alert History
-                StartHaptic();
-                //Increment  alert index
-                break;
-            }
-            case 20: {// Diagnostic/Debug Screens
-                StartHaptic();
-                Screen_Num = 5;  //Change to screen 5
-                update_display();
-                break;
-            }
-            case 21: {// Fall Diagnostic
-                StartHaptic();
-                Screen_Num = 25;  //Change to screen 25
-                update_display();
-                break;
-            }
-            case 22: {// Fall Debug
-                StartHaptic();
-                Screen_Num = 21;  //Change to screen 21
-                update_display();
-                break;
-            }
-            case 23: {// Heart Rate Diagnostic
-                StartHaptic();
-                Screen_Num = 22;  //Change to screen 22
+            case 1: {// Second Screen
+                
                 update_display();
-                break;
-            }
-            case 24: {// Heart Rate Debug
                 StartHaptic();
-                Screen_Num = 23;  //Change to screen 23
-                update_display();
-                break;
-            }
-            case 25: {// Heat Index Diagnostic
-                StartHaptic();
-                Screen_Num = 24;  //Change to screen 24
-                update_display();
-                break;
-            }
-            case 26: {//Heart Rate Config Option
-                StartHaptic();
-                Screen_Num = 20;
-                update_display();
-                break;
-            }
-            case 27: {//Incrementing Age
-                Increment_Age();
-                Set_Zone_Boundaries();
-                update_display();
-                break;
-            }
-            case 28: {//Changing Heart Rate Vibration Preferences
-                Increment_HR_Vibr_Pref();
-                update_display();
-                break;
-            }
-            case 30: {//Change Target Heart Rate Zone Preference
-                Increment_Target_Zone();
-                update_display();
-                break;
-            }
-            case 31: { //Manually Increment Heart Rate by 1
-                Increment_Heart_Rate();
-                Determine_Current_Zone();
-                update_display();
-                break;
+          
             }
             default: {
                 break;
@@ -269,127 +111,12 @@
 
         switch(Screen_Num) {
             case 0: {// We're in Main Screen
-                // do nothing, wrong button
-                break;
-            }
-            case 1: {// Panic Alert option
-                StartHaptic();
-                Screen_Num = 2;  //Change to screen 2
-                update_display();
-                break;
-            }
-            case 2: {// Fall Alert option
-                StartHaptic();
-                Screen_Num = 3;  //Change to screen 3
-                update_display();
-                break;
-            }
-            case 3: {// Heart Rate Monitoring option
-                StartHaptic();
-                Screen_Num = 4;  //Change to screen 4
-                update_display();
-                break;
-            }
-            case 4: {// Alert History option
-                StartHaptic();
-                Screen_Num = 5;  //Change to screen 5
-                update_display();
-                break;
-            }
-            case 5: {// About HexiHeart option
-                StartHaptic();
-                Screen_Num = 26;  //Change to screen 1
-#ifdef Debug    // in debug show debug/diagnostic screens                         
-                Screen_Num = 20;  //Change to screen 20
-#endif
-                update_display();
-                break;
-            }
-            case 6: {// Panic Alert
-                // do nothing, wrong button
-                break;
-            }
-            case 7: {// Heart Rate Zone
-                StartHaptic(100);
-                Disable_Heart_Rate();
-                break;
-            }
-            case 8: {// Alert History
-                StartHaptic();
-                //decriment alert index
-                break;
-            }
-            case 20: {// Diagnostic/Debug Screens
-                StartHaptic();
-                Screen_Num = 26;  //Change to screen 1
+                StartHaptic();                
                 update_display();
                 break;
             }
-            case 21: {// Fall Diagnostic
-                StartHaptic();
-                Screen_Num = 22;  //Change to screen 22
-                update_display();
-                break;
-            }
-            case 22: {// Fall Debug
-                StartHaptic();
-                Screen_Num = 23;  //Change to screen 23
-                update_display();
-                break;
-            }
-            case 23: {// Heart Rate Diagnostic
-                StartHaptic();
-                Screen_Num = 24;  //Change to screen 24
-                update_display();
-                break;
-            }
-            case 24: {// Heart Rate Debug
-                StartHaptic();
-                Screen_Num = 25;  //Change to screen 25
-                update_display();
-                break;
-            }
-            case 25: {// Heat Index Diagnostic
-                StartHaptic();
-                Screen_Num = 21;  //Change to screen 21
-                update_display();
-                break;
-            }
-            case 26: {//Heart Rate Configs
+            case 1: {// Second Screen
                 StartHaptic();
-                Screen_Num = 1;
-                update_display();
-                break;
-            }
-            case 27: { //Decrement Age
-                Decrement_Age();
-                Set_Zone_Boundaries();
-                update_display();
-                break;
-
-            }
-            case 28: { //Changing Heart Rate Vibration Preference
-                /*
-                    StartHaptic();
-                    if(HR_Vibration == 1) {
-                        HR_Vibration = 3;
-                    } else {
-                        HR_Vibration -= 1;
-                    }
-                */
-                Decrement_HR_Vibr_Pref();
-                update_display();
-                break;
-            }
-            case 30: {//Change Target Heart Rate Zone Preference
-                Decrement_Target_Zone();
-                update_display();
-                break;
-            }
-            case 31: { //Manually decrement heart rate by 1
-                Decrement_Heart_Rate();
-                Determine_Current_Zone();
-                update_display();
                 break;
             }
             default: {
@@ -406,108 +133,20 @@
         OLED_ON = 1; // Screen was off, set to On
         update_display();
     } else {
-        switch(Screen_Num) {
+        switch(Screen_Num) 
+        {
             case 0: {// We're in Main Screen
                 StartHaptic();
-                Screen_Num = 1;  //Change to screen 1
-                update_display();
-                break;
-            }
-            case 1: {// Panic Alert option
-                StartHaptic();
-                Screen_Num = 6;  //Change to screen 6
-                update_display();
-                break;
-            }
-            case 2: {// Fall Alert option
-                StartHaptic();
-                // toggle on/off
-                break;
-            }
-            case 3: {// Heart Rate Monitoring option
-                StartHaptic();
-                Screen_Num = 7;  //Change to screen 7
-                update_display();
-                break;
-            }
-            case 4: {// Alert History option
-                StartHaptic();
-                Screen_Num = 8;  //Change to screen 8
-                update_display();
-                break;
-            }
-            case 5: {// About HexiHeart option
-                StartHaptic();
-                Screen_Num = 9;  //Change to screen 9
-                update_display();
-                break;
-            }
-
-            case 6: {// Panic Alert
-                // do nothing, wrong button
-                break;
-            }
-            case 7: {// Heart Rate Zone
-                StartHaptic();
-                Screen_Num = 31;
+                variableExample++;
                 update_display();
                 break;
             }
-            case 20: {// Diagnostic/Debug Screens
-                StartHaptic();
-                Screen_Num = 21;  //Change to screen 21
-                update_display();
-                break;
-            }
-            case 26: {//Change to Heart Rate Config Screen
-                StartHaptic();
-                Screen_Num = 27;
-                update_display();
-                break;
-            }
-            case 27: {//Change to Heart Rate Vibration Preferences
-                StartHaptic();
-                Screen_Num = 28;
-                update_display();
-                break;
-            }
-            case 28: {//Change to Heart Rate Zone Boundary Info
-                StartHaptic();
-                Screen_Num = 29;
-                update_display();
-                break;
-            }
-            case 29: {//Change Target Heart Rate Zone Preference
-                StartHaptic();
-                Screen_Num = 30;
-                update_display();
-                break;
-            }
-            case 30: {//Change to Heart Rate Config Screen
-                StartHaptic();
-                Screen_Num = 27;
-                update_display();
-                break;
-            }
-            case 31: {
-                StartHaptic();
-                Screen_Num = 32;
-                update_display();
-                break;
-            }
-            case 32: {
-                StartHaptic();
-                Screen_Num = 7;
-                update_display();
-                break;
-            }
-            default: {
+            default:{
                 break;
             }
         }
     }
 }
-
 void ButtonLeft(void)
 {
     Screen_Timer.attach(&timout_timer,(SCRN_TIME));//Is this sufficient to reset/restart ticker timer for OLED?
@@ -517,155 +156,21 @@
     } else {
         switch(Screen_Num) {
             case 0: {// We're in Main Screen
-                // do nothing, wrong button
-                break;
-            }
-            case 1: {// Panic Alert option
-                StartHaptic();
-                Screen_Num = 0;  //Change to screen 0
-                update_display();
-                break;
-            }
-            case 2: {// Fall Alert option
-                StartHaptic();
-                Screen_Num = 0;  //Change to screen 0
-                update_display();
-                break;
-            }
-            case 3: {// Heart Rate Monitoring option
-                StartHaptic();
-                Screen_Num = 0;  //Change to screen 0
-                update_display();
-                break;
-            }
-            case 4: {// Alert History option
-                StartHaptic();
-                Screen_Num = 0;  //Change to screen 0
-                update_display();
-                break;
-            }
-            case 5: {// About HexiHeart option
-                StartHaptic();
-                Screen_Num = 0;  //Change to screen 0
-                update_display();
-                break;
-            }
-            case 6: {// Panic Alert
-                StartHaptic();
-                Screen_Num = 1;  //Change to screen 1
-                update_display();
-                break;
-            }
-            case 7: {// Heart Rate Zone
-                StartHaptic();
-                Screen_Num = 3;  //Change to screen 3
-                update_display();
-                break;
-            }
-            case 8: {// Alert History
-                StartHaptic();
-                Screen_Num = 4;  //Change to screen 4
-                update_display();
-                break;
-            }
-            case 20: {// Diagnostic/Debug Screens
-                StartHaptic();
-                Screen_Num = 0;  //Change to screen 0
-                update_display();
-                break;
-            }
-            case 21: {// Fall Diagnostic
-                StartHaptic();
-                Screen_Num = 20;  //Change to screen 20
+                StartHaptic(); 
+                variableExample--;       
                 update_display();
                 break;
             }
-            case 22: {// Fall Debug
-                StartHaptic();
-                Screen_Num = 20;  //Change to screen 20
-                update_display();
-                break;
-            }
-            case 23: {// Heart Rate Diagnostic
-                StartHaptic();
-                Screen_Num = 20;  //Change to screen 20
-                update_display();
-                break;
-            }
-            case 24: {// Heart Rate Debug
-                StartHaptic();
-                Screen_Num = 20;  //Change to screen 20
-                update_display();
-                break;
-            }
-            case 25: {// Heat Index Diagnostic
-                StartHaptic();
-                Screen_Num = 20;  //Change to screen 20
-                update_display();
-                break;
-            }
-            case 26: {//Heart Rate Config Option
-                StartHaptic();
+            case 1:{
                 Screen_Num = 0;
                 update_display();
-                break;
-            }
-            case 27: {//Enter Age
-                StartHaptic();
-                Screen_Num = 26;
-                update_display();
-                break;
-            }
-            case 28: {//Heart Rate Vibration Preference Screen
-                StartHaptic();
-                Screen_Num = 27;
-                update_display();
-                break;
-            }
-            case 29: {//Heart Rate Zone Boundary Info
-                StartHaptic();
-                Screen_Num = 28;
-                update_display();
-                break;
-            }
-            case 30: {//Change Target Heart Rate Zone Preference
-                StartHaptic();
-                Screen_Num = 29;
-                update_display();
-                break;
-            }
-            case 31: {
-                StartHaptic();
-                Screen_Num = 7;
-                update_display();
-                break;
-            }
-            case 32: {
-                StartHaptic();
-                Screen_Num = 31;
-                update_display();
-                break;
-            }
-            default: {
-                break;
+                break;   
             }
         }
     }
 }
 
 
-void ButtonSlide(void)  // What is this Slide button???
-{
-    Screen_Timer.attach(&timout_timer,(SCRN_TIME));//Is this sufficient to reset/restart ticker timer for OLED?
-    if (OLED_ON == 0) {
-        OLED_ON = 1; // Screen was off, set to On
-    }
-    StartHaptic();
-    oled.FillScreen(COLOR_BLACK); // Clear screen
-    strcpy((char *) text_1,"Slide Button");
-    oled.Label((uint8_t *)text_1,0,40);
-}
-
 int main()
 {
     oled.FillScreen(COLOR_BLACK); // Clear screen
@@ -676,6 +181,8 @@
     accel.accel_config();
     mag.mag_config();
 //    gyro.gyro_config();
+//    maxim = 1;
+    chips = 1;
 
     RED_Led = LED_OFF;
     GRN_Led = LED_OFF;
@@ -685,7 +192,6 @@
     kw40z_device.attach_buttonDown(&ButtonDown);
     kw40z_device.attach_buttonLeft(&ButtonLeft);
     kw40z_device.attach_buttonRight(&ButtonRight);
-    kw40z_device.attach_buttonSlide(&ButtonSlide);
 
 // **** Get OLED Class Default Text Properties ****************
     oled_text_properties_t textProperties = {0};
@@ -697,17 +203,10 @@
     oled.SetTextProperties(&textProperties);
 
 // **************  Display spash screen  **********************
-
-    oled.Label((uint8_t *)"Hexi",20,5); // Display white "Hexi" at x,y
     textProperties.fontColor = COLOR_RED;
     oled.SetTextProperties(&textProperties);
-    oled.Label((uint8_t *)"Heart",45,5); // Display red "Heart" at x,y
+    oled.Label((uint8_t *)"Example",20,5); // Display red "Heart" at x,y
 
-#ifdef Debug  // if this is non-production version - do this
-    strcpy((char *) text_1,"This is Debug Ver");
-    oled.Label((uint8_t *)text_1,0,60);  // text_1 at x,y
-    StartHaptic();
-#endif
     textProperties.fontColor = COLOR_WHITE;
     oled.SetTextProperties(&textProperties);
     wait(3);  // wait 3 seconds
@@ -728,499 +227,23 @@
     switch(Screen_Num) {
         case 0: {// Main Screen
             oled.FillScreen(COLOR_BLACK); // Clear screen
-            oled.Label((uint8_t *)"Batt",60,0); // Display "Batt" at x,y
-            oled.Label((uint8_t *)"Date",35,20); // Display "Date" at x,y
-            oled.Label((uint8_t *)"Time",35,40); // Display "Time" at x,y
-            oled.Label((uint8_t *)"H.I.",10,80); // Display "H.I." at x,y
-            oled.Label((uint8_t *)"BT",40,80);  //Display "BT" at x,y
-            oled.Label((uint8_t *)"Menu",60,80);  //Display "Menu" at x,y
-            if(Heart_Rate_Mode == 1) {
-                oled.Label((uint8_t *)"BPM",35,60); // Display "H.I." at x,y
-            }
+            oled.Label((uint8_t *)"Test Screen",15,10); // Display "" at x,y
+            oled.Label((uint8_t *)"*",85,15); // "*" at x,y
+            oled.Label((uint8_t *)"*",85,60); // "*" at x,y
+            oled.Label((uint8_t *)"-1",10,80); // Display "Back" at x,y
+            oled.Label((uint8_t *)"+1",60,80);  //Display "enter" at x,y
+            sprintf(display_buff, "%u", variableExample);
+            oled.Label((uint8_t *)display_buff,15,40);  //Display "enter" at x,y
             break;
         }
         case 1: {// Panic Alert option
             oled.FillScreen(COLOR_BLACK); // Clear screen
-            oled.Label((uint8_t *)"Panic Alert",20,5); // Display at x,y
-            oled.Label((uint8_t *)"*",85,15); // "*" at x,y
-            oled.Label((uint8_t *)"*",85,60); // "*" at x,y
-            oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            oled.Label((uint8_t *)"Enter",60,80);  //Display "enter" at x,y
-            break;
-        }
-        case 2: {// Fall Alert option
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            oled.Label((uint8_t *)"Fall Alert",20,5); // Display at x,y
-            oled.Label((uint8_t *)"*",85,15); // "*" at x,y
-            oled.Label((uint8_t *)"*",85,60); // "*" at x,y
-            oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            oled.Label((uint8_t *)"Toggle",60,80);  //Display "Toggle" at x,y
-            break;
-        }
-        case 3: {// Heart Rate Monitoring option
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            oled.Label((uint8_t *)"Heart Rate",20,5); // Display at x,y
-            oled.Label((uint8_t *)"*",85,15); // "*" at x,y
-            oled.Label((uint8_t *)"*",85,60); // "*" at x,y
-            oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            oled.Label((uint8_t *)"Enter",60,80);  //Display at x,y
-            break;
-        }
-        case 4: {// Alert History option
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            oled.Label((uint8_t *)"Alert History",5,5); // Display at x,y
-            oled.Label((uint8_t *)"*",85,15); // "*" at x,y
-            oled.Label((uint8_t *)"*",85,60); // "*" at x,y
-            oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            oled.Label((uint8_t *)"Enter",60,80);  //Display at x,y
-            break;
-        }
-        case 5: {// About HexiHeart Screen
-
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            oled.Label((uint8_t *)"Hexi",20,20); // Display white "Hexi" at x,y
-            textProperties.fontColor = COLOR_RED;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"Heart",45,20); // Display red "Heart" at x,y
-            textProperties.fontColor = COLOR_WHITE;
-            oled.SetTextProperties(&textProperties);
-            strcpy((char *) text_1,"About");
-            oled.Label((uint8_t *)text_1,30,5);  // text_1 at x,y
-            oled.Label((uint8_t *)"*",85,15); // "*" at x,y
-            oled.Label((uint8_t *)"*",85,60); // "*" at x,y
-            oled.Label((uint8_t *)" Back ",9,80); // Display "Back" at x,y
-            oled.Label((uint8_t *)" Enter ",59,80);  //Display at x,y
-            break;
-        }
-
-        case 6: {// Panic Alert
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            if (Panic_Alert == 0) {
-                oled.Label((uint8_t *)"Send ",20,10); // Display at x,y
-            } else {
-                oled.Label((uint8_t *)"Dismiss ",17,10); // Display at x,y
-            }
-            oled.Label((uint8_t *)"Panic Alert",15,40); // Display at x,y
-            oled.Label((uint8_t *)"-->",80,15); // "*" at x,y
-            oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            break;
-        }
-        case 7: {// Heart Rate Zone
-
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            oled.Label((uint8_t *)"Heart Rate",15,5); // Display at x,y
-            oled.Label((uint8_t *)"HR:",15,25); // Display at x,y
-            sprintf(display_buff, "%u", Heart_Rate);
-            textProperties.fontColor = COLOR_RED; //Change font to red
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)display_buff,43,25); // Display at x,y
-            textProperties.fontColor = COLOR_WHITE;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"Age: ",15,45); // Display at x,y
-            textProperties.fontColor = COLOR_GREEN;
-            oled.SetTextProperties(&textProperties); //implements the color change
-            sprintf(display_buff, "%u", Age); //Convert int to char array for displaying user age
-            oled.Label((uint8_t *)display_buff,43,45); // Display at x,y
-            textProperties.fontColor = COLOR_WHITE;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"On",80,15); // "+" at x,y
-            oled.Label((uint8_t *)"Off",78,60); // "-" at x,y
-            oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            oled.Label((uint8_t *)"Next",59,80); // Display "Next" at x,y
-
-            //heart.enable();
-            //sprintf(display_buff, "%u", heart.getRevisionID()); //Convert int to char array for displaying user age
-            //oled.Label((uint8_t *)display_buff,45,25); // Display at x,y
-            //update_display();
-            break;
-        }
-        case 8: {// Alert History
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            oled.Label((uint8_t *)"Alert History",5,5); // Display at x,y
-            oled.Label((uint8_t *)"Date - Time",20,40); // Display at x,y
-            oled.Label((uint8_t *)"Alert Type:",20,60); // Display at x,y
-            oled.Label((uint8_t *)"+",85,15); // "*" at x,y
-            oled.Label((uint8_t *)"-",85,60); // "*" at x,y
-            oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            break;
-        }
-#ifdef Debug  // if this is non-production/debug version - do this
-        case 20: {// Diagnostic/Debug Screens
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            textProperties.fontColor = COLOR_RED;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"Diagnostics",10,5); // Display at x,y
-            oled.Label((uint8_t *)" Enter ",59,80);  //Display at x,y
-            textProperties.fontColor = COLOR_WHITE;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"*",85,15); // "*" at x,y
-            oled.Label((uint8_t *)"*",85,60); // "*" at x,y
-            oled.Label((uint8_t *)" Back ",9,80); // Display "Back" at x,y
-
-            break;
-        }
-        case 21: {// Fall Alert Diagnostic Screen
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            textProperties.fontColor = COLOR_RED;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"Fall",30,5); // Display at x,y
-            oled.Label((uint8_t *)"Diagnostic",25,5); // Display at x,y
-            textProperties.fontColor = COLOR_WHITE;
-            oled.SetTextProperties(&textProperties);
-            accel.acquire_accel_data_g(Accel_Data);
-//                   gyro.acquire_gyro_data_g(Gyro_Data);
-            Accel_Mag = sqrt(((Accel_Data[0]*Accel_Data[0])+(Accel_Data[1]*Accel_Data[1])+(Accel_Data[2]*Accel_Data[2])));
-            //                  Gyro_Mag = (abs(Gyro_Data[0])+abs(Gyro_Data[1])+abs(Gyro_Data[3]));
-            sprintf(text_1," Accel:%2.2f g  ",Accel_Mag);
-            oled.Label((uint8_t *)text_1,10,40);// text_1 at x,y
-            sprintf(text_1," Gyro:%4.0f D/S  ",Gyro_Mag);
-            oled.Label((uint8_t *)text_1,10,60);// text_1 at x,y
-            oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            break;
-        }
-        case 22: {// Fall Alert Debug Screen
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            textProperties.fontColor = COLOR_RED;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"Fall Debug",15,5); // Display at x,y
-            textProperties.fontColor = COLOR_GREEN;
-            oled.SetTextProperties(&textProperties);
-            sprintf(text_1," %1.1f g  ",Fall_Thresh);
-            oled.Label((uint8_t *)text_1,35,20);// text_1 at x,y
-            sprintf(text_1," %2.1f g  ",Impact_Thresh);
-            oled.Label((uint8_t *)text_1,35,35);// text_1 at x,y
-            sprintf(text_1," %3.0f D/S  ",Movement_Thresh);
-            oled.Label((uint8_t *)text_1,35,50);// text_1 at x,y
-            textProperties.fontColor = COLOR_WHITE;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"F-Th:",5,20); // "*" at x,y
-            oled.Label((uint8_t *)"I-Th:",5,35); // "*" at x,y
-            oled.Label((uint8_t *)"M-Th:",5,50); // "*" at x,y
-            oled.Label((uint8_t *)"*",85,15); // "*" at x,y
-            oled.Label((uint8_t *)"*",85,60); // "*" at x,y
-            oled.Label((uint8_t *)" Back ",9,80); // Display "Back" at x,y
-            //                  oled.Label((uint8_t *)" Enter ",59,80);  //Display at x,y
-            break;
-        }
-        case 23: {// Heart Rate Diagnostic Screen
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            textProperties.fontColor = COLOR_RED;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"H.R. Diagnostic",5,5); // Display at x,y
-            textProperties.fontColor = COLOR_WHITE;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"*",85,15); // "*" at x,y
-            oled.Label((uint8_t *)"*",85,60); // "*" at x,y
-            oled.Label((uint8_t *)" Back ",9,80); // Display "Back" at x,y
-            //               oled.Label((uint8_t *)" Enter ",59,80);  //Display at x,y
-            break;
-        }
-        case 24: {// Heart Rate Debug Screen
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            textProperties.fontColor = COLOR_RED;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"H.R. Debug",10,5); // Display at x,y
-            textProperties.fontColor = COLOR_WHITE;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"*",85,15); // "*" at x,y
-            oled.Label((uint8_t *)"*",85,60); // "*" at x,y
-            oled.Label((uint8_t *)" Back ",9,80); // Display "Back" at x,y
-            //               oled.Label((uint8_t *)" Enter ",59,80);  //Display at x,y
-            break;
-        }
-        case 25: {// Heat Index Diagnostic Screen
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            textProperties.fontColor = COLOR_RED;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"H.I. Diagnostic",5,5); // Display at x,y
-            textProperties.fontColor = COLOR_WHITE;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"*",85,15); // "*" at x,y
-            oled.Label((uint8_t *)"*",85,60); // "*" at x,y
-            oled.Label((uint8_t *)" Back ",9,80); // Display "Back" at x,y
-            //             oled.Label((uint8_t *)" Enter ",59,80);  //Display at x,y
-            break;
-        }
-        case 26: {//Heart Rate Config Option
-            oled.FillScreen(COLOR_BLACK); // Clear screen
-            oled.Label((uint8_t *)"HR Config",10,5); // Display at x,y
-            oled.Label((uint8_t *)"*",85,15); // "*" at x,y
-            oled.Label((uint8_t *)"*",85,60); // "*" at x,y
+            oled.Label((uint8_t *)"Second Screen",20,5); // Display at x,y
             oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            oled.Label((uint8_t *)"Enter",60,80);  //Display "enter" at x,y
-            break;
-        }
-        case 27: { //Enter Age Screen
-            oled.FillScreen(COLOR_BLACK);
-            oled.Label((uint8_t *)"Input Age", 10, 5);
-            sprintf(display_buff, "%u", Age); //Convert int to char array for displaying user age
-            oled.Label((uint8_t *)"Age:", 10, 30);
-            oled.Label((uint8_t *)"+",85,15); // "*" at x,y
-            oled.Label((uint8_t *)"-",85,60); // "*" at x,y
-            oled.Label((uint8_t *)"Menu",10,80); // Display "Menu" at x,y
-            oled.Label((uint8_t *)"Next",60,80);  //Display "Next" at x,y
-            textProperties.fontColor = COLOR_GREEN;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)display_buff,43,30); // Display at x,y
-            textProperties.fontColor = COLOR_WHITE;
-            oled.SetTextProperties(&textProperties);
-            oled.Label((uint8_t *)"Max bpm:",10,50);
-            textProperties.fontColor = COLOR_RED;
-            oled.SetTextProperties(&textProperties); //implements the color change
-            sprintf(display_buff, "%u", Max_Bpm); //Convert int to char array for displaying user max bpm
-            oled.Label((uint8_t *)display_buff, 65, 50);
-            textProperties.fontColor = COLOR_WHITE;
-            oled.SetTextProperties(&textProperties);
-            break;
-        }
-        case 28: {//Choose Heart Rate Vibration Option
-            oled.FillScreen(COLOR_BLACK);
-            oled.Label((uint8_t *)"Vibrate Pref", 10, 10);
-            oled.Label((uint8_t *)"Option:", 10, 25);
-            oled.Label((uint8_t *)"+",85,15); // "+" at x,y
-            oled.Label((uint8_t *)"-",85,60); // "-" at x,y
-            oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            oled.Label((uint8_t *)"Next",60,80);  //Display "Next" at x,y
-            sprintf(display_buff, "%u", HR_Vibration); //Convert int to char array for displaying user preference
-            textProperties.fontColor = COLOR_GREEN; //Change font to green
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)display_buff,55,25); // Display at x,y
-            if(HR_Vibration == 1) {
-                textProperties.fontColor = COLOR_RED; //Change font to red
-                oled.SetTextProperties(&textProperties); //Implement color change
-                oled.Label((uint8_t *)"All On",10,45); // Display at x,y
-            } else if(HR_Vibration == 2) {
-                textProperties.fontColor = COLOR_RED; //Change font to red
-                oled.SetTextProperties(&textProperties);//Implement color change
-                oled.Label((uint8_t *)"Only Entering",10,38);// Display at x,y
-                oled.Label((uint8_t *)"And Exiting",10,53);// Display at x,y
-                oled.Label((uint8_t *)"Target Zone",10,68);// Display at x,y
-
-            } else if(HR_Vibration == 3) {
-                textProperties.fontColor = COLOR_RED; //Change font to red
-                oled.SetTextProperties(&textProperties); //Implement color change
-                oled.Label((uint8_t *)"All Off",10,45);// Display at x,y
-            }
-            textProperties.fontColor = COLOR_WHITE;
-            oled.SetTextProperties(&textProperties);
-            break;
-        }
-        case 29: { //Zone Boundary Info
-            oled.FillScreen(COLOR_BLACK);
-            oled.Label((uint8_t *)"HR Zone Info", 10, 5);// Display at x,y
-            textProperties.fontColor = COLOR_YELLOW; //Change font to yellow
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)"Z1:", 10, 20);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone1[0]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 30, 20);// Display at x,y
-            oled.Label((uint8_t *)"-", 52, 20);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone1[1]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 60, 20);// Display at x,y
-            textProperties.fontColor = COLOR_BLUE; //Change font to blue
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)"Z2:", 10, 35);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone2[0]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 30, 35);// Display at x,y
-            oled.Label((uint8_t *)"-", 52, 35);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone2[1]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 60, 35);// Display at x,y
-            textProperties.fontColor = COLOR_GREEN; //Change font to green
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)"Z3:", 10, 50);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone3[0]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 30, 50);// Display at x,y
-            oled.Label((uint8_t *)"-", 52, 50);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone3[1]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 60, 50);// Display at x,y
-            textProperties.fontColor = COLOR_RED; //Change font to red
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)"Z4:", 10, 65);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone4[0]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 30, 65);// Display at x,y
-            oled.Label((uint8_t *)"-", 52, 65);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone4[1]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 60, 65);// Display at x,y
-            textProperties.fontColor = COLOR_WHITE; //Change font to white
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            oled.Label((uint8_t *)"Next",60,80);  //Display "Next" at x,y
-            break;
-        }
-        case 30: { //Enter Target Heart Rate Zone Preference
-            oled.FillScreen(COLOR_BLACK);
-            oled.Label((uint8_t *)"Zone Pref", 10, 5);// Display at x,y
-            oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            oled.Label((uint8_t *)"Next",60,80);  //Display "Next" at x,y
-            oled.Label((uint8_t *)"+",85,15); // "+" at x,y
-            oled.Label((uint8_t *)"-",85,60); // "-" at x,y
-            oled.Label((uint8_t *)"Target:", 10, 25);// Display at x,y
-            sprintf(display_buff, "%u", Target_Zone); // Convert int to char to display
-            if(Target_Zone == 1) {
-                textProperties.fontColor = COLOR_YELLOW; //Change font to yellow
-                oled.SetTextProperties(&textProperties);//Implement color change
-            } else if(Target_Zone == 2) {
-                textProperties.fontColor = COLOR_BLUE; //Change font to blue
-                oled.SetTextProperties(&textProperties);//Implement color change
-            } else if(Target_Zone == 3) {
-                textProperties.fontColor = COLOR_GREEN; //Change font to green
-                oled.SetTextProperties(&textProperties);//Implement color change
-            } else if(Target_Zone == 4) {
-                textProperties.fontColor = COLOR_RED; //Change font to red
-                oled.SetTextProperties(&textProperties);//Implement color change
-            }
-            oled.Label((uint8_t *)display_buff, 55, 25);// Display at x,y
-            textProperties.fontColor = COLOR_WHITE; //Change font to white
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)"Bounds:", 10, 45);// Display at x,y
-            if(Target_Zone == 1) {
-                textProperties.fontColor = COLOR_YELLOW; //Change font to yellow
-                oled.SetTextProperties(&textProperties);//Implement color change
-                sprintf(display_buff, "%u", HR_Zone1[0]); // Convert int to char to display
-                oled.Label((uint8_t *)display_buff, 10, 60);// Display at x,y
-                oled.Label((uint8_t *)"-", 32, 60);// Display at x,y
-                sprintf(display_buff, "%u", HR_Zone1[1]); // Convert int to char to display
-                oled.Label((uint8_t *)display_buff, 40, 60);// Display at x,y
-            } else if(Target_Zone == 2) {
-                textProperties.fontColor = COLOR_BLUE; //Change font to blue
-                oled.SetTextProperties(&textProperties);//Implement color change
-                sprintf(display_buff, "%u", HR_Zone2[0]); // Convert int to char to display
-                oled.Label((uint8_t *)display_buff, 10, 60);// Display at x,y
-                oled.Label((uint8_t *)"-", 32, 60);// Display at x,y
-                sprintf(display_buff, "%u", HR_Zone2[1]); // Convert int to char to display
-                oled.Label((uint8_t *)display_buff, 40, 60);// Display at x,y
-            } else if(Target_Zone == 3) {
-                textProperties.fontColor = COLOR_GREEN; //Change font to green
-                oled.SetTextProperties(&textProperties);//Implement color change
-                sprintf(display_buff, "%u", HR_Zone3[0]); // Convert int to char to display
-                oled.Label((uint8_t *)display_buff, 10, 60); // Display at x,y
-                oled.Label((uint8_t *)"-", 32, 60); // Display at x,y
-                sprintf(display_buff, "%u", HR_Zone3[1]); // Convert int to char to display
-                oled.Label((uint8_t *)display_buff, 40, 60);// Display at x,y
-            } else if(Target_Zone == 4) {
-                textProperties.fontColor = COLOR_RED; //Change font to red
-                oled.SetTextProperties(&textProperties);//Implement color change
-                sprintf(display_buff, "%u", HR_Zone4[0]); // Convert int to char to display
-                oled.Label((uint8_t *)display_buff, 10, 60); // Display at x,y
-                oled.Label((uint8_t *)"-", 32, 60); // Display at x,y
-                sprintf(display_buff, "%u", HR_Zone4[1]); // Convert int to char to display
-                oled.Label((uint8_t *)display_buff, 40, 60); // Display at x,y
-            }
-            textProperties.fontColor = COLOR_WHITE; //Change font to white
-            oled.SetTextProperties(&textProperties);//Implement color change
-            break;
-        }
-        case 31: {
-            oled.FillScreen(COLOR_BLACK);
-            Heart_Rate_Vibrations();
-            oled.Label((uint8_t *)"Enter HR", 10, 5);// Display at x,y
-            oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            oled.Label((uint8_t *)"Next",60,80);  //Display "Next" at x,y
-            oled.Label((uint8_t *)"+",85,15); // "+" at x,y
-            oled.Label((uint8_t *)"-",85,60); // "-" at x,y
-            oled.Label((uint8_t *)"HR:", 10, 25);
-            sprintf(display_buff, "%u", Heart_Rate); // Convert int to char to display
-            textProperties.fontColor = COLOR_RED; //Change font to red
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)display_buff, 40, 25);
-            textProperties.fontColor = COLOR_WHITE; //Change font to white
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)"Cur Zone:", 10, 45);
-            if(Current_Zone == 1) {
-                textProperties.fontColor = COLOR_YELLOW;
-                oled.SetTextProperties(&textProperties);
-            } else if(Current_Zone == 2) {
-                textProperties.fontColor = COLOR_BLUE;
-                oled.SetTextProperties(&textProperties);
-            } else if(Current_Zone == 3) {
-                textProperties.fontColor = COLOR_GREEN;
-                oled.SetTextProperties(&textProperties);
-            } else if(Current_Zone == 4) {
-                textProperties.fontColor = COLOR_RED;
-                oled.SetTextProperties(&textProperties);
-            }
-            sprintf(display_buff, "%u", Current_Zone); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 71, 45);
-            textProperties.fontColor = COLOR_WHITE; //Change font to white
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)"Prev Zone:", 10, 60);
-            if(Prev_Zone == 1) {
-                textProperties.fontColor = COLOR_YELLOW;
-                oled.SetTextProperties(&textProperties);
-            } else if(Prev_Zone == 2) {
-                textProperties.fontColor = COLOR_BLUE;
-                oled.SetTextProperties(&textProperties);
-            } else if(Prev_Zone == 3) {
-                textProperties.fontColor = COLOR_GREEN;
-                oled.SetTextProperties(&textProperties);
-            } else if(Prev_Zone == 4) {
-                textProperties.fontColor = COLOR_RED;
-                oled.SetTextProperties(&textProperties);
-            }
-            sprintf(display_buff, "%u", Prev_Zone); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 71, 60);
-            textProperties.fontColor = COLOR_WHITE; //Change font to white
-            oled.SetTextProperties(&textProperties);//Implement color change
-            Led_Zone_Indicator();
-            break;
-        }
-        case 32: {
-            //Zone Boundary Info
-            oled.FillScreen(COLOR_BLACK);
-            oled.Label((uint8_t *)"HR Zone Info", 10, 5);// Display at x,y
-            textProperties.fontColor = COLOR_YELLOW; //Change font to yellow
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)"Z1:", 10, 20);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone1[0]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 30, 20);// Display at x,y
-            oled.Label((uint8_t *)"-", 52, 20);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone1[1]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 60, 20);// Display at x,y
-            textProperties.fontColor = COLOR_BLUE; //Change font to blue
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)"Z2:", 10, 35);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone2[0]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 30, 35);// Display at x,y
-            oled.Label((uint8_t *)"-", 52, 35);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone2[1]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 60, 35);// Display at x,y
-            textProperties.fontColor = COLOR_GREEN; //Change font to green
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)"Z3:", 10, 50);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone3[0]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 30, 50);// Display at x,y
-            oled.Label((uint8_t *)"-", 52, 50);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone3[1]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 60, 50);// Display at x,y
-            textProperties.fontColor = COLOR_RED; //Change font to red
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)"Z4:", 10, 65);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone4[0]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 30, 65);// Display at x,y
-            oled.Label((uint8_t *)"-", 52, 65);// Display at x,y
-            sprintf(display_buff, "%u", HR_Zone4[1]); // Convert int to char to display
-            oled.Label((uint8_t *)display_buff, 60, 65);// Display at x,y
-            textProperties.fontColor = COLOR_WHITE; //Change font to white
-            oled.SetTextProperties(&textProperties);//Implement color change
-            oled.Label((uint8_t *)"Back",10,80); // Display "Back" at x,y
-            oled.Label((uint8_t *)"Next",60,80);  //Display "Next" at x,y
-            break;
-        }
-#endif  // end of non-production/debug version code
-        default: {
-            Error_Num=1;
-            error_screen(); // Clear screen
-            break;
         }
     }
-}
-void error_screen(void)
-{
-    oled.FillScreen(COLOR_RED); // Clear screen
-    oled.Label((uint8_t *)"Error! ",30,30); // Display error at x,y
-    sprintf(text_1," %i  ",Error_Num);
-    oled.Label((uint8_t *)text_1,30,60); // Display error at x,y
-    wait(3);  // wait 3 seconds
-    oled.FillScreen(COLOR_BLACK); // Clear screen
+        
+
 }
 
 /*****************************************************************************
@@ -1242,6 +265,7 @@
 Inputs: An int representing the duration of the vibration
 Returns: None
 ******************************************************************************/
+
 void StartHaptic(int x)
 {
     hapticTimer.start(x);
@@ -1254,319 +278,6 @@
     hapticTimer.stop();
 }
 
-/*****************************************************************************
-Name: Increment_Age
-Purpose: Increment the user's age by 1
-Inputs: None
-Returns: None
-******************************************************************************/
-void Increment_Age()
-{
-    StartHaptic();
-    if(Age < 100) {
-        Age += 1;
-        Screen_Num = 27;
-    } else {
-        Age = 1;
-    }
-}
-
-/*****************************************************************************
-Name: Decrement_Age
-Purpose: Decrement the user's age by 1
-Inputs: None
-Returns: None
-******************************************************************************/
-void Decrement_Age()
-{
-    StartHaptic();
-    if(Age == 1) {
-        Age = 100;
-    } else {
-        Age -= 1;
-        Screen_Num = 27;
-    }
-}
-
-/*****************************************************************************
-Name: Set_Max_Bpm
-Purpose: Calculates the user's maximum heart rate based on their age
-Inputs: None
-Returns: None
-******************************************************************************/
-void Set_Max_Bpm()
-{
-    Max_Bpm = 220 - Age;
-}
-
-/*****************************************************************************
-Name: Set_Zone_Boundaries
-Purpose: Calculates the user's heart rate zones' boundaries based on the user's
-         maximum heart rate
-Inputs: None
-Returns: None
-******************************************************************************/
-void Set_Zone_Boundaries()
-{
-    Set_Max_Bpm();
-    HR_Zone1[0] = Max_Bpm * .50;   //Set Heart Rate Zone 1
-    HR_Zone1[1] = Max_Bpm * .60;   //Set Heart Rate Zone 1
-    HR_Zone2[0] = HR_Zone1[1] + 1;   //Set Heart Rate Zone 2
-    HR_Zone2[1] = Max_Bpm * .70;   //Set Heart Rate Zone 2
-    HR_Zone3[0] = HR_Zone2[1] + 1;   //Set Heart Rate Zone 3
-    HR_Zone3[1] = Max_Bpm * .80;   //Set Heart Rate Zone 3
-    HR_Zone4[0] = HR_Zone3[1] + 1;   //Set Heart Rate Zone 4
-    HR_Zone4[1] = Max_Bpm;   //Set Heart Rate Zone 4
-}
-
-/*****************************************************************************
-Name: Increment_Target_Zone
-Purpose: Imcrements the user's target heart rate zone preference by 1
-Inputs: None
-Returns: None
-******************************************************************************/
-void Increment_Target_Zone()
-{
-    StartHaptic();
-    if(Target_Zone == 4) {
-        Target_Zone = 1;
-    } else {
-        Target_Zone += 1;
-    }
-}
-
-/*****************************************************************************
-Name: Decrement_Target_Zone
-Purpose: Decrements the user's target heart rate zone preference by 1
-Inputs: None
-Returns: None
-******************************************************************************/
-void Decrement_Target_Zone()
-{
-    StartHaptic();
-    if(Target_Zone == 1) {
-        Target_Zone = 4;
-    } else {
-        Target_Zone -= 1;
-    }
-}
-
-/*****************************************************************************
-Name: Increment_HR_Vibr_Pref
-Purpose: Increment the user's heart rate vibration preference by 1
-Inputs: None
-Returns: None
-******************************************************************************/
-void Increment_HR_Vibr_Pref()
-{
-    StartHaptic();
-    if(HR_Vibration == 3) {
-        HR_Vibration = 1;
-    } else {
-        HR_Vibration += 1;
-    }
-}
-
-/*****************************************************************************
-Name: Decrement_HR_Vibr_Pref
-Purpose: Decrement the user's heart rate vibration preference by 1
-Inputs: None
-Returns: None
-******************************************************************************/
-void Decrement_HR_Vibr_Pref()
-{
-    StartHaptic();
-    if(HR_Vibration == 1) {
-        HR_Vibration = 3;
-    } else {
-        HR_Vibration -= 1;
-    }
-}
-
-/*****************************************************************************
-Name: Enable_Heart_Rate
-Purpose: Turn on the HexiHeart heart rate function
-Inputs: None
-Returns: None
-******************************************************************************/
-void Enable_Heart_Rate()
-{
-    Heart_Rate_Mode = true;
-    Heart_Rate_Vibrations();
-}
-
-/*****************************************************************************
-Name: Disable_Heart_Rate
-Purpose: Turn off the HexiHeart heart rate function
-Inputs: None
-Returns: None
-******************************************************************************/
-void Disable_Heart_Rate()
-{
-    Heart_Rate_Mode = false;
-    Heart_Rate_Vibrations();
-}
-
-/*****************************************************************************
-Name: Determine_Current_Zone
-Purpose: Determines which zone the heart rate is in and assigns the curent
-         zone and previous zone
-Inputs: None
-Returns: None
-******************************************************************************/
-void Determine_Current_Zone()
-{
-    Prev_Zone = Current_Zone;
-
-    if(Heart_Rate >= HR_Zone1[0] && Heart_Rate <= HR_Zone1[1]) {
-        Current_Zone = 1;
-    } else if(Heart_Rate >= HR_Zone2[0] && Heart_Rate <= HR_Zone2[1]) {
-        Current_Zone = 2;
-    } else if(Heart_Rate >= HR_Zone3[0] && Heart_Rate <= HR_Zone3[1]) {
-        Current_Zone = 3;
-    } else if(Heart_Rate >= HR_Zone4[0] && Heart_Rate <= HR_Zone4[1]) {
-        Current_Zone = 4;
-    } else {
-        //error reading, don't change anything
-    }
 
 
-}
-/*****************************************************************************
-Name: Run_Heart_Vibrations
-Purpose: Performs the HexiHeart heart rate function
-Inputs: None
-Returns: None
-******************************************************************************/
-void Heart_Rate_Vibrations()
-{
-    if(Heart_Rate_Mode == true) {
-        if(HR_Vibration == 1) {
-            //All Pre-loaded vibrations enabled
-            if(Current_Zone == Prev_Zone) {
-                // Do nothing if no zone change
-            } else if(Current_Zone == Target_Zone) { //Changed to target zone
-                if(Target_Zone == LOWEST_ZONE || Prev_Zone > Target_Zone) { //must have entered from above
-                    StartHaptic(ENTER_ABOVE);
-                } else if(Target_Zone == HIGHEST_ZONE || Prev_Zone < Target_Zone) { //must have entered from below
-                    StartHaptic(ENTER_BELOW);
-                }
-            } else if(Current_Zone != Target_Zone && Prev_Zone == Target_Zone) {
-                if(Target_Zone == HIGHEST_ZONE || Current_Zone < Target_Zone) { //must have exited below
-                    StartHaptic(EXIT_BELOW);
-                } else if(Target_Zone == LOWEST_ZONE || Current_Zone > Target_Zone) { //must have exited above
-                    StartHaptic(EXIT_ABOVE);
-                }
-            }
-        } else if(HR_Vibration == 2) {
-            //Only Entering and Exiting target zone
-            if(Current_Zone == Prev_Zone) {
-                //do nothing
-            } else if(Current_Zone == Target_Zone) {
-                StartHaptic(VIB_OPT_2);
-                wait(0.1);
-                StartHaptic(VIB_OPT_2);
-            } else if(Current_Zone != Target_Zone && Prev_Zone == Target_Zone) {
-                StartHaptic(VIB_OPT_2);
-                wait(0.1);
-                StartHaptic(VIB_OPT_2);
-                wait(0.1);
-                StartHaptic(VIB_OPT_2);
-            }
-
-        } else  if(HR_Vibration == 3) {
-            //No Vibrations
-
-        } else {
-            //Error, can only be choices 1-3
-            error_screen();
-        }
-    }
-}
-
-/*****************************************************************************
-Name: Increment_Heart_Rate
-Purpose: Manually increment the the heart rate measurement by 1 for testing
-         purposes
-Inputs: None
-Returns: None
-******************************************************************************/
-void Increment_Heart_Rate()
-{
-    //StartHaptic();
-    if(Heart_Rate == HR_Zone4[1]) {
-        Heart_Rate = HR_Zone1[0];
-    } else {
-        Heart_Rate += 1;
-    }
-}
-
-/*****************************************************************************
-Name: Decrement_Heart_Rate
-Purpose: Manually decrement the the heart rate measurement by 1 for testing
-         purposes
-Inputs: None
-Returns: None
-******************************************************************************/
-void Decrement_Heart_Rate()
-{
-    //StartHaptic();
-    if(Heart_Rate == HR_Zone1[0]) {
-        Heart_Rate = HR_Zone4[1];
-    } else {
-        Heart_Rate -= 1;
-    }
-}
-
-void Led_Zone_Indicator()
-{
-  if(Led_Zones == true)
-  {
-    if(Current_Zone == 1)
-    {
-        BLU_Led = LED_OFF;
-        RED_Led = LED_ON;
-        GRN_Led = LED_ON;
-        //wait(0.5);
-        //RED_Led = LED_OFF;
-        //GRN_Led = LED_OFF;
-    }  
-    else if(Current_Zone == 2)
-    {
-        if(Prev_Zone == 1)
-        {
-            RED_Led = LED_OFF;
-            GRN_Led = LED_OFF;
-        }
-        else if(Prev_Zone == 3)
-        {
-            GRN_Led = LED_OFF;
-        }
-        BLU_Led = LED_ON;
-        //wait(0.5);  
-        //BLU_Led = LED_OFF; 
-    }
-    else if(Current_Zone == 3)
-    {
-        if(Prev_Zone == 2)
-        {
-            BLU_Led = LED_OFF;
-        }
-        else if(Prev_Zone == 4)
-        {
-            RED_Led = LED_OFF;
-        }
-        GRN_Led = LED_ON;
-        //wait(0.5);  
-        //GRN_Led = LED_OFF; 
-    }
-    else if(Current_Zone == 4)
-    {
-        GRN_Led = LED_OFF;
-        RED_Led = LED_ON;
-        //wait(0.5);  
-        //RED_Led = LED_OFF; 
-    }
-  }   
-
-}
+