ECE 4180 Fitbit Project / Mbed 2 deprecated 4180_Fitness_Tracker

This is a repository for code relating to mbed Fitness Tracker

Dependencies:   mbed PulseSensor2 SCP1000 mbed-rtos 4DGL-uLCD-SE LSM9DS1_Library_cal PinDetect FatFileSystemCpp GP-20U7

Files at this revision

API Documentation at this revision

Revision 38:d20bdc0a670d, committed 2020-04-25

Comitter:
dyu2021
Date:
Sat Apr 25 17:46:15 2020 +0000
Parent:
37:c912fdde26fa
Parent:
36:a5394da47ec8
Child:
39:c5bf01adac29
Commit message:
Finalized Code

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Sat Apr 25 17:37:42 2020 +0000
+++ b/main.cpp	Sat Apr 25 17:46:15 2020 +0000
@@ -190,10 +190,20 @@
         switch(screen) {
             //Checks if user wants to enter new configuration or use previous one
             case 1: 
+<<<<<<< working copy
                 uLCD.locate(1, 1);
+=======
+                uLCD.locate(3, 1);
+>>>>>>> merge rev
                 uLCD.text_width(1);
                 uLCD.text_height(1);
+<<<<<<< working copy
                 uLCD.puts("Use Previous \nConfiguration?");
+=======
+                uLCD.puts("Use Previous");
+                uLCD.locate(2, 3);
+                uLCD.puts("Configuration?");
+>>>>>>> merge rev
                 uLCD.text_width(3);
                 uLCD.text_height(3);
                 uLCD.locate(1, 3);