Skip to content

Commit

Permalink
Merge pull request #5 from cparata/master
Browse files Browse the repository at this point in the history
Rename some defines in the examples to solve conflicts with new core
  • Loading branch information
cparata committed Mar 27, 2018
2 parents 5d0ee68 + eacaf08 commit 06e1fb8
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
16 changes: 8 additions & 8 deletions examples/SPBTLE_BeaconDemo/SPBTLE_BeaconDemo.ino
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@
#include <SPBTLE_RF.h>
#include <beacon_service.h>

#define PIN_SPI_MOSI (PC12)
#define PIN_SPI_MISO (PC11)
#define PIN_SPI_SCK (PC10)
#define PIN_BLE_SPI_MOSI (PC12)
#define PIN_BLE_SPI_MISO (PC11)
#define PIN_BLE_SPI_SCK (PC10)

#define PIN_SPI_nCS (PD13)
#define PIN_SPI_RESET (PA8)
#define PIN_SPI_IRQ (PE6)
#define PIN_BLE_SPI_nCS (PD13)
#define PIN_BLE_SPI_RESET (PA8)
#define PIN_BLE_SPI_IRQ (PE6)

#define PIN_BLE_LED (LED4)

// Configure BTLE_SPI
SPIClass BTLE_SPI(PIN_SPI_MOSI, PIN_SPI_MISO, PIN_SPI_SCK);
SPIClass BTLE_SPI(PIN_BLE_SPI_MOSI, PIN_BLE_SPI_MISO, PIN_BLE_SPI_SCK);

// Configure BTLE pins
SPBTLERFClass BTLE(&BTLE_SPI, PIN_SPI_nCS, PIN_SPI_IRQ, PIN_SPI_RESET, PIN_BLE_LED);
SPBTLERFClass BTLE(&BTLE_SPI, PIN_BLE_SPI_nCS, PIN_BLE_SPI_IRQ, PIN_BLE_SPI_RESET, PIN_BLE_LED);

// Mac address
uint8_t SERVER_BDADDR[] = {0x12, 0x34, 0x00, 0xE1, 0x80, 0x03};
Expand Down
16 changes: 8 additions & 8 deletions examples/SPBTLE_SensorDemo/SPBTLE_SensorDemo.ino
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@
#include <SPBTLE_RF.h>
#include <sensor_service.h>

#define PIN_SPI_MOSI (PC12)
#define PIN_SPI_MISO (PC11)
#define PIN_SPI_SCK (PC10)
#define PIN_BLE_SPI_MOSI (PC12)
#define PIN_BLE_SPI_MISO (PC11)
#define PIN_BLE_SPI_SCK (PC10)

#define PIN_SPI_nCS (PD13)
#define PIN_SPI_RESET (PA8)
#define PIN_SPI_IRQ (PE6)
#define PIN_BLE_SPI_nCS (PD13)
#define PIN_BLE_SPI_RESET (PA8)
#define PIN_BLE_SPI_IRQ (PE6)

#define PIN_BLE_LED (LED4)

// Configure BTLE_SPI
SPIClass BTLE_SPI(PIN_SPI_MOSI, PIN_SPI_MISO, PIN_SPI_SCK);
SPIClass BTLE_SPI(PIN_BLE_SPI_MOSI, PIN_BLE_SPI_MISO, PIN_BLE_SPI_SCK);

// Configure BTLE pins
SPBTLERFClass BTLE(&BTLE_SPI, PIN_SPI_nCS, PIN_SPI_IRQ, PIN_SPI_RESET, PIN_BLE_LED);
SPBTLERFClass BTLE(&BTLE_SPI, PIN_BLE_SPI_nCS, PIN_BLE_SPI_IRQ, PIN_BLE_SPI_RESET, PIN_BLE_LED);

const char *name = "BlueNRG";
uint8_t SERVER_BDADDR[] = {0x12, 0x34, 0x00, 0xE1, 0x80, 0x03};
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=STM32duino SPBTLE-RF
version=1.0.1
version=1.0.2
author=STMicroelectronics, AMS, Wi6Labs
maintainer=stm32duino
sentence=This library includes drivers for ST's BlueNRG/BlueNRG-MS Bluetooth Low Energy device.
Expand Down

0 comments on commit 06e1fb8

Please sign in to comment.