nrf_peripheral distinction

Martinsbl · Apr 5, 2017 · 2468fe4 · 2468fe4
1 parent 482fa88
commit 2468fe4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/app_mpu.c b/app_mpu.c
@@ -11,7 +11,7 @@
 #include "nrf_gpio.h"
 #include "nrf_drv_mpu.h"
 #include "nrf_error.h"
-#include "nrf52832_peripherals.h"
+#include "nrf_peripherals.h"
 
 
 

diff --git a/app_mpu.h b/app_mpu.h
@@ -10,7 +10,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "nrf52832_peripherals.h"
+
+#include "nrf_peripherals.h"
 
 #if defined(MPU60x0)
     #include "mpu60x0_register_map.h"
@@ -343,7 +344,7 @@ uint32_t mpu_config_ff_detection(uint16_t mg, uint8_t duration);
  */
 
 
-#if (defined(MPU9150) || defined(MPU9255)) && (TWI_COUNT >= 1) // Magnetometer only works with TWI so check if TWI is enabled
+#if (defined(MPU9150) || defined(MPU9255)) && (MPU_USES_TWI) // Magnetometer only works with TWI so check if TWI is enabled
 
 /**@brief Enum defining possible magnetometer operating modes */
 enum magn_op_mode {

diff --git a/...cks/ble_app_template_pca10056_s140.uvoptx → .../nrf5-ble-mpu-simple_pca10056_s140.uvoptx b/...cks/ble_app_template_pca10056_s140.uvoptx → .../nrf5-ble-mpu-simple_pca10056_s140.uvoptx
diff --git a/...ks/ble_app_template_pca10056_s140.uvprojx → ...nrf5-ble-mpu-simple_pca10056_s140.uvprojx b/...ks/ble_app_template_pca10056_s140.uvprojx → ...nrf5-ble-mpu-simple_pca10056_s140.uvprojx