populate dateCode

Author: devbis

src/device.c

@@ -283,6 +283,42 @@ char int_to_hex(u8 num){
 	return digits[num];
 }
 
+void populate_sw_build() {
+	g_zcl_basicAttrs.swBuildId[1] = int_to_hex(STACK_RELEASE>>4);
+	g_zcl_basicAttrs.swBuildId[2] = int_to_hex(STACK_RELEASE & 0xf);
+	g_zcl_basicAttrs.swBuildId[3] = int_to_hex(STACK_BUILD>>4);
+	g_zcl_basicAttrs.swBuildId[4] = int_to_hex(STACK_BUILD & 0xf);
+	g_zcl_basicAttrs.swBuildId[6] = int_to_hex(APP_RELEASE>>4);
+	g_zcl_basicAttrs.swBuildId[7] = int_to_hex(APP_RELEASE & 0xf);
+	g_zcl_basicAttrs.swBuildId[8] = int_to_hex(APP_BUILD>>4);
+	g_zcl_basicAttrs.swBuildId[9] = int_to_hex(APP_BUILD & 0xf);
+}
+
+void populate_date_code() {
+	u8 month;
+	if (__DATE__[0] == 'J' && __DATE__[1] == 'a' && __DATE__[2] == 'n') month = 1;
+	else if (__DATE__[0] == 'F') month = 2;
+	else if (__DATE__[0] == 'M' && __DATE__[1] == 'a' && __DATE__[2] == 'r') month = 3;
+	else if (__DATE__[0] == 'A' && __DATE__[1] == 'p') month = 4;
+	else if (__DATE__[0] == 'M' && __DATE__[1] == 'a' && __DATE__[2] == 'y') month = 5;
+	else if (__DATE__[0] == 'J' && __DATE__[1] == 'u' && __DATE__[2] == 'n') month = 6;
+	else if (__DATE__[0] == 'J' && __DATE__[1] == 'u' && __DATE__[2] == 'l') month = 7;
+	else if (__DATE__[0] == 'A' && __DATE__[1] == 'u') month = 8;
+	else if (__DATE__[0] == 'S') month = 9;
+	else if (__DATE__[0] == 'O') month = 10;
+	else if (__DATE__[0] == 'N') month = 11;
+	else if (__DATE__[0] == 'D') month = 12;
+
+	g_zcl_basicAttrs.dateCode[1] = __DATE__[7];
+	g_zcl_basicAttrs.dateCode[2] = __DATE__[8];
+	g_zcl_basicAttrs.dateCode[3] = __DATE__[9];
+	g_zcl_basicAttrs.dateCode[4] = __DATE__[10];
+	g_zcl_basicAttrs.dateCode[5] = '0' + month / 10;
+	g_zcl_basicAttrs.dateCode[6] = '0' + month % 10;
+	g_zcl_basicAttrs.dateCode[7] = __DATE__[4] >= '0' ? (__DATE__[4]) : '0';
+	g_zcl_basicAttrs.dateCode[8] = __DATE__[5];
+}
+
 
 /*********************************************************************
  * @fn      user_init
@@ -314,15 +350,9 @@ void user_init(bool isRetention)
     ind_init();
 
 	if(!isRetention){
-	    /* Populate swBuildId version */
-		g_zcl_basicAttrs.swBuildId[1] = int_to_hex(STACK_RELEASE>>4);
-		g_zcl_basicAttrs.swBuildId[2] = int_to_hex(STACK_RELEASE & 0xf);
-		g_zcl_basicAttrs.swBuildId[3] = int_to_hex(STACK_BUILD>>4);
-		g_zcl_basicAttrs.swBuildId[4] = int_to_hex(STACK_BUILD & 0xf);
-		g_zcl_basicAttrs.swBuildId[6] = int_to_hex(APP_RELEASE>>4);
-		g_zcl_basicAttrs.swBuildId[7] = int_to_hex(APP_RELEASE & 0xf);
-		g_zcl_basicAttrs.swBuildId[8] = int_to_hex(APP_BUILD>>4);
-		g_zcl_basicAttrs.swBuildId[9] = int_to_hex(APP_BUILD & 0xf);
+	    /* Populate properties with compiled-in values */
+		populate_sw_build();
+		populate_date_code();
 
 		/* Initialize Stack */
 		stack_init();

src/device.h

@@ -46,6 +46,7 @@ typedef struct{
 	u8	manuName[ZCL_BASIC_MAX_LENGTH];
 	u8	modelId[ZCL_BASIC_MAX_LENGTH];
 	u8	swBuildId[ZCL_BASIC_MAX_LENGTH];
+ 	u8  dateCode[ZCL_BASIC_MAX_LENGTH];
 	u8	powerSource;
 	u8	deviceEnable;
 }zcl_basicAttr_t;

src/sensorEpCfg.c

@@ -33,6 +33,10 @@
 #define ZCL_BASIC_SW_BUILD_ID     	{9,'0','0','0','0','-','0','0','0','0'}
 #endif
 
+#ifndef ZCL_BASIC_DATE_CODE
+#define ZCL_BASIC_DATE_CODE     	{8,'0','0','0','0','0','0','0','0'}
+#endif
+
 
 /**********************************************************************
  * TYPEDEFS
@@ -107,6 +111,9 @@ zcl_basicAttr_t g_zcl_basicAttrs =
 	.modelId		= ZCL_BASIC_MODEL_ID,
 #ifdef ZCL_BASIC_SW_BUILD_ID
 	.swBuildId		= ZCL_BASIC_SW_BUILD_ID,
+#endif
+#ifdef ZCL_BASIC_DATE_CODE
+	.dateCode 		= ZCL_BASIC_DATE_CODE,
 #endif
 	.powerSource	= POWER_SOURCE_BATTERY,
 	.deviceEnable	= TRUE,
@@ -123,6 +130,7 @@ const zclAttrInfo_t basic_attrTbl[] =
 	{ ZCL_ATTRID_BASIC_POWER_SOURCE, 		ZCL_DATA_TYPE_ENUM8,    ACCESS_CONTROL_READ,  						(u8*)&g_zcl_basicAttrs.powerSource},
 	{ ZCL_ATTRID_BASIC_DEV_ENABLED,  		ZCL_DATA_TYPE_BOOLEAN,  ACCESS_CONTROL_READ | ACCESS_CONTROL_WRITE, (u8*)&g_zcl_basicAttrs.deviceEnable},
 	{ ZCL_ATTRID_BASIC_SW_BUILD_ID,  		ZCL_DATA_TYPE_CHAR_STR, ACCESS_CONTROL_READ,  						(u8*)&g_zcl_basicAttrs.swBuildId},
+	{ ZCL_ATTRID_BASIC_DATE_CODE,           ZCL_DATA_TYPE_CHAR_STR, ACCESS_CONTROL_READ,                        (u8*)g_zcl_basicAttrs.dateCode},
 
 	{ ZCL_ATTRID_GLOBAL_CLUSTER_REVISION, 	ZCL_DATA_TYPE_UINT16,  	ACCESS_CONTROL_READ,  						(u8*)&zcl_attr_global_clusterRevision},
 };