Merge branch 'yjq' into 'master'

Yjq

See merge request chenweican/k-sdk!11

midware/midware/dm/kk_property_db.c

@@ -141,7 +141,6 @@ int kk_property_db_insert(const char *deviceCode,const char *identifier,kk_tsl_d
 	char *zErrMsg = 0;
     kk_property_db_ctx_t *ctx = _kk_property_db_get_ctx();
 
-
 	if(_kk_check_property_exist(deviceCode,identifier) == 1)
 	{
 		WARNING_PRINT("[%s][%d] DATA ALREADY EXIST!!!\n",__FUNCTION__,__LINE__);

platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_3001.json

@@ -8,7 +8,3 @@
 		"attribute":"0x0000",
 		"reportFunc":"kk_tsl_report_global_onoff",
 		"controlFunc":"zclOnOff"
-	}
-	]
-}	
-	
\ No newline at end of file

platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_zigbee_api.h

@@ -40,6 +40,96 @@ kk_rpc_report_api_s kk_rpc_report_api[];
 uint8_t kk_get_rpc_set_api_size(void );
 uint8_t kk_get_rpc_report_api_size(void );
 
+typedef enum{
+	EnrollResponseCode_Success					= 0x00,
+	EnrollResponseCode_NoSupported				= 0x01,
+	EnrollResponseCode_NoEnrollPermit			= 0x02,
+	EnrollResponseCode_TooManyZones				= 0x03,
+}EnrollResponseCode;
+typedef enum{
+	ArmMode_Disarm								= 0x00,
+	ArmMode_ArmDayOrHomeZonesOnly				= 0x01,
+	ArmMode_ArmNightOrSleepZonesOnly			= 0x02,
+	ArmMode_ArmAllZones 						= 0x03,
+}ArmMode;
+typedef enum{
+	ArmNotification_AllZonesDisarmed					= 0x01,
+	ArmNotification_OnlyDayOrHomeZonesArmed 			= 0x02,
+	ArmNotification_OnlyNightOrSleepZonesArmed			= 0x03,
+	ArmNotification_AllZonesArmed						= 0x04,
+	ArmNotification_InvalidArmOrDisarmCode				= 0x05,
+	ArmNotification_NotReadyToArm						= 0x06,
+	ArmNotification_AlreadyDisarmed 		
+}ArmNotification;
+typedef enum{
+	PanelStatus_PanelDisarmedAndReadyToArm					= 0x00,
+	PanelStatus_ArmedStay									= 0x01,
+	PanelStatus_ArmedNight									= 0x02,
+	PanelStatus_ArmedAway									= 0x03,
+	PanelStatus_ExitDelay									= 0x04,
+	PanelStatus_EntryDelay									= 0x05,
+	PanelStatus_NotReadyToArm								= 0x06,
+	PanelStatus_InAlarm 									= 0x07,
+	PanelStatus_ArmingStay									= 0x08,
+	PanelStatus_ArmingNight 								= 0x09,
+	PanelStatus_ArmingAway									= 0x0a,
+}PanelStatus;
+typedef enum{
+	AlarmStatus_NoAlarm 								= 0x00,
+	AlarmStatus_Burglar 								= 0x01,
+	AlarmStatus_Fire									= 0x02,
+	AlarmStatus_Emergency								= 0x03,
+	AlarmStatus_PolicePanic 							= 0x04,
+	AlarmStatus_FirePanic								= 0x05,
+	AlarmStatus_EmergencyPanic							= 0x06,
+}AlarmStatus;
+typedef enum{
+	BypassResult_ZoneBypassed								= 0x00,
+	BypassResult_ZoneNotBypassed							= 0x01,
+	BypassResult_NotAllowed 								= 0x02,
+	BypassResult_InvalidZoneID								= 0x03,
+	BypassResult_UnknownZoneID								= 0x04,
+	BypassResult_InvalidArmOrDisarmCode 					= 0x05,
+}BypassResult;
+typedef struct
+{
+	uint8_t zoneId;
+	uint16_t zoneStatus;
+}ZoneStatus_s;
+typedef enum{
+	WarningModes_Stop									= 0x00,
+	WarningModes_Burglar								= 0x01,
+	WarningModes_Fire									= 0x02,
+	WarningModes_Emergency								= 0x03,
+	WarningModes_PolicePanic							= 0x04,
+	WarningModes_FirePanic 								= 0x05,
+	WarningModes_EmergencyPanic							= 0x06,
+}WarningModes;
+
+
+typedef enum{
+	StrobeField_NoStrobe								= 0x00,
+	StrobeField_UseStrobe								= 0x01,
+}StrobeField;
+
+typedef enum{
+	SirenLevel_LowLevelSound								= 0x00,
+	SirenLevel_MediumLevelSound								= 0x01,
+	SirenLevel_HighLevelSound								= 0x02,
+	SirenLevel_VeryHighLevelSound							= 0x03,
+}SirenLevel;
+
+typedef enum{
+	StrobeLevel_LowLevelSound								= 0x00,
+	StrobeLevel_MediumLevelSound							= 0x01,
+	StrobeLevel_HighLevelSound								= 0x02,
+	StrobeLevel_VeryHighLevelSound							= 0x03,
+}StrobeLevel;
+	
+typedef enum{
+	SquawkModeField_Arm										= 0x00,
+	SquawkModeField_Disarmed								= 0x01,
+}SquawkModeField;
 
 
 EmberStatus kk_network_leave(void);
@@ -418,4 +508,115 @@ EmberStatus zclThermostat_GetRelayStatusLog(uint16_t node,
 														uint8_t ep);
 
 
+
+
+//IAS
+EmberStatus arm_command(uint16_t node,
+							uint8_t ep,
+							ArmMode mode,
+							char* code,
+							uint8_t id);
+
+EmberStatus bypass_command(uint16_t node,
+								uint8_t ep,
+								uint8_t num,
+								uint8_t *id,
+								char* code);
+
+EmberStatus emergency_command(uint16_t node,
+								uint8_t ep);
+
+EmberStatus fire_command(uint16_t node,
+							uint8_t ep);
+
+EmberStatus panic_command(uint16_t node,
+							uint8_t ep);
+
+EmberStatus get_zone_id_command(uint16_t node,
+							uint8_t ep);
+
+EmberStatus get_zone_information_command(uint16_t node,
+											uint8_t ep,
+											uint8_t id);
+
+EmberStatus get_panel_status_command(uint16_t node,
+											uint8_t ep);
+
+EmberStatus get_bypassed_zone_list_command(uint16_t node,
+														uint8_t ep);
+
+EmberStatus get_zone_status_command(uint16_t node,
+											uint8_t ep,
+											uint8_t statrId,
+											uint8_t maxNum,
+											bool flag,
+											uint16_t mask);
+
+EmberStatus arm_response(uint16_t node,
+							uint8_t ep,
+							ArmNotification arm);
+
+EmberStatus get_zone_id_map_response(uint16_t node,
+										uint8_t ep,
+										uint16_t* map);//16
+
+EmberStatus get_zone_information_response(uint16_t node,
+										uint8_t ep,
+										uint8_t id,
+										uint16_t type,
+										uint8_t* ieee,
+										char* label);
+
+EmberStatus zone_status_changed(uint16_t node,
+										uint8_t ep,
+										uint8_t id,
+										uint16_t zonestatus,
+										uint8_t audible,
+										char* label);
+
+EmberStatus panel_status_changed(uint16_t node,
+								uint8_t ep,
+								PanelStatus panel,
+								uint8_t remain,
+								uint8_t audible,
+								AlarmStatus alarm);
+
+EmberStatus get_panel_status_response(uint16_t node,
+								uint8_t ep,
+								PanelStatus panel,
+								uint8_t remain,
+								uint8_t audible,
+								AlarmStatus alarm);
+
+EmberStatus set_bypassed_zone_list(uint16_t node,
+								uint8_t ep,
+								uint8_t num,
+								uint8_t* id);
+
+EmberStatus bypass_response(uint16_t node,
+							uint8_t ep,
+							uint8_t num,
+							BypassResult* id);
+
+EmberStatus get_zone_status_response(uint16_t node,
+											uint8_t ep,
+											bool complete,
+											uint8_t num,
+											ZoneStatus_s**ZoneStatus);
+
+EmberStatus start_warning(uint16_t node,
+								uint8_t ep,
+								WarningModes mode,
+								StrobeField strobe,
+								SirenLevel siren,
+								uint16_t duration,
+								uint8_t cycle,
+								StrobeLevel level);
+
+EmberStatus squawk_command(uint16_t node,
+								uint8_t ep,
+								WarningModes mode,
+								StrobeField strobe,
+								SquawkModeField squawk);
+
 #endif