Ben Gordon / Mbed OS ELEC351_GroupA-branch1

Troubleshooting

main.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 0:f8fe58d43763 1 #include "mbed.h"
Jonathan738 6:f3d1ab8a9e99 2 #include "DataTypes.hpp"
BenRJG 12:edf31d0a61f0 3 #include "Display.hpp"
Jonathan738 6:f3d1ab8a9e99 4 #include "Terminal.hpp"
BenRJG 13:d49ec153d644 5 #include "displayThread.h"
BenRJG 0:f8fe58d43763 6
BenRJG 17:b7cd66c5f845 7 //Thread tDisplay;
BenRJG 14:9d4c24c3c696 8
BenRJG 17:b7cd66c5f845 9 /*int main(void) {
BenRJG 13:d49ec153d644 10 tDisplay.start(displayFunction);
BenRJG 12:edf31d0a61f0 11
Jonathan738 6:f3d1ab8a9e99 12 Terminal PC(SERIAL_TX, SERIAL_RX);
Jonathan738 6:f3d1ab8a9e99 13 PC.init();
Jonathan738 6:f3d1ab8a9e99 14 PC.DisplayCellIndex();
BenRJG 12:edf31d0a61f0 15
BenRJG 12:edf31d0a61f0 16
BenRJG 13:d49ec153d644 17 //S_BYTE temp = -5;
BenRJG 0:f8fe58d43763 18 while (true) {
BenRJG 0:f8fe58d43763 19 //led1 = !led1;
BenRJG 0:f8fe58d43763 20 //wait(0.5);
BenRJG 13:d49ec153d644 21 Thread::wait(osWaitForever);
BenRJG 0:f8fe58d43763 22 }
BenRJG 17:b7cd66c5f845 23 }*/
BenRJG 17:b7cd66c5f845 24 InterruptIn button1(b1);
BenRJG 17:b7cd66c5f845 25 InterruptIn button2(b2);
BenRJG 17:b7cd66c5f845 26
BenRJG 17:b7cd66c5f845 27 volatile U_BYTE buttonPressed;
BenRJG 17:b7cd66c5f845 28
BenRJG 17:b7cd66c5f845 29 #define b1 PE_12
BenRJG 17:b7cd66c5f845 30 #define b2 PE_14
BenRJG 17:b7cd66c5f845 31
BenRJG 17:b7cd66c5f845 32 #define RS PD_15 //D9
BenRJG 17:b7cd66c5f845 33 #define E PF_12 //D8
BenRJG 17:b7cd66c5f845 34 #define d4 PF_13 //D7
BenRJG 17:b7cd66c5f845 35 #define d5 PE_9 //D6
BenRJG 17:b7cd66c5f845 36 #define d6 PF_14 //D4
BenRJG 17:b7cd66c5f845 37 #define d7 PF_15 //D2
BenRJG 17:b7cd66c5f845 38
BenRJG 17:b7cd66c5f845 39 void buttonTrigger1();
BenRJG 17:b7cd66c5f845 40 void buttonTrigger2();
BenRJG 17:b7cd66c5f845 41
BenRJG 17:b7cd66c5f845 42 DigitalOut green(PB_11);
BenRJG 17:b7cd66c5f845 43
BenRJG 17:b7cd66c5f845 44 Display display(RS,E,d4,d5,d6,d7); //rs,e,d4,d5,d6,d7
BenRJG 17:b7cd66c5f845 45
BenRJG 17:b7cd66c5f845 46 int main(void)
BenRJG 17:b7cd66c5f845 47 {
BenRJG 17:b7cd66c5f845 48 buttonPressed = 0;
BenRJG 17:b7cd66c5f845 49 button1.rise(&buttonTrigger1);
BenRJG 17:b7cd66c5f845 50 button2.rise(&buttonTrigger2);
BenRJG 17:b7cd66c5f845 51 wait_us(4000);
BenRJG 17:b7cd66c5f845 52 display.INIT();
BenRJG 17:b7cd66c5f845 53 wait_us(4000);
BenRJG 17:b7cd66c5f845 54 display.pageOne();
BenRJG 17:b7cd66c5f845 55 green = 0;
BenRJG 17:b7cd66c5f845 56 while(1)
BenRJG 17:b7cd66c5f845 57 {
BenRJG 17:b7cd66c5f845 58 if(buttonPressed == 1)
BenRJG 17:b7cd66c5f845 59 {
BenRJG 17:b7cd66c5f845 60 display.pageTwo();
BenRJG 17:b7cd66c5f845 61 buttonPressed &= 2; //clear bit 1
BenRJG 17:b7cd66c5f845 62 }else if(buttonPressed == 2)
BenRJG 17:b7cd66c5f845 63 {
BenRJG 17:b7cd66c5f845 64 display.pageOne();
BenRJG 17:b7cd66c5f845 65 buttonPressed &= 1;
BenRJG 17:b7cd66c5f845 66 }/*else if(buttonPressed == 3)
BenRJG 17:b7cd66c5f845 67 {
BenRJG 17:b7cd66c5f845 68 green = !green;
BenRJG 17:b7cd66c5f845 69 buttonPressed = 0;
BenRJG 17:b7cd66c5f845 70 }*/
BenRJG 17:b7cd66c5f845 71 } //while(1);
BenRJG 0:f8fe58d43763 72 }
BenRJG 17:b7cd66c5f845 73
BenRJG 17:b7cd66c5f845 74 void buttonTrigger1()
BenRJG 17:b7cd66c5f845 75 {
BenRJG 17:b7cd66c5f845 76 buttonPressed |= 1; //set first bit
BenRJG 17:b7cd66c5f845 77 }
BenRJG 17:b7cd66c5f845 78
BenRJG 17:b7cd66c5f845 79 void buttonTrigger2()
BenRJG 17:b7cd66c5f845 80 {
BenRJG 17:b7cd66c5f845 81 buttonPressed |= 2; //set second bit
BenRJG 17:b7cd66c5f845 82 }