Merge pull request #7 from dzungpv/master

Working CC2530 firmware

coordinator/CC2530/README.md

@@ -1,17 +1,67 @@
 # CC2530 coordinator firmware
 1. Open `Z-Stack Home 1.2.2a.44539\Projects\zstack\ZNP\CC253x\znp.eww` with IAR Embedded workbench for 8051.
 2. You will get a warning: *The project file 'CC253(0/1).ewp' is in an old format. Would you like to convert it for use with this version?*. Press **yes** for both.
-3. In the dropdown, set target to *CC2530 - ProdHex*.
+3. In the dropdown, set target to *CC2530 - ProdHex*. Edit following:
+OnBoard.c find:
+```
+ #elif defined CC2530_MK
+   znpCfg1 = ZNP_CFG1_SPI;
+```
+Replace ZNP_CFG1_SPI with ZNP_CFG1_UART.
+znp_app.c find:
+```
+if (ZNP_CFG1_UART == znpCfg1)
+```
+And replace by:
+```
+uartConfig.baudRate = HAL_UART_BR_115200;
+uartConfig.flowControl = FALSE;//Old value true
+```   
+Edit file Components\mt\MT_SYS.c replace powerOffSoc(void) with:
+```
+  HAL_DISABLE_INTERRUPTS();
+  STIF = 0; //HAL_SLEEP_TIMER_CLEAR_INT;
+  if (ZNP_CFG1_UART == znpCfg1)
+  {
+    HalUARTSuspend();
+  }
+
+  /* Prep CC2530 power mode */
+  //HAL_SLEEP_PREP_POWER_MODE(3);
+  SLEEPCMD &= ~PMODE; /* clear mode bits */
+  SLEEPCMD |= 3;      /* set mode bits  to PM3 */
+  while (!(STLOAD & LDRDY));
+  SystemReset();
+```
 4. Right-click on *CC2530 - ProdHex** and press options. Go to C/C++ compiler -> preprocessor. Change the *Defined symbols* to:
 ```
+FEATURE_SYSTEM_STATS
 ASSERT_RESET
+xPOWER_SAVING
 FAKE_CRC_SHDW
 TC_LINKKEY_JOIN
+ENABLE_MT_SYS_RESET_SHUTDOWN
 SECURE=1
 INTER_PAN
+ZTOOL_P1
+CC2530_MK
+HAL_LCD=FALSE
+HAL_ADC=FALSE
+HAL_UART_DMA_RX_MAX=128
+NWK_MAX_DEVICE_LIST=15
+MAX_NEIGHBOR_ENTRIES=10
+MAXMEMHEAP=3120
+INCLUDE_REVISION_INFORMATION
 ```
-6. Press OK.
-7. Right-click on *CC2530 - ProdHex** and click *Rebuild all*.
-![Target](images/cc2530build.png)
-8. Once finished, you can find the `CC2530ZNP-Prod.hex` file in `Z-Stack Home 1.2.2a.44539\Projects\zstack\ZNP\CC253x\dev`.
+5. Press OK.
+6. Create `Z-Stack Home 1.2.2a.44539\Components\mt\revision_info.h` with contents `#define CODE_REVISION_NUMBER 20180507`.
+7. In `NWK\nwk_globals.c` change the following constants.
+```c
+#define NWK_MAX_DATABUFS_WAITING    32    // Waiting to be sent to MAC
+#define NWK_MAX_DATABUFS_SCHEDULED  20    // Timed messages to be sent
+#define NWK_MAX_DATABUFS_CONFIRMED  20    // Held after MAC confirms
+#define NWK_MAX_DATABUFS_TOTAL      48    // Total number of buffers
+```
+8. Right-click on *CC2530 - ProdHex** and click *Rebuild all*.
+9. Once finished, you can find the `CC2530ZNP-Prod.hex` file in `Z-Stack Home 1.2.2a.44539\Projects\zstack\ZNP\CC253x\dev`.
 

coordinator/CC2530_CC2591/README.md

@@ -1,19 +1,80 @@
-# CC2530 + CC2591|RFX2401 coordinator firmware
+# CC2530 + CC2591 coordinator firmware
 1. Open `Z-Stack Home 1.2.2a.44539\Projects\zstack\ZNP\CC253x\znp.eww` with IAR Embedded workbench for 8051.
 2. You will get a warning: *The project file 'CC253(0/1).ewp' is in an old format. Would you like to convert it for use with this version?*. Press **yes** for both.
-3. In the dropdown, set target to *CC2530 - ProdHex*.
+3. In the dropdown, set target to *CC2530 - ProdHex*. Edit following:
+OnBoard.c find:
+```
+ #elif defined CC2530_MK
+   znpCfg1 = ZNP_CFG1_SPI;
+```
+Replace CC2530_MK with CC2530ZNP and ZNP_CFG1_SPI with ZNP_CFG1_UART.
+znp_app.c find:
+```
+if (ZNP_CFG1_UART == znpCfg1)
+```
+And replace by:
+```
+uartConfig.baudRate = HAL_UART_BR_115200;
+uartConfig.flowControl = FALSE;//Old value TRUE
+```   
+Edit file Components\mt\MT_SYS.c replace powerOffSoc(void) with:
+```
+  HAL_DISABLE_INTERRUPTS();
+  STIF = 0; //HAL_SLEEP_TIMER_CLEAR_INT;
+  if (ZNP_CFG1_UART == znpCfg1)
+  {
+    HalUARTSuspend();
+  }
+
+  /* Prep CC2530 power mode */
+  //HAL_SLEEP_PREP_POWER_MODE(3);
+  SLEEPCMD &= ~PMODE; /* clear mode bits */
+  SLEEPCMD |= 3;      /* set mode bits  to PM3 */
+  while (!(STLOAD & LDRDY));
+  SystemReset();
+```
+
+Edit znp_app.c add below MT_UartRegisterTaskID(znpTaskId);:
+
+```
+    //Add TX Setting
+    #ifdef HAL_PA_LNA
+      ZMacSetTransmitPower(TX_PWR_PLUS_19);
+    #else
+      ZMacSetTransmitPower(TX_PWR_PLUS_4);
+    #endif
+```
 4. Right-click on *CC2530 - ProdHex** and press options. Go to C/C++ compiler -> preprocessor. Change the *Defined symbols* to:
 ```
+CC2530ZNP
+FEATURE_SYSTEM_STATS
 ASSERT_RESET
+xPOWER_SAVING
 FAKE_CRC_SHDW
 TC_LINKKEY_JOIN
+ENABLE_MT_SYS_RESET_SHUTDOWN
 SECURE=1
 INTER_PAN
+ZTOOL_P1
+HAL_LCD=FALSE
+HAL_ADC=FALSE
+HAL_UART_DMA_RX_MAX=128
+NWK_MAX_DEVICE_LIST=15
+MAX_NEIGHBOR_ENTRIES=10
+MAXMEMHEAP=3120
+INCLUDE_REVISION_INFORMATION
 HAL_PA_LNA
 ```
-6. Press OK.
-7. Right-click on *CC2530 - ProdHex** and click *Rebuild all*.
-![Target](images/cc2530build.png)
-8. Once finished, you can find the `CC2530ZNP-Prod.hex` file in `Z-Stack Home 1.2.2a.44539\Projects\zstack\ZNP\CC253x\dev`.
+5. Press OK.
+6. Create `Z-Stack Home 1.2.2a.44539\Components\mt\revision_info.h` with contents `#define CODE_REVISION_NUMBER 20180507`.
+7. In `NWK\nwk_globals.c` change the following constants.
+```c
+#define NWK_MAX_DATABUFS_WAITING    32    // Waiting to be sent to MAC
+#define NWK_MAX_DATABUFS_SCHEDULED  20    // Timed messages to be sent
+#define NWK_MAX_DATABUFS_CONFIRMED  20    // Held after MAC confirms
+#define NWK_MAX_DATABUFS_TOTAL      48    // Total number of buffers
+```
+8. Right-click on *CC2530 - ProdHex** and click *Rebuild all*.
+9. Once finished, you can find the `CC2530ZNP-Prod.hex` file in `Z-Stack Home 1.2.2a.44539\Projects\zstack\ZNP\CC253x\dev`.
 You can rename it to 'CC2530_CC2591ZNP-Prod.hex' to not confuse it with the file for the cc2530 without amplifiers.