The HexiHeart is a demo project product that takes advantage of many of the onboard Hexiwear sensors and capabilities to create a multifunctional fitness and safety watch.

Dependencies:   FXAS21002 FXOS8700 Hexi_KW40Z Hexi_OLED_SSD1351 MAXIM W25Q64FVSSIG HTU21D MPL3115A2 TSL2561

Fork of HexiHeart_Alex by Hexiwear_zeta

Files at this revision

API Documentation at this revision

Comitter:
nbaker
Date:
Mon Apr 16 12:33:00 2018 +0000
Parent:
17:746dc1b7b218
Child:
19:87ab6daf98e5
Commit message:
v2.15 - added display screens 41 and 42 back in.

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/main.cpp	Fri Apr 13 00:10:22 2018 +0000
+++ b/main.cpp	Mon Apr 16 12:33:00 2018 +0000
@@ -20,6 +20,8 @@
 Display data screen update routines
 
 **************   Versions  ****************
+v2.15 - added display screens 41 and 42 back in.
+
 v2.14 - Retasked hr_led Ticker to turn off heart rate zone LEDs thereby preventing the 
 system from having to spend half its time in a wait state. added HR screen #7 to  
 screens that get refreshed with new data twice a second. Reduced WDT back to 2 seconds.  
@@ -75,7 +77,7 @@
 
 
 /* General  Definitions */
-#define SW_Ver          2.14    // For displaying software version
+#define SW_Ver          2.15    // For displaying software version
 #define LED_ON          0
 #define LED_OFF         1
 #define SCRN_TIME       10.0    // Set OLED screen turn off time to 10.0 seconds
@@ -2311,6 +2313,39 @@
             oled.SetTextProperties(&textProperties);
             break;           
         }
+        case 41: { //Fall mode
+            oled.FillScreen(COLOR_BLACK);
+            oled.Label((uint8_t *)"Adj Fall Mode", 10, 5);
+            sprintf(display_buff, "%u", Fall_Alert_Mode); //Convert int to char array for displaying mode
+            oled.Label((uint8_t *)"Mode:", 5, 30);
+            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
+            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);
+            break;
+        }
+        case 42: { //Fall Thresh
+            oled.FillScreen(COLOR_BLACK);
+            oled.Label((uint8_t *)"Adj F-Th", 10, 5);
+            sprintf(display_buff, "%2.2f g", Fall_Thresh); //Convert int to char array for displaying mode
+            oled.Label((uint8_t *)"F_Th:", 5, 30);
+            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
+            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);
+            break;
+        }
+        
         case 43: { //Impact Thresh
             oled.FillScreen(COLOR_BLACK);
             oled.Label((uint8_t *)"Adj I-Th", 10, 5);