Diff: main.cpp

Revision:

1:87661a0c8ba3

Parent:

0:089b4c4f2b6f

Child:

2:9d6daa8a091c

--- a/main.cpp	Tue Aug 23 08:47:11 2022 +0000
+++ b/main.cpp	Tue Aug 23 09:06:19 2022 +0000
@@ -65,14 +65,14 @@
 void init_pcb();     // sets up the pcb
 
 // button voids
-void button_a_interrupt();
-void button_b_interrupt();
-void button_x_interrupt();
-void button_y_interrupt();
-void button_left_interrupt();
-void button_right_interrupt();
-void button_back_interrupt();
-void button_start_interrupt();
+void button_a_isr();
+void button_b_isr();
+void button_x_isr();
+void button_y_isr();
+void button_left_isr();
+void button_right_isr();
+void button_back_isr();
+void button_start_isr();
 
 // page voids
 void startup();
@@ -88,14 +88,14 @@
 int main() {
     
     // interrupts setup
-    button_a.rise(&button_a_interrupt);
-    button_b.rise(&button_b_interrupt);
-    button_x.rise(&button_x_interrupt);
-    button_y.rise(&button_y_interrupt);
-    button_left.rise(&button_left_interrupt);
-    button_right.rise(&button_right_interrupt);
-    button_back.rise(&button_back_interrupt);
-    button_start.rise(&button_start_interrupt);
+    button_a.rise(&button_a_isr);
+    button_b.rise(&button_b_isr);
+    button_x.rise(&button_x_isr);
+    button_y.rise(&button_y_isr);
+    button_left.rise(&button_left_isr);
+    button_right.rise(&button_right_isr);
+    button_back.rise(&button_back_isr);
+    button_start.rise(&button_start_isr);
     
     
     
@@ -325,58 +325,60 @@
         
     }
 }   
-    
-    
+
 }
+}    
+    
+
         
-void button_a_interrupt();
+void button_a_isr()
 {
     button_a_flag = 1;
 }        
  
-void button_b_interrupt();
+void button_b_isr()
 {
     button_b_flag = 1;
 }
  
-void button_x_interrupt();
+void button_x_isr()
 {
     button_x_flag = 1;
 }
  
-void button_y_interrupt();
+void button_y_isr()
 {
     button_y_flag = 1;
 }
 
-void button_left_interrupt();
+void button_left_isr()
 {
     button_left_flag = 1;
 }
 
-void button_right_interrupt();
+void button_right_isr()
 {
     button_right_flag = 1;
 }
  
-void button_back_interrupt();
+void button_back_isr()
 {
     button_back_flag = 1;
 }    
 
     
-void button_start_interrupt();
+void button_start_isr()
 {
     button_start_flag = 1;
 }  
 
-void cwshigh();
+void cwshigh()
 {
     lcd.printString("Water Temp Too High",0,3);
     led_red1 = 0;
 }
 
-void get_temp();
+void get_temp()
 {
     char buffer[14];
     float temp = tmp.get_temperature();
@@ -387,7 +389,7 @@
     
 }
 
-void CustHi_SP();
+void CustHi_SP()
 {
     Direction d = Joystick.get_direction();
     
@@ -412,7 +414,7 @@
     }
 }
 
-void CustLo_SP();
+void CustLo_SP()
 {
         if (button_left_flag) {
             button_left_flag = 0;
@@ -438,5 +440,5 @@
         
 
     
-}   
+