Diff: main.cpp

Revision:

37:4b38af411b64

Parent:

36:36d44b58980a

Child:

38:12f6e20e66a2

Child:

39:8553e1c36d31

--- a/main.cpp	Thu Jan 18 10:46:55 2018 +0000
+++ b/main.cpp	Fri Apr 20 13:33:36 2018 +0000
@@ -40,6 +40,7 @@
 /* Static constants for the accelerometer */
 #define WHO_AM_I            0x0D           /* Type 'read' : This should return the device id of 0x2A */
 #define OUT_Z_MSB           0x05           /* Type 'read' : z axis - 8 most significatn bit of a 12 bit sample */
+#define ACC_POWER           (p7)
 #define I2C_DATA            (p29)
 #define I2C_CLK             (p2)
 #define INT2_PIN            (p4)
@@ -48,9 +49,21 @@
 #define BUZZER_ON_TIME_S    (0.250)
 #define BUZZER_OFF_TIME_S   (0.050)
 
+/* LEDs */
+#define RED_LED             (p22)
+#define GREEN_LED           (p24)
+#define BLUE_LED            (p23)
+
+/* I2C power */
+#define I2C_POWER           (p5)
+
+/* UART pins */
+#define UART_TX             (p25)
+#define UART_RX             (p26)
+
 #if DEBUG_PRINT_UART
     #include "nrf52_uart.h"
-    NRF52_UART uart(p25, p26, Baud9600);
+    NRF52_UART uart(UART_TX, UART_RX, Baud9600);
     char buffer[255];
     #define SEND(...) {uint8_t len = sprintf(buffer, __VA_ARGS__); uart.send(buffer, len);}
 #else
@@ -84,8 +97,8 @@
 NRF52_PWM buzzer(NRF_PWM2);
 
 #if USE_ACC
-    DigitalOut accPower(p7);
-    DigitalOut i2cPower(p5);
+    DigitalOut accPower(ACC_POWER);
+    DigitalOut i2cPower(I2C_POWER);
     InterruptIn accPulse(INT2_PIN);
     Acc_MMA8452 acc(I2C_DATA, I2C_CLK, MMA8452_ADDRESS);
 
@@ -94,14 +107,14 @@
 ACKService<4> *ackServicePtr;
 
 #if DEBUG || DEBUG_MAC || DEBUG_CONNECTION
-    NRF52_DigitalOut advLED(p22);         // Red
-    NRF52_DigitalOut scanLED(p23);        // Blue
-    NRF52_DigitalOut connectedLED(p24);   // Green
+    NRF52_DigitalOut advLED(RED_LED);         // Red
+    NRF52_DigitalOut scanLED(BLUE_LED);        // Blue
+    NRF52_DigitalOut connectedLED(GREEN_LED);   // Green
 #endif
 
 #if DEBUG_ACC
-    NRF52_DigitalOut int_led(p22);
-    NRF52_DigitalOut act_led(p22);
+    NRF52_DigitalOut int_led(RED_LED);
+    NRF52_DigitalOut act_led(RED_LED);
 #endif
 
 void buzzerToggle(){