Diff: source/main.h

Revision:

8:7ba4f82de9b6

Parent:

7:ac8277568115

Child:

15:c0c01188a29b

diff -r ac8277568115 -r 7ba4f82de9b6 source/main.h
--- a/source/main.h	Wed Mar 14 08:48:26 2018 +0000
+++ b/source/main.h	Tue Mar 20 15:13:51 2018 +0000
@@ -14,42 +14,17 @@
 #include "ble/BLE.h"
 #include "GapAdvertisingData.h"
 #include "acd52832_bsp.h"
-#include "acn_nrf52_pwm.h"
 
 #define DEBUG               (0)
-#define PRINT_ON_RTT        (1)
+#define PRINT_ON_RTT        (0)
 #define DEBUG_LED           (0)
 #define NANO_MODULE         (0)
 //#define LSB_VALUE           (192)
-#define LSB_VALUE           (1)
-
-#if NANO_MODULE
-    #define I2C_DATA            (p2)
-    #define I2C_CLK             (p3)
-    #define INT_PIN1            (p10)
-    #define INT_PIN2            (p9)
-    #define ACC_POWER_PIN       (p13)
-    #define RED_LED_PIN         (p12)
-#else
-    #define I2C_DATA            (p20)
-    #define I2C_CLK             (p17)
-    #define INT_PIN1            (p16)
-    #define INT_PIN2            (p15)
-    #define ACC_POWER_PIN       (p11)
-    #define RED_LED_PIN         (p31)   //p22
-    #define GREEN_LED_PIN       (p2)
-    #define BLUE_LED_PIN        (p3)
-    #define BUZZER_PIN          (p18)
-#endif
 
 #define BLE_ACTIVE_TIME_S   (0.4)
 #define POWER_UP_DELAY_MS   (200)
-#define MEASURE_INTERVAL_MS (100)
 
 
-#define BUZZER_FREQUENCY_HZ       (4000)
-#define BUZZ_TIME_S               (2)     /* Buzz time in s */
-
 #if PRINT_ON_RTT
     #include "SEGGER_RTT.h"
     #define printf(...)                      SEGGER_RTT_printf(0, __VA_ARGS__)
@@ -71,25 +46,10 @@
     #define SEND(...)
 #endif
 
-char memsI2CAddress = I2C_ADDRESS;
-Mutex uartM;
-Thread uartT;
-Thread bleT;
-Thread measureT;
 
-DigitalOut AccVcc(ACC_POWER_PIN);
-DigitalOut redLed(RED_LED_PIN);
-#if NANO_MODULE == 0
-DigitalOut greenLed(GREEN_LED_PIN);
-DigitalOut blueLed(BLUE_LED_PIN);
-#endif
-InterruptIn INT1(INT_PIN1);
-//InterruptIn INT2(INT_PIN2);
-I2C i2c(I2C_DATA,I2C_CLK);
-Lis2dh12 mems(&i2c, memsI2CAddress);
-Ticker bleTicker;
-Ticker test_ticker;
-
-NRF52_PWM buzzer(NRF_PWM2);
+extern Thread bleT;
+extern Thread measureT;
+extern Thread updateServiceT;
+extern Thread updateBuzzLedsT;
 
 #endif