Diff: Components/Display/Display.h

Revision:

57:fa4c622b04a7

Parent:

56:37d1736bd896

--- a/Components/Display/Display.h	Mon Mar 13 17:57:03 2017 +0100
+++ b/Components/Display/Display.h	Mon Mar 13 19:08:10 2017 +0000
@@ -43,7 +43,7 @@
 /* Includes ------------------------------------------------------------------*/
 
 #include "mbed.h"
-#include "Stmpe1600.h"
+#include "STMPE1600.h"
 #include "DevI2C.h"
 
 #ifdef __cplusplus
@@ -254,18 +254,18 @@
      * @param[in] &stmpe_1600 device handler to be used for display control
      */    
     Display(STMPE1600 &stmpe_1600) : stmpe1600(stmpe_1600) {
-	    stmpe1600.setGPIOdir (GPIO_7,  OUTPUT);  // Digit1	 
-	    stmpe1600.setGPIOdir (GPIO_8,  OUTPUT);  // Digit2	 
-	    stmpe1600.setGPIOdir (GPIO_9,  OUTPUT);  // Digit3	 
-	    stmpe1600.setGPIOdir (GPIO_10, OUTPUT);  // Digit4	 	 
+	    stmpe1600.set_gpio_dir (GPIO_7,  OUTPUT);  // Digit1	 
+	    stmpe1600.set_gpio_dir (GPIO_8,  OUTPUT);  // Digit2	 
+	    stmpe1600.set_gpio_dir (GPIO_9,  OUTPUT);  // Digit3	 
+	    stmpe1600.set_gpio_dir (GPIO_10, OUTPUT);  // Digit4	 	 
 	 
-	    stmpe1600.setGPIOdir (GPIO_0,  OUTPUT);  // SegmentA	 	 	 
-	    stmpe1600.setGPIOdir (GPIO_1,  OUTPUT);  // SegmentB	 	 	 
-	    stmpe1600.setGPIOdir (GPIO_2,  OUTPUT);  // SegmentC	 	 
-	    stmpe1600.setGPIOdir (GPIO_3,  OUTPUT);  // SegmentD	 	 
-	    stmpe1600.setGPIOdir (GPIO_4,  OUTPUT);  // SegmentE	 	 
-	    stmpe1600.setGPIOdir (GPIO_5,  OUTPUT);  // SegmentF	 	 
-	    stmpe1600.setGPIOdir (GPIO_6,  OUTPUT);  // SegmentG	 	 	  	 
+	    stmpe1600.set_gpio_dir (GPIO_0,  OUTPUT);  // SegmentA	 	 	 
+	    stmpe1600.set_gpio_dir (GPIO_1,  OUTPUT);  // SegmentB	 	 	 
+	    stmpe1600.set_gpio_dir (GPIO_2,  OUTPUT);  // SegmentC	 	 
+	    stmpe1600.set_gpio_dir (GPIO_3,  OUTPUT);  // SegmentD	 	 
+	    stmpe1600.set_gpio_dir (GPIO_4,  OUTPUT);  // SegmentE	 	 
+	    stmpe1600.set_gpio_dir (GPIO_5,  OUTPUT);  // SegmentF	 	 
+	    stmpe1600.set_gpio_dir (GPIO_6,  OUTPUT);  // SegmentG	 	 	  	 
     }
      
 	/*** Interface Methods ***/
@@ -284,7 +284,7 @@
 			
         for (i=0, dgt=4-strlen, pc=str; i<strlen && *pc!=0; i++, pc++, dgt++) {
 			_V2_Set7Segment( ascii_to_display_lut[(uint8_t)*pc], dgt);
-			if ( (pc+1)== '.') {
+			if ( *(pc+1)== '.') {
 				pc++;
 			}
 			wait_ms(DISPLAY_DELAY);