Fill keyworkds.txt, remove unnecessary defines

Author: P-R-O-C-H-Y

libraries/Zigbee/keywords.txt

@@ -2,26 +2,59 @@
 # Syntax Coloring Map For Zigbee
 #######################################
 
-#######################################
-# Library (KEYWORD3)
-#######################################
-
-#TODO:	
-
 #######################################
 # Datatypes (KEYWORD1)
 #######################################
 
-#TODO:
+ZigbeeCore	KEYWORD1
+Zigbee	KEYWORD1
+ZigbeeEP	KEYWORD1
+ZigbeeLight	KEYWORD1
+ZigbeeSwitch	KEYWORD1
+ZigbeeColorDimmableLight	KEYWORD1
+ZigbeeColorDimmerSwitch	KEYWORD1
+ZigbeeTempSensor	KEYWORD1
+ZigbeeThermostat	KEYWORD1
+zigbee_role_t	KEYWORD1
+zbstring_t	KEYWORD1
+zb_device_params_t	KEYWORD1
+zigbee_scan_result_t	KEYWORD1
 
 #######################################
 # Methods and Functions (KEYWORD2)
 #######################################
 
-#TODO:
+isStarted	KEYWORD2
+addEndpoint	KEYWORD2
+setRadioConfig	KEYWORD2
+setHostConfig	KEYWORD2
+getRadioConfig	KEYWORD2
+getHostConfig	KEYWORD2
+setPrimaryChannelMask	KEYWORD2
+setRebootOpenNetwork	KEYWORD2
+scanNetworks	KEYWORD2
+scanComplete	KEYWORD2
+getScanResult	KEYWORD2
+scanDelete	KEYWORD2
+factoryReset	KEYWORD2
+setVersion	KEYWORD2
+setManufacturerAndModel	KEYWORD2
+is_bound	KEYWORD2
+printBoundDevices	KEYWORD2
+allowMultipleBinding	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)
 #######################################
 
-#TODO:
+ZIGBEE_COORDINATOR	LITERAL1
+ZIGBEE_ROUTER	LITERAL1
+ZIGBEE_END_DEVICE	LITERAL1
+ZIGBEE_DEFAULT_ED_CONFIG	LITERAL1
+ZIGBEE_DEFAULT_ROUTER_CONFIG	LITERAL1
+ZIGBEE_DEFAULT_COORDINATOR_CONFIG	LITERAL1
+ZIGBEE_DEFAULT_RADIO_CONFIG	LITERAL1
+ZIGBEE_DEFAULT_HOST_CONFIG	LITERAL1
+ZB_ARRAY_LENTH	LITERAL1
+XYZ_TO_RGB	LITERAL1
+RGB_TO_XYZ	LITERAL1

libraries/Zigbee/src/ZigbeeCore.h

@@ -15,12 +15,6 @@ class ZigbeeEP;
 typedef void (*voidFuncPtr)(void);
 typedef void (*voidFuncPtrArg)(void *);
 
-// structure to store callback function and argument
-typedef struct {
-  voidFuncPtr fn;
-  void *arg;
-} zigbee_cb_t;
-
 typedef esp_zb_network_descriptor_t zigbee_scan_result_t;
 
 // enum of Zigbee Roles
@@ -30,36 +24,30 @@ typedef enum {
     ZIGBEE_END_DEVICE = 2
 } zigbee_role_t;
 
-// default Zigbee configuration for each role
-#define INSTALLCODE_POLICY_ENABLE false /* enable the install code policy for security */
-#define ED_AGING_TIMEOUT ESP_ZB_ED_AGING_TIMEOUT_64MIN
-#define ED_KEEP_ALIVE 3000 /* 3000 millisecond */
-#define MAX_CHILDREN 10
-
 #define ZB_SCAN_RUNNING (-1)
 #define ZB_SCAN_FAILED  (-2)
 
 #define ZIGBEE_DEFAULT_ED_CONFIG()                         \
   {                                                        \
     .esp_zb_role = ESP_ZB_DEVICE_TYPE_ED,                  \
-    .install_code_policy = INSTALLCODE_POLICY_ENABLE,      \
+    .install_code_policy = false,                          \
     .nwk_cfg = {                                           \
       .zed_cfg =                                           \
         {                                                  \
-          .ed_timeout = ED_AGING_TIMEOUT,                  \
-          .keep_alive = ED_KEEP_ALIVE,                     \
+          .ed_timeout = ESP_ZB_ED_AGING_TIMEOUT_64MIN,     \
+          .keep_alive = 3000,                              \
         },                                                 \
     },                                                     \
   }
 
 #define ZIGBEE_DEFAULT_ROUTER_CONFIG()                     \
   {                                                        \
     .esp_zb_role = ESP_ZB_DEVICE_TYPE_ROUTER,              \
-    .install_code_policy = INSTALLCODE_POLICY_ENABLE,      \
+    .install_code_policy = false,                          \
     .nwk_cfg = {                                           \
       .zczr_cfg =                                          \
         {                                                  \
-          .max_children = MAX_CHILDREN,                    \
+          .max_children = 10,                              \
         },                                                 \
     }                                                      \
   }
@@ -68,11 +56,11 @@ typedef enum {
 #define ZIGBEE_DEFAULT_COORDINATOR_CONFIG()                \
   {                                                        \
     .esp_zb_role = ESP_ZB_DEVICE_TYPE_COORDINATOR,         \
-    .install_code_policy = INSTALLCODE_POLICY_ENABLE,      \
+    .install_code_policy = false,                          \
     .nwk_cfg = {                                           \
       .zczr_cfg =                                          \
         {                                                  \
-          .max_children = MAX_CHILDREN,                    \
+          .max_children = 10,                              \
         },                                                 \
     }                                                      \
   }
@@ -91,7 +79,6 @@ class ZigbeeCore {
         uint32_t _primary_channel_mask;
         int16_t _scan_status;
 
-
         bool zigbeeInit(esp_zb_cfg_t *zb_cfg, bool erase_nvs);
         static void scanCompleteCallback(esp_zb_zdp_status_t zdo_status, uint8_t count, esp_zb_network_descriptor_t *nwk_descriptor);
 

libraries/Zigbee/src/ZigbeeEP.h

@@ -10,7 +10,7 @@
 /* Usefull defines */
 #define ZB_ARRAY_LENTH(arr) (sizeof(arr)/ sizeof(arr[0]))
 #define print_ieee_addr(addr) log_i("IEEE Address: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], addr[6], addr[7])
-#define XYZ_to_RGB(X, Y, Z, r, g, b)                        \
+#define XYZ_TO_RGB(X, Y, Z, r, g, b)                        \
 {                                                           \
   r = (float)( 3.240479*(X) -1.537150*(Y) -0.498535*(Z));   \
   g = (float)(-0.969256*(X) +1.875992*(Y) +0.041556*(Z));   \
@@ -20,7 +20,7 @@
   if(b > 1){b = 1;}                                             \
 }
 
-#define RGB_to_XYZ(r, g, b, X, Y, Z)                          \
+#define RGB_TO_XYZ(r, g, b, X, Y, Z)                          \
 {                                                             \
     X = (float)(0.412453*(r) + 0.357580*(g) + 0.180423*(b));  \
     Y = (float)(0.212671*(r) + 0.715160*(g) + 0.072169*(b));  \
@@ -67,6 +67,7 @@ class ZigbeeEP {
 
     static bool is_bound() { return _is_bound; }
     void printBoundDevices();
+    //TODO: getBoundDevices() method to recieve list of bound devices
 
     static bool _allow_multiple_binding;
     static void allowMultipleBinding(bool bind) { _allow_multiple_binding = bind; }

libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.cpp

@@ -34,7 +34,7 @@ void ZigbeeColorDimmableLight::calculateRGB( uint16_t x, uint16_t y, uint8_t &re
     float color_X = color_x / color_y;
     float color_Z = (1 - color_x - color_y) / color_y;
 
-    XYZ_to_RGB(color_X, 1, color_Z, r, g, b);
+    XYZ_TO_RGB(color_X, 1, color_Z, r, g, b);
 
     red = (uint8_t)(r * (float)255);
     green = (uint8_t)(g * (float)255);

libraries/Zigbee/src/ep/ZigbeeColorDimmerSwitch.cpp

@@ -26,7 +26,7 @@ void ZigbeeColorDimmerSwitch::calculateXY(uint8_t red, uint8_t green, uint8_t bl
     float b = (float)blue / 255.0f;
 
     float X, Y, Z;
-    RGB_to_XYZ(r, g, b, X, Y, Z);
+    RGB_TO_XYZ(r, g, b, X, Y, Z);
 
     // Convert XYZ to xy chromaticity coordinates
     float color_x = X / (X + Y + Z);