add 2650-ma mem pin

simplelink/ble_sdk_2_02_02_25/src/boards/BOOSTXL_CC2650MA/BOOSTXL_CC2650MA.c

@@ -61,6 +61,23 @@
 
 #include "Board.h"
 
+#include <stdbool.h>
+#include <ti/sysbios/knl/Clock.h>
+#include <ti/sysbios/knl/Semaphore.h>
+#include <ti/sysbios/knl/Queue.h>
+
+#ifdef USE_ICALL
+#include <icall.h>
+#endif
+
+#include <inc/hw_ints.h>
+
+#include "util.h"
+#include "board.h"
+
+static void Board_keyChangeHandler(UArg a0);
+static void Board_keyCallback(PIN_Handle hPin, PIN_Id pinId);
+
 /*
  *  ========================= IO driver initialization =========================
  *  From main, PIN_init(BoardGpioInitTable) should be called to setup safe
@@ -71,18 +88,97 @@
 
 /* Place into subsections to allow the TI linker to remove items properly */
 #if defined(__TI_COMPILER_VERSION__)
-#pragma DATA_SECTION(BoardGpioInitTable, ".const:BoardGpioInitTable")
+//#pragma DATA_SECTION(BoardGpioInitTable, ".const:BoardGpioInitTable")
 #pragma DATA_SECTION(PINCC26XX_hwAttrs, ".const:PINCC26XX_hwAttrs")
 #endif
 
-const PIN_Config BoardGpioInitTable[] = {                                           //
-    Board_RLED | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX, /* LED initially off             */
-    Board_GLED | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX, /* LED initially off             */
-    Board_UART_RX | PIN_INPUT_EN | PIN_PULLDOWN,                                    /* UART RX  */
-    Board_UART_TX | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,              /* UART TX */
-    Board_SRDY | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,                 /* SRDY */
-    Board_MRDY | PIN_INPUT_EN | PIN_PULLDOWN,                                       /* MRDY */
-    PIN_TERMINATE};
+static PIN_State mem_pins_state;
+static PIN_Handle mem_pins_handle;
+
+const PIN_Config MemGpioInitTable[] = {  //
+
+    // memory select
+    PIN_MEM_SEL | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+
+    // master side is reading buffer.
+    PIN_MEM_BZY | PIN_INPUT_EN | PIN_PULLUP | PIN_HYSTERESIS,
+
+    // master side request to switch buffer
+    PIN_MEM_REQ | PIN_INPUT_EN | PIN_PULLUP | PIN_HYSTERESIS,
+
+    // instruction interrupt
+    PIN_MEM_INS | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
+
+    PIN_TERMINATE
+};
+
+#define mem_pin_open()                                                              \
+    do {                                                                            \
+        mem_pins_handle = PIN_open(&mem_pins_state, MemGpioInitTable);            \
+        PIN_registerIntCb(mem_pins_handle, Board_keyCallback);                      \
+    } while (0)
+
+#define SetMemOutputPIN(PIN, value) PIN_setOutputValue(mem_pins_handle, PIN, value)
+
+
+
+// Debounce timeout in milliseconds
+#define KEY_DEBOUNCE_TIMEOUT  200
+#define KEY_SELECT            0x0001
+#define KEY_UP                0x0002
+#define KEY_DOWN              0x0004
+#define KEY_LEFT              0x0008
+#define KEY_RIGHT             0x0010
+#define KEY_UART_EN           0x0020
+
+// Value of keys Pressed
+static uint8_t keysPressed;
+
+// Key debounce clock
+static Clock_Struct keyChangeClock;
+
+// Pointer to application callback
+keysPressedCB_t appKeyChangeHandler = NULL;
+
+void Board_initKeys(keysPressedCB_t appKeyCB)
+{
+  // Initialize KEY pins. Enable int after callback registered
+//  hKeyPins = PIN_open(&keyPins, keyPinsCfg);
+//  PIN_registerIntCb(hKeyPins, Board_keyCallback);
+    mem_pin_open();
+    PIN_setConfig(mem_pins_handle, PIN_BM_IRQ, PIN_MEM_INS | PIN_IRQ_NEGEDGE);
+    PIN_setConfig(mem_pins_handle, PIN_BM_IRQ, PIN_MEM_REQ | PIN_IRQ_NEGEDGE);
+
+  // Setup keycallback for keys
+  Util_constructClock(&keyChangeClock, Board_keyChangeHandler,
+                      KEY_DEBOUNCE_TIMEOUT, 0, false, 0);
+
+  // Set the application callback
+  appKeyChangeHandler = appKeyCB;
+}
+
+static void Board_keyCallback(PIN_Handle hPin, PIN_Id pinId)
+{
+  keysPressed = 0;
+
+#if defined (BOOSTXL_CC2650MA)
+    if ( PIN_getInputValue(PIN_MEM_INS) == 0 )
+    {
+      keysPressed |= KEY_UART_EN;
+    }
+#endif
+
+  Util_startClock(&keyChangeClock);
+}
+
+static void Board_keyChangeHandler(UArg a0)
+{
+  if (appKeyChangeHandler != NULL)
+  {
+    // Notify the application
+    (*appKeyChangeHandler)(keysPressed);
+  }
+}
 
 const PINCC26XX_HWAttrs PINCC26XX_hwAttrs = {
     //
@@ -233,7 +329,7 @@ const SPICC26XXDMA_HWAttrsV1 spiCC26XXDMAHWAttrs[BOOSTXL_CC2650MA_SPICOUNT] = {
         .mosiPin           = Board_SPI0_MOSI,
         .misoPin           = Board_SPI0_MISO,
         .clkPin            = Board_SPI0_CLK,
-        .csnPin            = Board_SPI0_CSN
+        .csnPin            = Board_SPI0_CS
         //
     },
 #ifdef HEADSTAGE_MA_USE_SPI2

simplelink/ble_sdk_2_02_02_25/src/boards/BOOSTXL_CC2650MA/BOOSTXL_CC2650MA.h

@@ -51,12 +51,7 @@ extern "C" {
 #include <ti/drivers/PIN.h>
 #include <driverlib/ioc.h>
 
-#define HEADSTAGE_UNI_2_0
-#ifdef  HEADSTAGE_UNI_2_0
-#include "neu/headstage_pin.h"
-#else
-#include "uni/headstage_pin.h"
-#endif
+
 /** ============================================================================
  *  Externs
  *  ==========================================================================*/
@@ -91,6 +86,7 @@ extern const PIN_Config BoardGpioInitTable[];
  *      <board signal alias>        <pin mapping>
  */
 
+
 /* Mapping of DIOs to BoosterPack Connector Pins (reflecting the schematic of tbe BoosterPack)
 */
 
@@ -150,36 +146,49 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_UART_TX                  Board_BP_UART_Rx          /* RXD */
 #define Board_UART_RX                  Board_BP_UART_Tx          /* TXD */
 
-///*
-// *  SPI0 interface with DBS chip 2.0
-// */
-//#define Board_SPI0_MISO                PIN_UNASSIGNED
-//#define Board_SPI0_MOSI                PIN_UNASSIGNED
-//#define Board_SPI0_CLK                 PIN_UNASSIGNED
-//#define Board_SPI0_CS                  PIN_UNASSIGNED
+#ifndef BOOSTXL_CC2650MA
+#error "BOOSTXL_CC2650MA not defined"
+#endif
+
+#define PIN_MEM_INS DIO4
+#define PIN_MEM_SEL DIO8
+#define PIN_MEM_BZY DIO13
+#define PIN_MEM_REQ DIO14
+
+//#define PIN_SPI_CS DIO9
+//#define PIN_SPI_CK DIO10
+//#define PIN_SPI_DO DIO11
+//#define PIN_SPI_DI DIO12
+
+/*
+ *  SPI0 interface with memory board RAM
+ */
+#define Board_SPI0_MISO                DIO12
+#define Board_SPI0_MOSI                DIO11
+#define Board_SPI0_CLK                 DIO10
+#define Board_SPI0_CS                  DIO9
+
+/*
+ *  SPI1 interface work with LED
+ */
+#define Board_SPI1_MISO                PIN_UNASSIGNED
+#define Board_SPI1_MOSI                PIN_UNASSIGNED
+#define Board_SPI1_CLK                 PIN_UNASSIGNED
+#define Board_SPI1_CS                  PIN_UNASSIGNED
+
+/* Power Management Board */
+#define Board_SRDY                     Board_BP_Pin_J2_19
+#define Board_MRDY                     Board_BP_Pin_J1_2
 //
-///*
-// *  SPI1 interface work with LED
-// */
-//
-//#define Board_SPI1_MISO                PIN_UNASSIGNED
-//#define Board_SPI1_MOSI                PIN_UNASSIGNED
-//#define Board_SPI1_CLK                 PIN_UNASSIGNED
-//#define Board_SPI1_CS                  PIN_UNASSIGNED
-//
-///* Power Management Board */
-//#define Board_SRDY                     Board_BP_Pin_J2_19
-//#define Board_MRDY                     Board_BP_Pin_J1_2
-//
-///* PWM outputs */
-//#define Board_PWMPIN0                  PIN_UNASSIGNED
-//#define Board_PWMPIN1                  PIN_UNASSIGNED
-//#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
+/* PWM outputs */
+#define Board_PWMPIN0                  PIN_UNASSIGNED
+#define Board_PWMPIN1                  PIN_UNASSIGNED
+#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
 
 
 /** ============================================================================

simplelink/ble_sdk_2_02_02_25/src/common/cc26xx/board_key.c

@@ -62,8 +62,8 @@
 #include <inc/hw_ints.h>
 
 #include "util.h"
-#include "board_key.h"
 #include "board.h"
+#include "board_key.h"
 
 /*********************************************************************
  * TYPEDEFS
@@ -96,24 +96,52 @@ keysPressedCB_t appKeyChangeHandler = NULL;
 Hwi_Struct callbackHwiKeys;
 
 // PIN configuration structure to set all KEY pins as inputs with pullups enabled
-PIN_Config keyPinsCfg[] =
-{
-#if defined (CC2650_LAUNCHXL) || defined (CC1350_LAUNCHXL)
-    Board_BTN1          | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
-    Board_BTN2          | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
-    Board_UART_RX_IRQ   | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLDOWN,
-#elif defined (CC2650DK_7ID)  || defined (CC1350DK_7XD)
-    Board_KEY_SELECT    | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
-    Board_KEY_UP        | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
-    Board_KEY_DOWN      | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
-    Board_KEY_LEFT      | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
-    Board_KEY_RIGHT     | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
-#endif
-    PIN_TERMINATE
-};
+//PIN_Config keyPinsCfg[] =
+//{
+//#if defined (CC2650_LAUNCHXL) || defined (CC1350_LAUNCHXL)
+//    Board_BTN1          | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
+//    Board_BTN2          | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
+//    Board_UART_RX_IRQ   | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLDOWN,
+//#elif defined (CC2650DK_7ID)  || defined (CC1350DK_7XD)
+//    Board_KEY_SELECT    | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
+//    Board_KEY_UP        | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
+//    Board_KEY_DOWN      | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
+//    Board_KEY_LEFT      | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
+//    Board_KEY_RIGHT     | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
+//#endif
+//    PIN_TERMINATE
+//};
+//
+//PIN_State  keyPins;
+//PIN_Handle hKeyPins;
 
-PIN_State  keyPins;
-PIN_Handle hKeyPins;
+//static PIN_State mem_pins_state;
+//static PIN_Handle mem_pins_handle;
+//
+//const PIN_Config BoardGpioInitTable[] = {  //
+//
+//    // memory select
+//    PIN_MEM_SEL | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//
+//    // master side is reading buffer.
+//    PIN_MEM_BZY | PIN_INPUT_EN | PIN_PULLUP | PIN_HYSTERESIS,
+//
+//    // master side request to switch buffer
+//    PIN_MEM_REQ | PIN_INPUT_EN | PIN_PULLUP | PIN_HYSTERESIS,
+//
+//    // instruction interrupt
+//    PIN_MEM_INS | PIN_GPIO_OUTPUT_DIS  | PIN_INPUT_EN  |  PIN_PULLUP,
+//
+//    PIN_TERMINATE
+//};
+//
+//#define mem_pin_open()                                                              \
+//    do {                                                                            \
+//        mem_pins_handle = PIN_open(&mem_pins_state, BoardGpioInitTable);            \
+//        PIN_registerIntCb(mem_pins_handle, Board_keyCallback);                      \
+//    } while (0)
+//
+//#define SetMemOutputPIN(PIN, value) PIN_setOutputValue(mem_pins_handle, PIN, value)
 
 /*********************************************************************
  * PUBLIC FUNCTIONS
@@ -130,8 +158,11 @@ PIN_Handle hKeyPins;
 void Board_initKeys(keysPressedCB_t appKeyCB)
 {
   // Initialize KEY pins. Enable int after callback registered
-  hKeyPins = PIN_open(&keyPins, keyPinsCfg);
-  PIN_registerIntCb(hKeyPins, Board_keyCallback);
+//  hKeyPins = PIN_open(&keyPins, keyPinsCfg);
+//  PIN_registerIntCb(hKeyPins, Board_keyCallback);
+    mem_pin_open();
+    PIN_setConfig(mem_pins_handle, PIN_BM_IRQ, PIN_MEM_INS | PIN_IRQ_NEGEDGE);
+    PIN_setConfig(mem_pins_handle, PIN_BM_IRQ, PIN_MEM_REQ | PIN_IRQ_NEGEDGE);
 
 #if defined (CC2650_LAUNCHXL) || defined (CC1350_LAUNCHXL)
   PIN_setConfig(hKeyPins, PIN_BM_IRQ, Board_BTN1        | PIN_IRQ_NEGEDGE);
@@ -180,47 +211,11 @@ static void Board_keyCallback(PIN_Handle hPin, PIN_Id pinId)
 {
   keysPressed = 0;
 
-#if defined (CC2650_LAUNCHXL) || defined (CC1350_LAUNCHXL)
-  if ( PIN_getInputValue(Board_BTN1) == 0 )
-  {
-    keysPressed |= KEY_LEFT;
-  }
-
-  if ( PIN_getInputValue(Board_BTN2) == 0 )
-  {
-    keysPressed |= KEY_RIGHT;
-  }
-
-  if ( PIN_getInputValue(Board_UART_RX_IRQ) == 1 )
-  {
-    keysPressed |= KEY_UART_EN;
-  }
-
-#elif defined (CC2650DK_7ID)  || defined (CC1350DK_7XD)
-  if ( PIN_getInputValue(Board_KEY_SELECT) == 0 )
-  {
-    keysPressed |= KEY_SELECT;
-  }
-
-  if ( PIN_getInputValue(Board_KEY_UP) == 0 )
-  {
-    keysPressed |= KEY_UP;
-  }
-
-  if ( PIN_getInputValue(Board_KEY_DOWN) == 0 )
-  {
-    keysPressed |= KEY_DOWN;
-  }
-
-  if ( PIN_getInputValue(Board_KEY_LEFT) == 0 )
-  {
-    keysPressed |= KEY_LEFT;
-  }
-
-  if ( PIN_getInputValue(Board_KEY_RIGHT) == 0 )
-  {
-    keysPressed |= KEY_RIGHT;
-  }
+#if defined (BOOSTXL_CC2650MA)
+    if ( PIN_getInputValue(PIN_MEM_INS) == 0 )
+    {
+      keysPressed |= KEY_UART_EN;
+    }
 #endif
 
   Util_startClock(&keyChangeClock);

simplelink/ble_sdk_2_02_02_25/src/examples/simple_central/cc26xx/app/mem_board_central.h

@@ -9,7 +9,6 @@
 #ifndef MEM_BOARD_CENTRAL
 #define MEM_BOARD_CENTRAL
 
-#include "mem_central_pin.h"
 #include "mem_uart.h"
 #include "mem_event.h"
 
@@ -72,13 +71,13 @@ static void mem_central_event() {
     if (flag_mask(EVT_MEM_LED)) {
         flag_disable(EVT_MEM_LED);
         GLEDStatus = LED_ON;
-        SetMemOutputPIN(Board_GLED, 1);
+//        SetMemOutputPIN(Board_GLED, 1);
     }
 
     if(flag_mask(EVT_MEM_LED_OFF)){
         flag_disable(EVT_MEM_LED_OFF);
         GLEDStatus = LED_OFF;
-        SetMemOutputPIN(Board_GLED, 0);
+//        SetMemOutputPIN(Board_GLED, 0);
     }
 
     if(flag_mask(EVT_MEM_UART)){

simplelink/ble_sdk_2_02_02_25/src/examples/simple_central/cc26xx/app/mem_central_pin.h

@@ -1,21 +0,0 @@
-
-#ifndef MEM_CENTRAL_PIN
-#define MEM_CENTRAL_PIN
-
-static PIN_State mem_pins_state;
-static PIN_Handle mem_pins_handle;
-
-static PIN_Config mem_pin_configuration[] = {  //
-    Board_GLED | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    Board_RLED | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_TERMINATE
-};
-
-#define mem_pin_open()                                                      \
-    do {                                                                    \
-        mem_pins_handle = PIN_open(&mem_pins_state, mem_pin_configuration); \
-    } while (0)
-
-#define SetMemOutputPIN(PIN, value) PIN_setOutputValue(mem_pins_handle, PIN, value)
-
-#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_central/cc26xx/app/mem_ma_pin.h

@@ -0,0 +1,26 @@
+#ifndef MEM_PIN_MA_H
+#define MEM_PIN_MA_H
+
+#ifndef BOOSTXL_CC2650MA
+#error "BOOSTXL_CC2650MA not defined"
+#endif
+
+#define PIN_MEM_INS DIO4
+#define PIN_MEM_SEL DIO8
+#define PIN_MEM_BZY DIO13
+#define PIN_MEM_REQ DIO14
+
+#define PIN_SPI_CS DIO9
+#define PIN_SPI_CK DIO10
+#define PIN_SPI_DO DIO11
+#define PIN_SPI_DI DIO12
+
+#define PIN_LED_RED IOID_UNUSED
+#define PIN_LED_GRN IOID_UNUSED
+
+#define PIN_DEBUG_1 IOID_UNUSED
+#define PIN_DEBUG_2 IOID_UNUSED
+#define PIN_DEBUG_3 IOID_UNUSED
+#define PIN_DEBUG_4 IOID_UNUSED
+
+#endif MEM_PIN_MA_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_central/cc26xx/app/simple_central.c

@@ -70,8 +70,8 @@
 #include "icall_apimsg.h"
 
 #include "util.h"
-#include "board_key.h"
-#include <ti/mw/display/Display.h>
+//#include "board_key.h"
+//#include <ti/mw/display/Display.h>
 #include "board.h"
 
 #include "simple_central.h"
@@ -79,6 +79,7 @@
 #include "ble_user_config.h"
 
 
+
 /*********************************************************************
  * MACROS
  */
@@ -401,6 +402,9 @@ void SimpleBLECentral_readRssiHandler(UArg a0);
 static uint8_t SimpleBLECentral_enqueueMsg(uint8_t event, uint8_t status,
                                            uint8_t *pData);
 
+#include "mem_board_central.h"
+#include "mem_central_handle_notify.h"
+
 /*********************************************************************
  * PROFILE CALLBACKS
  */
@@ -557,8 +561,7 @@ static void SimpleBLECentral_init(void)
 //  Display_print0(dispHandle, ROW_ZERO, 0, "BLE Central");
 }
 
-#include "mem_board_central.h"
-#include "mem_central_handle_notify.h"
+
 /*********************************************************************
  * @fn      SimpleBLECentral_taskFxn
  *

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_version.h

@@ -3,14 +3,14 @@
 #define VERSION_DATE
 
 #define VERSION_DATE_YEAR      20
-#define VERSION_DATE_MONTH     5
-#define VERSION_DATE_DAY       20
-#define VERSION_DATE_HOUR      17
-#define VERSION_DATE_MINUTE    24
+#define VERSION_DATE_MONTH     6
+#define VERSION_DATE_DAY       3
+#define VERSION_DATE_HOUR      16
+#define VERSION_DATE_MINUTE    3
 
 // this is NOT the version hash !!
 // it's the last version hash
-#define VERSION_HASH           eee40006d0e7f9e3ea85bd455f212034f932591d
+#define VERSION_HASH           da154855d5ad340ef581f4de1adce7997b2ef3c7
 #define VERSION_GIT_BRANCH     MemBoard_simple_central
 
 #endif