wisetop/past-project-past_code_cc2650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'neulive1.2/rearrange'

Browse Source
This commit is contained in:
Ta-Shun Su
2019-05-22 10:16:57 +08:00
parent 71169d5a6d 78d00fdd0d
commit 60dcd75bf1
3 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simplelink/ble_sdk_2_02_02_25/src/boards/CC2650_LAUNCHXL/CC2650_LAUNCHXL.h
+8 -8
View File
@@ -130,14 +130,14 @@ extern const PIN_Config BoardGpioInitTable[];
#define Board_LCD_CS_OFF 0
/* PWM outputs */
#define Board_PWMPIN0 Board_RLED
#define Board_PWMPIN1 Board_GLED
#define Board_PWMPIN2 PIN_UNASSIGNED
#define Board_PWMPIN3 PIN_UNASSIGNED
#define Board_PWMPIN4 PIN_UNASSIGNED
#define Board_PWMPIN5 PIN_UNASSIGNED
#define Board_PWMPIN6 PIN_UNASSIGNED
#define Board_PWMPIN7 PIN_UNASSIGNED
#define Board_PWMPIN0 Board_RLED
#define Board_PWMPIN1 Board_GLED
#define Board_PWMPIN2 PIN_UNASSIGNED
#define Board_PWMPIN3 PIN_UNASSIGNED
#define Board_PWMPIN4 PIN_UNASSIGNED
#define Board_PWMPIN5 PIN_UNASSIGNED
#define Board_PWMPIN6 PIN_UNASSIGNED
#define Board_PWMPIN7 PIN_UNASSIGNED
/** ============================================================================
* Instance identifiers
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_pin.h
+6 -12
View File
@@ -16,26 +16,20 @@
#include "sti/headstage_pin.h"
else
static PIN_Config headstage_pin_configuration[] = {PIN_TERMINATE};
#error "headstage_pin headstage_pin_configuration not defined"
#endif
static PIN_State headstage_pins_state;
static PIN_Handle headstage_pins_handle;
#define headstage_pin_add(configuration) PIN_add(headstage_pins_handle, configuration)
#define headstage_pin_remove(pin) PIN_remove(headstage_pins_handle, pin)
#define headstage_pin_close() PIN_close(headstage_pins_handle)
//#define headstage_pin_open() \
// do { \
// headstage_pins_handle = PIN_open(&stage, headstage_pin_configuration); \
// } while (0)
#define headstage_pin_open() \
do { \
PIN_State state; \
headstage_pins_handle = PIN_open(&state, BoardGpioInitTable); \
headstage_pin_add(*headstage_pin_configuration); \
#define headstage_pin_open() \
do { \
headstage_pins_handle = PIN_open(&headstage_pins_state, headstage_pin_configuration); \
} while (0)
#ifdef HEADSTAGE_PIN_USE_CC26XX
@@ -51,4 +45,4 @@ static PIN_Handle headstage_pins_handle;
#endif
#endif // HEADSTAGE_PIN_H
#endif // HEADSTAGE_PIN_H
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/uni/headstage_pin.h
-12
View File
@@ -48,18 +48,6 @@ static PIN_Config headstage_pin_configuration[] = { //
PIN_ADC_EOC | PIN_INPUT_EN | PIN_PULLDOWN,
PIN_PWR_CHECK | PIN_INPUT_EN | PIN_PULLDOWN,
PIN_POLY_CLK | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL, // POLY_R
PIN_CLOCK_8M | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
// LSK spi
PIN_LSK_MOSI | PIN_INPUT_EN | PIN_PULLDOWN, // SPI0 to receive LSK
PIN_LSK_CLK | PIN_INPUT_EN | PIN_PULLDOWN, // after lsk and lsk_manchester xor lsk_clk
PIN_LSK_CS | PIN_INPUT_EN | PIN_PULLDOWN, // SPI0_LSK
// ASK
PIN_ASK_MOSI | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL, // SPI1 to transmit ASK
PIN_ASK_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL, // SPI1_ASK
PIN_RESET | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
PIN_TRIGGER | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,