Diff: main.cpp

Revision:

17:b7cd66c5f845

Parent:

14:9d4c24c3c696

--- a/main.cpp	Thu Nov 08 23:22:05 2018 +0000
+++ b/main.cpp	Fri Nov 09 14:24:39 2018 +0000
@@ -4,9 +4,9 @@
 #include "Terminal.hpp"
 #include "displayThread.h"
 
-Thread tDisplay;
+//Thread tDisplay;
 
-int main(void) {
+/*int main(void) {
     tDisplay.start(displayFunction);
     
     Terminal PC(SERIAL_TX, SERIAL_RX);
@@ -20,4 +20,63 @@
         //wait(0.5);
         Thread::wait(osWaitForever);
     }
+}*/
+InterruptIn button1(b1);
+InterruptIn button2(b2);
+
+volatile U_BYTE buttonPressed;
+
+    #define b1 PE_12
+    #define b2 PE_14
+    
+    #define RS  PD_15   //D9
+    #define E   PF_12   //D8
+    #define d4  PF_13   //D7
+    #define d5  PE_9    //D6
+    #define d6  PF_14   //D4
+    #define d7  PF_15   //D2
+    
+    void buttonTrigger1();
+    void buttonTrigger2();
+    
+DigitalOut green(PB_11);
+
+Display display(RS,E,d4,d5,d6,d7); //rs,e,d4,d5,d6,d7
+
+int main(void)
+{
+    buttonPressed = 0;
+    button1.rise(&buttonTrigger1);
+    button2.rise(&buttonTrigger2);
+    wait_us(4000);
+    display.INIT();
+    wait_us(4000);
+    display.pageOne();
+    green = 0;
+    while(1)
+    {
+        if(buttonPressed == 1)
+        {
+               display.pageTwo();
+               buttonPressed &= 2; //clear bit 1
+        }else if(buttonPressed == 2)
+        {
+                display.pageOne();
+                buttonPressed &= 1;   
+        }/*else if(buttonPressed == 3)
+        {
+               green = !green;
+               buttonPressed = 0;
+        }*/
+    } //while(1);
 }
+
+void buttonTrigger1()
+{
+    buttonPressed |= 1; //set first bit
+}
+
+void buttonTrigger2()
+{
+    buttonPressed |= 2; //set second bit
+}
\ No newline at end of file