Ben Gordon / Mbed OS ELEC351_GroupA-branch1

Troubleshooting

displayThread.cpp@17:b7cd66c5f845, 2018-11-09 (annotated)

Committer:
BenRJG
Date:
Fri Nov 09 14:24:39 2018 +0000
Revision:
17:b7cd66c5f845
Parent:
14:9d4c24c3c696 
export to keil

Who changed what in which revision?

UserRevisionLine numberNew contents of line
BenRJG 13:d49ec153d644 1 #include "displayThread.h"
BenRJG 13:d49ec153d644 2
BenRJG 17:b7cd66c5f845 3 /*InterruptIn button1(b1);
BenRJG 13:d49ec153d644 4 InterruptIn button2(b2);
BenRJG 13:d49ec153d644 5
BenRJG 13:d49ec153d644 6 U_BYTE buttonPressed;
BenRJG 13:d49ec153d644 7
BenRJG 13:d49ec153d644 8 void displayFunction()
BenRJG 13:d49ec153d644 9 {
BenRJG 13:d49ec153d644 10 buttonPressed = 0;
BenRJG 13:d49ec153d644 11 button1.rise(&buttonTrigger1);
BenRJG 13:d49ec153d644 12 button2.rise(&buttonTrigger2);
BenRJG 13:d49ec153d644 13 Display display(RS,E,d4,d5,d6,d7); //rs,e,d4,d5,d6,d7
BenRJG 13:d49ec153d644 14 display.INIT();
BenRJG 17:b7cd66c5f845 15 wait_us(4000);
BenRJG 17:b7cd66c5f845 16 display.pageOne();
BenRJG 13:d49ec153d644 17 while(1)
BenRJG 13:d49ec153d644 18 {
BenRJG 14:9d4c24c3c696 19 if((buttonPressed & 1) == 1)
BenRJG 13:d49ec153d644 20 {
BenRJG 13:d49ec153d644 21 display.pageTwo();
BenRJG 14:9d4c24c3c696 22 buttonPressed &= 2; //clear bit 1
BenRJG 17:b7cd66c5f845 23 }
BenRJG 17:b7cd66c5f845 24
BenRJG 17:b7cd66c5f845 25 if((buttonPressed & 2) == 2)
BenRJG 17:b7cd66c5f845 26 {
BenRJG 17:b7cd66c5f845 27 display.pageOne();
BenRJG 17:b7cd66c5f845 28 buttonPressed &= 1;
BenRJG 17:b7cd66c5f845 29 }
BenRJG 17:b7cd66c5f845 30 } //while(1);
BenRJG 13:d49ec153d644 31 }
BenRJG 13:d49ec153d644 32
BenRJG 13:d49ec153d644 33 void buttonTrigger1()
BenRJG 13:d49ec153d644 34 {
BenRJG 13:d49ec153d644 35 buttonPressed |= 1; //set first bit
BenRJG 13:d49ec153d644 36 }
BenRJG 13:d49ec153d644 37
BenRJG 13:d49ec153d644 38 void buttonTrigger2()
BenRJG 13:d49ec153d644 39 {
BenRJG 13:d49ec153d644 40 buttonPressed |= 2; //set second bit
BenRJG 17:b7cd66c5f845 41 }*/