Small fixes

diyruz · Sep 20, 2020 · 81c481d · 81c481d
1 parent b4082d0
commit 81c481d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -2,7 +2,7 @@
     "configurations": [{
         "name": "Mac",
         "forcedInclude": ["${workspaceRoot}/source/preinclude.h"],
-        "defines": ["HAL_BOARD_CHDTECH_DEV", "HAL_I2C=TRUE", "HAL_I2C_MASTER"],
+        "defines": ["HAL_BOARD_TARGET", "HAL_I2C=TRUE", "HAL_I2C_MASTER"],
         "includePath": [
             "${workspaceRoot}",
             "${workspaceRoot}/Source",

diff --git a/CC2530DB/GenericApp.ewp b/CC2530DB/GenericApp.ewp
@@ -469,6 +469,7 @@
                     <name>CCIncludePath2</name>
                     <state>$PROJ_DIR$</state>
                     <state>$PROJ_DIR$\..\Source</state>
+                    <state>$PROJ_DIR$\..\BME280_driver</state>
                     <state>$PROJ_DIR$\..\zstack-lib</state>
                     <state>$PROJ_DIR$\..\..\Source</state>
                     <state>$PROJ_DIR$\..\..\..\ZMain\TI2530DB</state>

diff --git a/Source/preinclude.h b/Source/preinclude.h
@@ -45,14 +45,12 @@
     #define SENSEAIR_UART_PORT 0x00
     #define HAL_UART_DMA 1
     #define HAL_UART_ISR 0
-    #define INT_HEAP_LEN (3000 - 0xA1)
-    // #define INT_HEAP_LEN (2885 - 0x39 - 0x1)
+    #define INT_HEAP_LEN 2585
     // #define POWER_SAVING
 #elif defined(HAL_BOARD_CHDTECH_DEV)
+    #define SENSEAIR_UART_PORT 0x01
     #define HAL_KEY_P0_INPUT_PINS BV(1)
-    #define APP_TX_POWER TX_PWR_PLUS_4
     #define DO_DEBUG_UART
-    #define HAL_UART_ISR 2
 #endif
 
 #define FACTORY_RESET_HOLD_TIME_LONG 5000

diff --git a/Source/zcl_app.c b/Source/zcl_app.c
@@ -121,12 +121,11 @@ void zclApp_Init(byte task_id) {
     zcl_registerForMsg(zclApp_TaskID);
     RegisterForKeys(zclApp_TaskID);
 
-    ZMacSetTransmitPower(APP_TX_POWER);
 
     LREP("Build %s \r\n", zclApp_DateCodeNT);
 
     HalI2CInit();
-    osal_start_reload_timer(zclApp_TaskID, APP_REPORT_EVT, APP_REPORT_DELAY); // APP_REPORT_DELAY);
+    osal_start_reload_timer(zclApp_TaskID, APP_REPORT_EVT, APP_REPORT_DELAY);
 
 }
 static void zclApp_HandleKeys(byte portAndAction, byte keyCode) {

diff --git a/zstack-lib b/zstack-lib