diff options
Diffstat (limited to 'Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c')
| -rw-r--r-- | Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c | 737 |
1 files changed, 646 insertions, 91 deletions
diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c index ce2370722..58846f4c5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c @@ -6,7 +6,7 @@ ****************************************************************************** * @attention * - * <h2><center>© Copyright (c) 2019 STMicroelectronics. + * <h2><center>© Copyright (c) 2020 STMicroelectronics. * All rights reserved.</center></h2> * * This software component is licensed by ST under Ultimate Liberty license @@ -42,7 +42,9 @@ #include "config_client.h" #include "generic_client.h" #include "light_client.h" +#include "sensors_client.h" #include "appli_light_client.h" +#include "appli_sensors_client.h" /** @addtogroup ST_BLE_Mesh * @{ @@ -59,6 +61,9 @@ typedef struct MOBLE_ADDRESS peer; MOBLE_ADDRESS dst; MOBLEUINT8 command; + MOBLEUINT8 elementIndex; + MOBLEUINT8 appKeyOffset; + MOBLEUINT8 netKeyOffset; MOBLEUINT8 data[DATA_BUFFER_LENGTH]; /* 8-Bytes response packet */ MOBLEUINT32 length; } APPLI_SEND_RESPONSE_MODULE; @@ -78,18 +83,48 @@ typedef struct /* Private variables ---------------------------------------------------------*/ +MOBLEUINT8 Led_Value = 0; + +MOBLEUINT8 ButtonIndex_Value = 0; + APPLI_PENDING_PACKETS Appli_PendingPackets = {0}; -__attribute__((aligned(4))) -const MOBLE_VENDOR_CB_MAP vendor_cb = +MOBLEUINT8 pGeneric_OnOffParam[sizeof(Generic_OnOffParam_t)]; +MOBLEUINT8 pGeneric_LevelParam[sizeof(Generic_LevelParam_t)]; +MOBLEUINT8 pGeneric_DeltaLevelParam[sizeof(Generic_DeltaLevelParam_t)]; +MOBLEUINT8 pGeneric_MoveLevelParam[sizeof(Generic_LevelMoveParam_t)]; +MOBLEUINT8 pGeneric_PowerOnOffParam[sizeof(Generic_PowerOnOffParam_t)]; +MOBLEUINT8 pGeneric_DefaultTransitionTimeParam[sizeof(Generic_DefaultTransitionParam_t)]; + +MOBLEUINT8 pLightnessParam[sizeof(Light_LightnessParam_t)]; +MOBLEUINT8 pLightnessRangeParam[sizeof(Light_LightnessRangeParam_t)]; + +MOBLEUINT8 pLightCtlParam[sizeof(Light_CtlParam_t)]; +MOBLEUINT8 pLightCtlTemperatureParam[sizeof(Light_CtlTemperatureParam_t)]; +MOBLEUINT8 pLightCtlTemperatureRangeParam[sizeof(Light_CtlTemperatureRangeParam_t)]; +MOBLEUINT8 pLightCtlDefaultParam[sizeof(Light_CtlDefaultParam_t)]; + +MOBLEUINT8 pLightHslParam[sizeof(Light_HslParam_t)]; +MOBLEUINT8 pLightHslRangeParam[sizeof(Light_HslRangeParam_t)]; +MOBLEUINT8 pLightHslHueParam[sizeof(Light_HslHueParam_t)]; +MOBLEUINT8 pLightHslSaturationParam[sizeof(Light_HslSaturationParam_t)]; + +MOBLEUINT8 pLightLCModeParam[sizeof(Light_LC_ModeParam_t)]; +MOBLEUINT8 pLightLCOccupancyModeParam[sizeof(Light_LC_ModeParam_t)]; +MOBLEUINT8 pLightLCOnOffParam[sizeof(Light_LC_OnOffParam_t)]; +MOBLEUINT8 pLightLCPropertyParam[6]; + +MOBLEUINT8 pSensorsCadenceParam[sizeof(sensor_CadenceCbParam_t)]; +MOBLEUINT8 pSensorsSettingParam[sizeof(sensor_SettingCbParams_t)]; + +__attribute__((aligned(4)))const MOBLE_VENDOR_CB_MAP vendor_cb = { Vendor_WriteLocalDataCb, Vendor_ReadLocalDataCb, Vendor_OnResponseDataCb }; -__attribute__((aligned(4))) -const Appli_Vendor_cb_t VendorAppli_cb = +__attribute__((aligned(4)))const Appli_Vendor_cb_t VendorAppli_cb = { /*Vendor Commads*/ Appli_Vendor_LEDControl, @@ -100,8 +135,7 @@ const Appli_Vendor_cb_t VendorAppli_cb = Appli_Vendor_Data_write }; -__attribute__((aligned(4))) -const Appli_Generic_cb_t GenericAppli_cb = +__attribute__((aligned(4)))const Appli_Generic_cb_t GenericAppli_cb = { /* Generic OnOff callbacks */ Appli_Generic_OnOff_Set, @@ -124,8 +158,7 @@ const Appli_Generic_cb_t GenericAppli_cb = Appli_Generic_DefaultTransitionTime_Status }; -__attribute__((aligned(4))) -const Appli_Generic_State_cb_t Appli_GenericState_cb = +__attribute__((aligned(4)))const Appli_Generic_State_cb_t Appli_GenericState_cb = { /* Generic Get On Off status */ @@ -139,8 +172,7 @@ const Appli_Generic_State_cb_t Appli_GenericState_cb = Appli_Generic_GetDefaultTransitionStatus }; -__attribute__((aligned(4))) -const Appli_Light_GetStatus_cb_t Appli_Light_GetStatus_cb = +__attribute__((aligned(4)))const Appli_Light_GetStatus_cb_t Appli_Light_GetStatus_cb = { Appli_Light_GetLightnessStatus, Appli_Light_GetLightnessLinearStatus, @@ -148,10 +180,12 @@ const Appli_Light_GetStatus_cb_t Appli_Light_GetStatus_cb = Appli_Light_GetLightnessLastStatus, Appli_Light_GetLightnessRangeStatus, Appli_Light_GetCtlLightStatus, + Appli_Light_GetCtlTargetStatus, Appli_Light_GetCtlTemperatureStatus, Appli_Light_GetCtlTemperatureRange, Appli_Light_GetCtlDefaultStatus, Appli_Light_GetHslStatus, + Appli_Light_GetHslTargetStatus, Appli_Light_GetHslHueStatus, Appli_Light_GetHslSaturationStatus, Appli_Light_GetHslHueRange, @@ -160,8 +194,7 @@ const Appli_Light_GetStatus_cb_t Appli_Light_GetStatus_cb = }; -__attribute__((aligned(4))) -const Appli_Light_cb_t LightAppli_cb = +__attribute__((aligned(4)))const Appli_Light_cb_t LightAppli_cb = { /* Light Lightness callbacks */ Appli_Light_Lightness_Set, @@ -173,6 +206,9 @@ const Appli_Light_cb_t LightAppli_cb = Appli_Light_Lightness_Default_Set, Appli_Light_Lightness_Default_Status, + Appli_Light_Lightness_Last_Set, + Appli_Light_Lightness_Last_Status, + Appli_Light_Lightness_Range_Set, Appli_Light_Lightness_Range_Status, @@ -205,17 +241,19 @@ const Appli_Light_cb_t LightAppli_cb = }; -__attribute__((aligned(4))) -const Appli_Light_Ctrl_cb_t LightLCAppli_cb = +#if 0 +__attribute__((aligned(4)))const Appli_Light_Ctrl_cb_t LightLCAppli_cb = { /* Light LC mode set callbacks */ Appli_LightLC_Mode_Set, + Appli_LightLC_Mode_Status, Appli_LightLC_OM_Set, + Appli_LightLC_OM_Status, Appli_LightLC_OnOff_Set, + Appli_LightLC_OnOff_Status, }; -__attribute__((aligned(4))) -const Appli_LightLC_GetStatus_cb_t Appli_LightLC_GetStatus_cb = +__attribute__((aligned(4)))const Appli_LightLC_GetStatus_cb_t Appli_LightLC_GetStatus_cb = { Appli_LightLC_Get_ModeStatus, Appli_LightLC_Get_OMModeStatus, @@ -223,33 +261,44 @@ const Appli_LightLC_GetStatus_cb_t Appli_LightLC_GetStatus_cb = Appli_LightLC_Get_AmbientLuxLevelOutput, Appli_Light_LC_PIRegulatorOutput, }; +#endif -#ifdef ENABLE_SENSOR_MODEL_SERVER - -__attribute__((aligned(4))) -const Appli_Sensor_cb_t SensorAppli_cb = +__attribute__((aligned(4)))const sensor_server_cb_t SensorAppli_cb = { - /* Sensor Model callbacks */ - Appli_Sensor_Cadence_Set, - Appli_Sensor_Data_Status, - Appli_Sensor_Descriptor_Status , - Appli_Sensor_Setting_Set, + Appli_Sensor_CadenceGet, + Appli_Sensor_CadenceSet, + Appli_Sensor_CadenceSetUnack, + Appli_Sensor_SettingsGet, + Appli_Sensor_SettingGet, + Appli_Sensor_SettingSet, + Appli_Sensor_SettingSetUnack, + Appli_Sensor_DescriptorGet, + Appli_Sensor_Get, + Appli_Sensor_ColumnGet, + Appli_Sensor_SeriesGet, + Appli_Sensor_ReadDescriptor, + Appli_Sensor_ReadValue, + Appli_Sensor_ReadColumn, + Appli_Sensor_ReadSeries, + Appli_Sensor_IsFastCadence, + Appli_Sensor_IsStatusTrigger, + Appli_Sensor_Descriptor_Status, + Appli_Sensor_Cadence_Status, + Appli_Sensor_Settings_Status, + Appli_Sensor_Setting_Status, + Appli_Sensor_Status, Appli_Sensor_Column_Status, Appli_Sensor_Series_Status }; -__attribute__((aligned(4))) -const Appli_Sensor_GetStatus_cb_t Appli_Sensor_GetStatus_cb = -{ - // Appli_Sensor_GetSettingStatus, - Appli_Sensor_GetSetting_IDStatus, -}; - -#endif +//__attribute__((aligned(4)))const Appli_Sensor_GetStatus_cb_t Appli_Sensor_GetStatus_cb = +//{ +// // Appli_Sensor_GetSettingStatus, +// Appli_Sensor_GetSetting_IDStatus, +//}; -__attribute__((aligned(4))) -const MODEL_SIG_cb_t Model_SIG_cb[] = +__attribute__((aligned(4)))const MODEL_SIG_cb_t Model_SIG_cb[] = { #ifdef ENABLE_GENERIC_MODEL_SERVER { @@ -266,6 +315,7 @@ const MODEL_SIG_cb_t Model_SIG_cb[] = LightModelServer_ProcessMessageCb }, #endif + #ifdef ENABLE_SENSOR_MODEL_SERVER { SensorModelServer_GetOpcodeTableCb, @@ -273,6 +323,7 @@ const MODEL_SIG_cb_t Model_SIG_cb[] = SensorModelServer_ProcessMessageCb }, #endif + #ifdef ENABLE_TIME_SCENE_MODEL_SERVER { Time_SceneModelServer_GetOpcodeTableCb, @@ -280,13 +331,15 @@ const MODEL_SIG_cb_t Model_SIG_cb[] = Time_SceneModelServer_ProcessMessageCb }, #endif + #ifdef ENABLE_LIGHT_MODEL_SERVER_LC { - Light_LC_ModelServer_GetOpcodeTableCb, - Light_LC_ModelServer_GetStatusRequestCb, - Light_LC_ModelServer_ProcessMessageCb + LightLcServer_GetOpcodeTableCb, + LightLcServer_GetStatusRequestCb, + LightLcServer_ProcessMessageCb }, #endif + #ifdef ENABLE_GENERIC_MODEL_CLIENT { GenericModelClient_GetOpcodeTableCb, @@ -294,6 +347,7 @@ const MODEL_SIG_cb_t Model_SIG_cb[] = GenericModelClient_ProcessMessageCb }, #endif + #ifdef ENABLE_CONFIG_MODEL_CLIENT { ConfigClientModel_GetOpcodeTableCb, @@ -309,15 +363,29 @@ const MODEL_SIG_cb_t Model_SIG_cb[] = }, #endif - { 0, 0,0 } +#ifdef ENABLE_SENSOR_MODEL_CLIENT + { + SensorsModelClient_GetOpcodeTableCb, + SensorsModelClient_GetStatusRequestCb, + SensorsModelClient_ProcessMessageCb + }, +#endif + + { + 0, 0, 0 + } }; __attribute__((aligned(4))) const APPLI_SAVE_MODEL_STATE_CB SaveModelState_cb = AppliNvm_SaveModelState; +#if 0 +__attribute__((aligned(4))) const APPLI_SAVE_MODEL_TEST_STATE_CB SaveModelTestState_cb = AppliNVM_Save_FlashTesting; +__attribute__((aligned(4))) const APPLI_RETRIEVE_MODEL_TEST_STATE_CB RetrieveModelTestState_cb = AppliNVM_Retrieve_FlashTesting; +#endif + #define MODEL_SIG_COUNT ( ( sizeof(Model_SIG_cb)/sizeof(Model_SIG_cb[0]) - 1 )) -__attribute__((aligned(4))) -const MODEL_Vendor_cb_t Model_Vendor_cb[] = +__attribute__((aligned(4))) const MODEL_Vendor_cb_t Model_Vendor_cb[] = { #ifdef ENABLE_VENDOR_MODEL_SERVER { @@ -341,7 +409,7 @@ void GetApplicationVendorModels(const MODEL_Vendor_cb_t** pModelsTable, MOBLEUIN *pModelsTable = Model_Vendor_cb ; *VendorModelscount = MODEL_VENDOR_COUNT; - TRACE_M(TF_VENDOR,"GetApplicationVendorModels \r\n"); + TRACE_M(TF_VENDOR_M, "GetApplicationVendorModels \r\n"); } /** @@ -354,7 +422,7 @@ void BLEMesh_ModelsInit(void) #ifdef ENABLE_SAVE_MODEL_STATE_NVM - MOBLEUINT8 modelStateLoad_Size; + MOBLEUINT16 modelStateLoad_Size; MOBLEUINT8 modelStateLoadBuff[APP_NVM_MODEL_SIZE]; #ifdef CLIENT @@ -362,28 +430,39 @@ void BLEMesh_ModelsInit(void) MOBLEUINT8 PrvnlStateLoadBuff[16]; #endif +#if 0 +#ifdef ENABLE_NVM_TEST + /* Testing of flash code */ + Device_FlashTesting(); +#endif +#endif + + /* Inintialise the light model range states with default values */ + Light_ModelRangeInit(); + /* Callbacks used by BlueNRG-Mesh Models */ BLEMesh_SetSIGModelsCbMap(Model_SIG_cb, MODEL_SIG_COUNT); - /* Load generic model states from nvm */ - AppliNvm_LoadModelState(modelStateLoadBuff, &modelStateLoad_Size); - -#ifdef CLIENT - AppliPrvnNvm_LoadData(PrvnlStateLoadBuff,&PrvnStateLoad_Size); +#if defined ENABLE_SENSOR_MODEL_SERVER && !defined CUSTOM_BOARD_PWM_SELECTION + /* Initialization of sensors */ + Appli_Sensor_Init(); +#endif + + Appli_Light_LCs_Init(); #endif + /* Load generic model states from nvm */ + AppliNvm_LoadModelState(modelStateLoadBuff, &modelStateLoad_Size); if (modelStateLoad_Size != 0) { /* update states of generic model */ Model_RestoreStates(modelStateLoadBuff, modelStateLoad_Size); } -#if defined ENABLE_SENSOR_MODEL_SERVER && !defined CUSTOM_BOARD_PWM_SELECTION - /* Initiallization of sensors */ - Appli_Sensor_Init(); -#endif - -#endif +#ifdef CLIENT + AppliPrvnNvm_LoadData(PrvnlStateLoadBuff,&PrvnStateLoad_Size); +#endif + } /** @@ -418,7 +497,7 @@ void BLEMesh_ModelsProcess(void) #endif #ifdef ENABLE_LIGHT_MODEL_SERVER_LC - Light_control_Process(); + Light_LC_Process(); #endif } @@ -433,23 +512,498 @@ void BLEMesh_ModelsCommand(void) Vendor_Publish(BLEMesh_GetAddress()); #endif +#if defined(GENERIC_CLIENT_MODEL_PUBLISH) || defined(LIGHT_CLIENT_MODEL_PUBLISH) + Led_Value ^= APPLI_LED_ON; + pGeneric_OnOffParam[0] = Led_Value; // OnOff parameter byte 0 : The target value of the Generic Onoff state + + pLightLCModeParam[0] = Led_Value; + pLightLCOccupancyModeParam[0] = Led_Value; + pLightLCOnOffParam[0] = Led_Value; + + //This Switch-case allows to quickly set the different Models Messages parameters in order to demonstrate Client APIs functionning + switch (ButtonIndex_Value){ + case 0: + ButtonIndex_Value=0x1; + + pGeneric_LevelParam[0]= 0xE8; // Level parameter byte 0 : The target value of the Generic Level state + pGeneric_LevelParam[1]= 0x03; // Level parameter byte 1 : The target value of the Generic Level state + + pGeneric_DeltaLevelParam[0]= 0xE8; // Delta Level parameter byte 0 : The Delta change of the Generic Level state + pGeneric_DeltaLevelParam[1]= 0x03; // Delta Level parameter byte 1 : The Delta change of the Generic Level state + pGeneric_DeltaLevelParam[2]= 0x00; // Delta Level parameter byte 2 : The Delta change of the Generic Level state + pGeneric_DeltaLevelParam[3]= 0x00; // Delta Level parameter byte 3 : The Delta change of the Generic Level state + + pGeneric_MoveLevelParam[0]= 0xE8; //Move Delta Level parameter byte 0 : The Delta Level step to calculate Move speed for the Generic Level state + pGeneric_MoveLevelParam[1]= 0x03; //Move Delta Level parameter byte 1 : The Delta Level step to calculate Move speed for the Generic Level state + + pGeneric_DefaultTransitionTimeParam[0]=0x0F; //Transition time parameter byte 0 : The value of the Generic Default Transition Time state + + pGeneric_PowerOnOffParam[0]=0x1; //OnPowerUp parameter byte 0 : The value of the Generic OnPowerUp state. + + pLightnessParam[0] = 0xE8; //Lightness parameter byte 0 : The target value of the Light Lightness Actual/Linear/Default state + pLightnessParam[1] = 0x03; //Lightness parameter byte 1 : The target value of the Light Lightness Actual/Linear/Default state + + pLightnessRangeParam[0] = 0xE8; //Lightness Range Min parameter byte 0 : The value of the Lightness Range Min field of the Light Lightness Range state + pLightnessRangeParam[1] = 0x03; //Lightness Range Min parameter byte 1 : The value of the Lightness Range Min field of the Light Lightness Range state + pLightnessRangeParam[2] = 0x88; //Lightness Range Max parameter byte 0 : The value of the Lightness Range Max field of the Light Lightness Range state + pLightnessRangeParam[3] = 0x13; //Lightness Range Max parameter byte 1 : The value of the Lightness Range Max field of the Light Lightness Range state + + pLightCtlParam[0] = 0xE8; //CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness state + pLightCtlParam[1] = 0x03; //CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness state + pLightCtlParam[2] = 0xE8; //CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state + pLightCtlParam[3] = 0x03; //CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state + pLightCtlParam[4] = 0xE8; //CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state + pLightCtlParam[5] = 0x03; //CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state + + pLightCtlTemperatureParam[0] = 0xE8; //CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state + pLightCtlTemperatureParam[1] = 0x03; //CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state + pLightCtlTemperatureParam[2] = 0xE8; //CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state + pLightCtlTemperatureParam[3] = 0x03; //CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state + + pLightCtlTemperatureRangeParam[0] = 0xE8; //Temperature Range Min parameter byte 0 : The value of the Temperature Range Min field of the Light CTL Temperature Range state + pLightCtlTemperatureRangeParam[1] = 0x03; //Temperature Range Min parameter byte 1 : The value of the Temperature Range Min field of the Light CTL Temperature Range state + pLightCtlTemperatureRangeParam[2] = 0x88; //Temperature Range Max parameter byte 0 : The value of the Temperature Range Max field of the Light CTL Temperature Range state + pLightCtlTemperatureRangeParam[3] = 0x13; //Temperature Range Max parameter byte 1 : The value of the Temperature Range Max field of the Light CTL Temperature Range state + + pLightCtlDefaultParam[0] = 0xE8; //CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness Default state + pLightCtlDefaultParam[1] = 0x03; //CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness Default state + pLightCtlDefaultParam[2] = 0xE8; //CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature Default state + pLightCtlDefaultParam[3] = 0x03; //CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature Default state + pLightCtlDefaultParam[4] = 0xE8; //CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV Default state + pLightCtlDefaultParam[5] = 0x03; //CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV Default state + + pLightHslParam[0] = 0xE8; //HSL Lightness parameter byte 0 : The target value of the Light HSL Lightness state + pLightHslParam[1] = 0x03; //HSL Lightness parameter byte 1 : The target value of the Light HSL Lightness state + pLightHslParam[2] = 0xE8; //HSL Hue parameter byte 0 : The target value of the Light HSL Hue state + pLightHslParam[3] = 0x03; //HSL Hue parameter byte 1 : The target value of the Light HSL Hue state + pLightHslParam[4] = 0xE8; //HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state + pLightHslParam[5] = 0x03; //HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state + + pLightHslRangeParam[0] = 0xE8; //HSL Hue Range Min parameter byte 0 : The value of the Hue Range Min field of the Light HSL Hue Range state + pLightHslRangeParam[1] = 0x03; //HSL Hue Range Min parameter byte 1 : The value of the Hue Range Min field of the Light HSL Hue Range state + pLightHslRangeParam[2] = 0x88; //HSL Hue Range Max parameter byte 0 : The value of the Hue Range Max field of the Light HSL Hue Range state + pLightHslRangeParam[3] = 0x13; //HSL Hue Range Max parameter byte 1 : The value of the Hue Range Max field of the Light HSL Hue Range state + pLightHslRangeParam[4] = 0x88; //HSL Saturation Min parameter byte 0 : The value of the Saturation Range Min field of the Light HSL Saturation Range state + pLightHslRangeParam[5] = 0x13; //HSL Saturation Min parameter byte 1 : The value of the Saturation Range Min field of the Light HSL Saturation Range state + pLightHslRangeParam[6] = 0x70; //HSL Saturation Max parameter byte 0 : The value of the Saturation Range Max field of the Light HSL Saturation Range state + pLightHslRangeParam[7] = 0x17; //HSL Saturation Max parameter byte 1 : The value of the Saturation Range Max field of the Light HSL Saturation Range state + + pLightHslHueParam[0] = 0xE8; //HSL Hue parameter byte 0 : The target value of the Light HSL Hue state + pLightHslHueParam[1] = 0x03; //HSL Hue parameter byte 1 : The target value of the Light HSL Hue state + + pLightHslSaturationParam[0] = 0xE8; //HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state + pLightHslSaturationParam[1] = 0x03; //HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state + + //LIGHT_CONTROL_LUX_LEVEL_ON_ID : 0x202B + pLightLCPropertyParam[0]= 0x2B; // Property ID byte 0 : Property ID identifying a Light LC Property. + pLightLCPropertyParam[1]= 0x00; // Property ID byte 1 : Property ID identifying a Light LC Property. + pLightLCPropertyParam[2]= 0x44; // Property ID byte 0 : Property ID identifying a Light LC Property. + pLightLCPropertyParam[3]= 0x44; // Property ID byte 1 : Property ID identifying a Light LC Property. + pLightLCPropertyParam[4]= 0x44; // Property ID byte 2 : Property ID identifying a Light LC Property. + break; + + case 1: + ButtonIndex_Value=0x2; + + pGeneric_LevelParam[0]= 0xff; // Level parameter byte 0 : The target value of the Generic Level state + pGeneric_LevelParam[1]= 0x7f; // Level parameter byte 1 : The target value of the Generic Level state + + pGeneric_DeltaLevelParam[0]= 0x10; // Delta Level parameter byte 0 : The Delta change of the Generic Level state + pGeneric_DeltaLevelParam[1]= 0x27; // Delta Level parameter byte 1 : The Delta change of the Generic Level state + pGeneric_DeltaLevelParam[2]= 0x00; // Delta Level parameter byte 2 : The Delta change of the Generic Level state + pGeneric_DeltaLevelParam[3]= 0x00; // Delta Level parameter byte 3 : The Delta change of the Generic Level state + + pGeneric_MoveLevelParam[0]= 0xff; //Move Delta Level parameter byte 0 : The Delta Level step to calculate Move speed for the Generic Level state + pGeneric_MoveLevelParam[1]= 0x7f; //Move Delta Level parameter byte 1 : The Delta Level step to calculate Move speed for the Generic Level state + + pGeneric_DefaultTransitionTimeParam[0]=0x10; //Transition time parameter byte 0 : The value of the Generic Default Transition Time state + + pGeneric_PowerOnOffParam[0]=0x2; //OnPowerUp parameter byte 0 : The value of the Generic OnPowerUp state. + + pLightnessParam[0] = 0xff; //Lightness parameter byte 0 : The target value of the Light Lightness Actual/Linear/Default state + pLightnessParam[1] = 0xff; //Lightness parameter byte 1 : The target value of the Light Lightness Actual/Linear/Default state + + pLightnessRangeParam[0] = 0x00; //Lightness Range Min parameter byte 0 : The value of the Lightness Range Min field of the Light Lightness Range state + pLightnessRangeParam[1] = 0x00; //Lightness Range Min parameter byte 1 : The value of the Lightness Range Min field of the Light Lightness Range state + pLightnessRangeParam[2] = 0xff; //Lightness Range Max parameter byte 0 : The value of the Lightness Range Max field of the Light Lightness Range state + pLightnessRangeParam[3] = 0xff; //Lightness Range Max parameter byte 1 : The value of the Lightness Range Max field of the Light Lightness Range state + + pLightCtlParam[0] = 0xff; //CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness state + pLightCtlParam[1] = 0xff; //CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness state + pLightCtlParam[2] = 0x20; //CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state + pLightCtlParam[3] = 0x4e; //CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state + pLightCtlParam[4] = 0xff; //CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state + pLightCtlParam[5] = 0x7f; //CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state + + pLightCtlTemperatureParam[0] = 0x20; //CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state + pLightCtlTemperatureParam[1] = 0x4e; //CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state + pLightCtlTemperatureParam[2] = 0xff; //CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state + pLightCtlTemperatureParam[3] = 0x7f; //CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state + + pLightCtlTemperatureRangeParam[0] = 0x19; //Temperature Range Min parameter byte 0 : The value of the Temperature Range Min field of the Light CTL Temperature Range state + pLightCtlTemperatureRangeParam[1] = 0x4e; //Temperature Range Min parameter byte 1 : The value of the Temperature Range Min field of the Light CTL Temperature Range state + pLightCtlTemperatureRangeParam[2] = 0x20; //Temperature Range Max parameter byte 0 : The value of the Temperature Range Max field of the Light CTL Temperature Range state + pLightCtlTemperatureRangeParam[3] = 0x4e; //Temperature Range Max parameter byte 1 : The value of the Temperature Range Max field of the Light CTL Temperature Range state + + pLightCtlDefaultParam[0] = 0xff; //CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness Default state + pLightCtlDefaultParam[1] = 0xff; //CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness Default state + pLightCtlDefaultParam[2] = 0x20; //CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature Default state + pLightCtlDefaultParam[3] = 0x4e; //CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature Default state + pLightCtlDefaultParam[4] = 0xff; //CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV Default state + pLightCtlDefaultParam[5] = 0x7f; //CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV Default state + + pLightHslParam[0] = 0xff; //HSL Lightness parameter byte 0 : The target value of the Light HSL Lightness state + pLightHslParam[1] = 0xff; //HSL Lightness parameter byte 1 : The target value of the Light HSL Lightness state + pLightHslParam[2] = 0xee; //HSL Hue parameter byte 0 : The target value of the Light HSL Hue state + pLightHslParam[3] = 0xee; //HSL Hue parameter byte 1 : The target value of the Light HSL Hue state + pLightHslParam[4] = 0xdd; //HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state + pLightHslParam[5] = 0xdd; //HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state + + pLightHslRangeParam[0] = 0x00; //HSL Hue Range Min parameter byte 0 : The value of the Hue Range Min field of the Light HSL Hue Range state + pLightHslRangeParam[1] = 0xf0; //HSL Hue Range Min parameter byte 1 : The value of the Hue Range Min field of the Light HSL Hue Range state + pLightHslRangeParam[2] = 0xff; //HSL Hue Range Max parameter byte 0 : The value of the Hue Range Max field of the Light HSL Hue Range state + pLightHslRangeParam[3] = 0xff; //HSL Hue Range Max parameter byte 1 : The value of the Hue Range Max field of the Light HSL Hue Range state + pLightHslRangeParam[4] = 0x00; //HSL Saturation Min parameter byte 0 : The value of the Saturation Range Min field of the Light HSL Saturation Range state + pLightHslRangeParam[5] = 0xe0; //HSL Saturation Min parameter byte 1 : The value of the Saturation Range Min field of the Light HSL Saturation Range state + pLightHslRangeParam[6] = 0xff; //HSL Saturation Max parameter byte 0 : The value of the Saturation Range Max field of the Light HSL Saturation Range state + pLightHslRangeParam[7] = 0xef; //HSL Saturation Max parameter byte 1 : The value of the Saturation Range Max field of the Light HSL Saturation Range state + + pLightHslHueParam[0] = 0xff; //HSL Hue parameter byte 0 : The target value of the Light HSL Hue state + pLightHslHueParam[1] = 0xff; //HSL Hue parameter byte 1 : The target value of the Light HSL Hue state + + pLightHslSaturationParam[0] = 0xff; //HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state + pLightHslSaturationParam[1] = 0xff; //HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state + + //LIGHT_CONTROL_LUX_LEVEL_ON_ID : 0x202B + pLightLCPropertyParam[0]= 0x2B; // Property ID byte 0 : Property ID identifying a Light LC Property. + pLightLCPropertyParam[1]= 0x00; // Property ID byte 1 : Property ID identifying a Light LC Property. + pLightLCPropertyParam[2]= 0x01; // Property ID byte 0 : Property ID identifying a Light LC Property. + pLightLCPropertyParam[3]= 0x00; // Property ID byte 1 : Property ID identifying a Light LC Property. + pLightLCPropertyParam[4]= 0x10; // Property ID byte 2 : Property ID identifying a Light LC Property. + break; + + case 2: + ButtonIndex_Value=0x0; + + pGeneric_LevelParam[0]= 0x00; // Level parameter byte 0 : The target value of the Generic Level state + pGeneric_LevelParam[1]= 0x00; // Level parameter byte 1 : The target value of the Generic Level state + + pGeneric_DeltaLevelParam[0]= 0x00; // Delta Level parameter byte 0 : The Delta change of the Generic Level state + pGeneric_DeltaLevelParam[1]= 0x00; // Delta Level parameter byte 1 : The Delta change of the Generic Level state + pGeneric_DeltaLevelParam[2]= 0x00; // Delta Level parameter byte 2 : The Delta change of the Generic Level state + pGeneric_DeltaLevelParam[3]= 0x00; // Delta Level parameter byte 3 : The Delta change of the Generic Level state + + pGeneric_MoveLevelParam[0]= 0x00; //Move Delta Level parameter byte 0 : The Delta Level step to calculate Move speed for the Generic Level state + pGeneric_MoveLevelParam[1]= 0x00; //Move Delta Level parameter byte 1 : The Delta Level step to calculate Move speed for the Generic Level state + + pGeneric_DefaultTransitionTimeParam[0]=0x00; //Transition time parameter byte 0 : The value of the Generic Default Transition Time state + + pGeneric_PowerOnOffParam[0]=0x0; //OnPowerUp parameter byte 0 : The value of the Generic OnPowerUp state. + + pLightnessParam[0] = 0x00; //Lightness parameter byte 0 : The target value of the Light Lightness Actual/Linear/Default state + pLightnessParam[1] = 0x00; //Lightness parameter byte 1 : The target value of the Light Lightness Actual/Linear/Default state + + pLightnessRangeParam[0] = 0x00; //Lightness Range Min parameter byte 0 : The value of the Lightness Range Min field of the Light Lightness Range state + pLightnessRangeParam[1] = 0x00; //Lightness Range Min parameter byte 1 : The value of the Lightness Range Min field of the Light Lightness Range state + pLightnessRangeParam[2] = 0x00; //Lightness Range Max parameter byte 0 : The value of the Lightness Range Max field of the Light Lightness Range state + pLightnessRangeParam[3] = 0x10; //Lightness Range Max parameter byte 1 : The value of the Lightness Range Max field of the Light Lightness Range state + + pLightCtlParam[0] = 0x00; //CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness state + pLightCtlParam[1] = 0x00; //CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness state + pLightCtlParam[2] = 0x20; //CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state + pLightCtlParam[3] = 0x03; //CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state + pLightCtlParam[4] = 0x00; //CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state + pLightCtlParam[5] = 0x00; //CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state + + pLightCtlTemperatureParam[0] = 0x20; //CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state + pLightCtlTemperatureParam[1] = 0x03; //CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state + pLightCtlTemperatureParam[2] = 0x00; //CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state + pLightCtlTemperatureParam[3] = 0x00; //CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state + + pLightCtlTemperatureRangeParam[0] = 0x20; //Temperature Range Min parameter byte 0 : The value of the Temperature Range Min field of the Light CTL Temperature Range state + pLightCtlTemperatureRangeParam[1] = 0x03; //Temperature Range Min parameter byte 1 : The value of the Temperature Range Min field of the Light CTL Temperature Range state + pLightCtlTemperatureRangeParam[2] = 0x21; //Temperature Range Max parameter byte 0 : The value of the Temperature Range Max field of the Light CTL Temperature Range state + pLightCtlTemperatureRangeParam[3] = 0x03; //Temperature Range Max parameter byte 1 : The value of the Temperature Range Max field of the Light CTL Temperature Range state + + pLightCtlDefaultParam[0] = 0x00; //CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness Default state + pLightCtlDefaultParam[1] = 0x00; //CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness Default state + pLightCtlDefaultParam[2] = 0x20; //CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature Default state + pLightCtlDefaultParam[3] = 0x03; //CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature Default state + pLightCtlDefaultParam[4] = 0x00; //CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV Default state + pLightCtlDefaultParam[5] = 0x00; //CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV Default state + + pLightHslParam[0] = 0x00; //HSL Lightness parameter byte 0 : The target value of the Light HSL Lightness state + pLightHslParam[1] = 0x00; //HSL Lightness parameter byte 1 : The target value of the Light HSL Lightness state + pLightHslParam[2] = 0x00; //HSL Hue parameter byte 0 : The target value of the Light HSL Hue state + pLightHslParam[3] = 0x00; //HSL Hue parameter byte 1 : The target value of the Light HSL Hue state + pLightHslParam[4] = 0x00; //HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state + pLightHslParam[5] = 0x00; //HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state + + pLightHslRangeParam[0] = 0x00; //HSL Hue Range Min parameter byte 0 : The value of the Hue Range Min field of the Light HSL Hue Range state + pLightHslRangeParam[1] = 0x00; //HSL Hue Range Min parameter byte 1 : The value of the Hue Range Min field of the Light HSL Hue Range state + pLightHslRangeParam[2] = 0x00; //HSL Hue Range Max parameter byte 0 : The value of the Hue Range Max field of the Light HSL Hue Range state + pLightHslRangeParam[3] = 0x10; //HSL Hue Range Max parameter byte 1 : The value of the Hue Range Max field of the Light HSL Hue Range state + pLightHslRangeParam[4] = 0x00; //HSL Saturation Min parameter byte 0 : The value of the Saturation Range Min field of the Light HSL Saturation Range state + pLightHslRangeParam[5] = 0x00; //HSL Saturation Min parameter byte 1 : The value of the Saturation Range Min field of the Light HSL Saturation Range state + pLightHslRangeParam[6] = 0x00; //HSL Saturation Max parameter byte 0 : The value of the Saturation Range Max field of the Light HSL Saturation Range state + pLightHslRangeParam[7] = 0x20; //HSL Saturation Max parameter byte 1 : The value of the Saturation Range Max field of the Light HSL Saturation Range state + + pLightHslHueParam[0] = 0x00; //HSL Hue parameter byte 0 : The target value of the Light HSL Hue state + pLightHslHueParam[1] = 0x00; //HSL Hue parameter byte 1 : The target value of the Light HSL Hue state + + pLightHslSaturationParam[0] = 0x00; //HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state + pLightHslSaturationParam[1] = 0x00; //HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state + + //LIGHT_CONTROL_LUX_LEVEL_ON_ID : 0x202B + pLightLCPropertyParam[0]= 0x2B; // Property ID byte 0 : Property ID identifying a Light LC Property. + pLightLCPropertyParam[1]= 0x00; // Property ID byte 1 : Property ID identifying a Light LC Property. + pLightLCPropertyParam[2]= 0x00; // Property ID byte 0 : Property ID identifying a Light LC Property. + pLightLCPropertyParam[3]= 0x00; // Property ID byte 1 : Property ID identifying a Light LC Property. + pLightLCPropertyParam[4]= 0x00; // Property ID byte 2 : Property ID identifying a Light LC Property. + break; + + default: + break; + } + + #ifdef GENERIC_CLIENT_MODEL_PUBLISH - Appli_GenericClient_OnOff_Set(); + /** GENERIC ONOFF **/ +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API ONOFF SET ACK ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_ON_OFF_SET_ACK, pGeneric_OnOffParam); + + TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API ONOFF SET UNACK ------------- \r\n"); + Appli_GenericClient_API(0, GENERIC_ON_OFF_SET_UNACK, pGeneric_OnOffParam); + + /** GENERIC LEVEL **/ +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API LEVEL SET ACK ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_LEVEL_SET_ACK, pGeneric_LevelParam); +// +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API LEVEL SET UNACK ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_LEVEL_SET_UNACK, pGeneric_LevelParam); +// +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DELTA LEVEL SET ACK ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_DELTA_SET, pGeneric_DeltaLevelParam); +// +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DELTA LEVEL SET UNACK ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_DELTA_SET_UNACK, pGeneric_DeltaLevelParam); +// +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API MOVE DELTA LEVEL SET ACK ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_MOVE_SET, pGeneric_MoveLevelParam); +// +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API MOVE DELTA LEVEL SET UNACK ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_MOVE_SET_UNACK, pGeneric_MoveLevelParam); + + /** GENERIC POWER ONOFF **/ +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API POWER ON OFF SET ACK ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_POWER_ON_OFF_SET, pGeneric_PowerOnOffParam); +// +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API POWER ON OFF SET UNACK ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_POWER_ON_OFF_SET_UNACK, pGeneric_PowerOnOffParam); + + /** GENERIC TRANSITION TIME **/ +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DEFAULT TRANSITION TIME SET ACK ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_DEFAULT_TRANSITION_TIME_SET, pGeneric_DefaultTransitionTimeParam); +// +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DEFAULT TRANSITION TIME SET UNACK ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_DEFAULT_TRANSITION_TIME_SET_UNACK, pGeneric_DefaultTransitionTimeParam); + + + +#if 1 /* TODO FAGOTV: Initialize Present Ambient Temparature Sensor in sensor_cfg_usr.h */ + //PRESENT_AMBIENT_TEMPERATURE_PID : 0x004F + pSensorsCadenceParam[0]= 0x4F; // Property ID byte 0 : Property ID for the sensor. + pSensorsCadenceParam[1]= 0x00; // Property ID byte 1 : Property ID for the sensor. + + pSensorsCadenceParam[2]= 0x81; // Fast Cadence Period Divisor bits 0-7: Divisor for the Publish Period. + // Status Trigger Type bit 8 : Defines the unit and format of the Status Trigger Delta fields. + pSensorsCadenceParam[3]= 0x11; // Status Trigger Delta Down byte 0 : Delta down value that triggers a status message. + pSensorsCadenceParam[4]= 0x11; // Status Trigger Delta Down byte 1 : Delta down value that triggers a status message. + + pSensorsCadenceParam[5]= 0x22; // Status Trigger Delta Up byte 0 : Delta down value that triggers a status message. + pSensorsCadenceParam[6]= 0x22; // Status Trigger Delta Up byte 1 : Delta down value that triggers a status message. + + pSensorsCadenceParam[7]= 0x10; // Status Min Interval byte 0 : Minimum interval between two consecutive Status messages. + + pSensorsCadenceParam[8]= 0x33; // Fast Cadence Low byte 0 : Low value for the fast cadence range. + + pSensorsCadenceParam[9]= 0x44; // Fast Cadence High byte 0 : High value for the fast cadence range. + +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR CADENCE SET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_CADENCE_SET, pSensorsCadenceParam); + +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR CADENCE SET UNACK ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_CADENCE_SET_UNACK, pSensorsCadenceParam); + + /** SENSOR SETTING**/ + /* + PRESENT_AMBIENT_TEMPERATURE_PID : 0x004F + Second Property PID : 0x00AD + */ + pSensorsSettingParam[0]= 0x4F; // Property ID byte 0 : Property ID for the sensor + pSensorsSettingParam[1]= 0x00; // Property ID byte 1 : Property ID for the sensor + pSensorsSettingParam[2]= 0xAD; // Sensor Setting Property ID byte 0 : Property ID for the sensor setting + pSensorsSettingParam[3]= 0x00; // Sensor Setting Property ID byte 1 : Property ID for the sensor setting + + switch (ButtonIndex_Value){ + case 0: + pSensorsSettingParam[4]= 0x10; // Sensor Setting Property ID byte 0 : Property ID for the sensor setting + //pSensorsSettingParam[5]= 0x10; // Sensor Setting Property ID byte 1 : Property ID for the sensor setting + break; + case 1: + pSensorsSettingParam[4]= 0x20; // Sensor Setting Property ID byte 0 : Property ID for the sensor setting + //pSensorsSettingParam[5]= 0x20; // Sensor Setting Property ID byte 1 : Property ID for the sensor setting + break; + case 2: + pSensorsSettingParam[4]= 0x0F; // Sensor Setting Property ID byte 0 : Property ID for the sensor setting + //pSensorsSettingParam[5]= 0x00; // Sensor Setting Property ID byte 1 : Property ID for the sensor setting + break; + default: + break; + } +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR SETTING SET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_SETTING_SET, pSensorsSettingParam); + +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR SETTING SET UNACK ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_SETTING_SET_UNACK, pSensorsSettingParam); +#endif + +#endif + +#ifdef LIGHT_CLIENT_MODEL_PUBLISH + /** LIGHT LIGHTNESS **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_SET, pLightnessParam); +// +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_SET_UNACK, pLightnessParam); + + /** LIGHT LIGHTNESS LINEAR **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS SET LINEAR ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_LINEAR_SET, pLightnessParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS SET LINEAR UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_LINEAR_SET_UNACK, pLightnessParam); + + /** LIGHT LIGHTNESS DEFAULT **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS DEFAULT SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_DEFAULT_SET, pLightnessParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS DEFAULT SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_DEFAULT_SET_UNACK, pLightnessParam); + + /** LIGHT LIGHTNESS RANGE **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS RANGE SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_RANGE_SET, pLightnessRangeParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS RANGE SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_RANGE_SET_UNACK, pLightnessRangeParam); + + /** LIGHT LIGHTNESS CTL **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_SET, pLightCtlParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_SET_UNACK, pLightCtlParam); + + /** LIGHT LIGHTNESS CTL TEMPERATURE**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_SET, pLightCtlTemperatureParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_SET_UNACK, pLightCtlTemperatureParam); + + /** LIGHT LIGHTNESS CTL TEMPERATURE RANGE**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE RANGE SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_RANGE_SET, pLightCtlTemperatureRangeParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE RANGE SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_RANGE_SET_UNACK, pLightCtlTemperatureRangeParam); + + /** LIGHT LIGHTNESS CTL DEFAULT**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL DEFAULT SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_DEFAULT_SET, pLightCtlDefaultParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL DEFAULT SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_DEFAULT_SET_UNACK, pLightCtlDefaultParam); + + /** LIGHT LIGHTNESS HSL **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_SET, pLightHslParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_SET_UNACK, pLightHslParam); + + /** LIGHT LIGHTNESS HSL DEFAULT **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL DEFAULT SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_DEFAULT_SET, pLightHslParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL DEFAULT SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_DEFAULT_SET_UNACK, pLightHslParam); + + /** LIGHT LIGHTNESS HSL RANGE **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL RANGE SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_RANGE_SET, pLightHslRangeParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL RANGE SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_RANGE_SET_UNACK, pLightHslRangeParam); + + /** LIGHT LIGHTNESS HSL HUE **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL HUE SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_HUE_SET, pLightHslHueParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL HUE SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_HUE_SET_UNACK, pLightHslHueParam); + + /** LIGHT LIGHTNESS HSL SATURATION **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SATURATION SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_SATURATION_SET, pLightHslSaturationParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SATURATION SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_SATURATION_SET_UNACK, pLightHslSaturationParam); + + /** LIGHT LC MODE **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC MODE SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_MODE_SET, pLightLCModeParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC MODE SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_MODE_SET_UNACK, pLightLCModeParam); + + /** LIGHT LC OM **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC OM SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_OM_SET, pLightLCOccupancyModeParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC OM SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_OM_SET_UNACK, pLightLCOccupancyModeParam); + + /** LIGHT LC ONOFF **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC ONOFF SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_ON_OFF_SET, pLightLCOnOffParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC ONOFF SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_ON_OFF_SET_UNACK, pLightLCOnOffParam); + + /** LIGHT LC PROPERTY **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC PROPERTY SET ACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_PROPERTY_SET, pLightLCPropertyParam); + +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC PROPERTY SET UNACK ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_PROPERTY_SET_UNACK, pLightLCPropertyParam); +#endif #endif -#ifndef CLIENT /* if CLIENT and SERVER => Publish is already done in CLIENT */ #ifdef GENERIC_SERVER_MODEL_PUBLISH +#ifndef GENERIC_CLIENT_MODEL_PUBLISH Generic_Publish(BLEMesh_GetAddress()); #endif #endif - } /** * @brief Get the Element Number for selected Model * @param dst_peer : Destination Address received -* @retval MOBLEUINT8 : elementIndex +* @retval MOBLEUINT8 : elementNumber */ MOBLEUINT8 BLEMesh_ModelsGetElementNumber(MOBLE_ADDRESS dst_peer) { @@ -464,46 +1018,35 @@ MOBLEUINT8 BLEMesh_ModelsGetElementNumber(MOBLE_ADDRESS dst_peer) } /** -* @brief Check Subscription of Elements for Group Address for selected Model +* @brief Get the Element Index for selected Model * @param dst_peer : Destination Address received -* @param elementNumber : Number of element to check Subscription -* @retval MOBLE_RESULT status of result +* @retval MOBLEUINT8 : elementIndex */ -MOBLE_RESULT BLEMesh_ModelsCheckSubscription(MOBLE_ADDRESS dst_peer, \ - MOBLEUINT8 elementNumber) +MOBLEUINT8 BLEMesh_ModelsGetElementIndex(MOBLE_ADDRESS dst_peer) { - MOBLE_RESULT status = MOBLE_RESULT_FAIL; - MOBLE_ADDRESS subscriptionList[10] = {0}; - MOBLEUINT8 length; - MOBLEUINT32 modelId = GENERIC_MODEL_SERVER_LEVEL_MODEL_ID; - BLEMesh_GetSubscriptionAddress(subscriptionList,&length,elementNumber, modelId); + MOBLE_ADDRESS nodeAddress; + MOBLEUINT8 elementIndex; - for(uint8_t list=0; list<length; list++) - { - if(dst_peer == subscriptionList[list]) - { - status = MOBLE_RESULT_SUCCESS; - break; - } - } + nodeAddress = BLEMesh_GetAddress(); + elementIndex =(dst_peer - nodeAddress); - return status; + return elementIndex; } + /** * @brief Schedule a packet to be sent with randomized send timestamp * If a que is empty, random timestamp is calculated * Subsequent packets are sent in sequence -* @param peer: Address of the peer -* @param dst : Address of the node +* @param *pmsgParam Pointer to structure of message header for parameters: +* elementIndex, src, dst addresses, TTL, RSSI, NetKey & AppKey Offset * @param status: Command status * @param data: Data buffer. * @param length: Length of data in bytes. * @retval None */ -void BLEMesh_ModelsDelayPacket(MOBLE_ADDRESS peer, - MOBLE_ADDRESS dst, +void BLEMesh_ModelsDelayPacket(MODEL_MessageHeader_t *pmsgParams, MOBLEUINT8 command, MOBLEUINT8 const * data, MOBLEUINT32 length) @@ -541,8 +1084,11 @@ void BLEMesh_ModelsDelayPacket(MOBLE_ADDRESS peer, } } - Appli_PendingPackets.head->peer = peer; - Appli_PendingPackets.head->dst = dst; + Appli_PendingPackets.head->peer = pmsgParams->peer_addr; + Appli_PendingPackets.head->dst = pmsgParams->dst_peer; + Appli_PendingPackets.head->elementIndex = pmsgParams->elementIndex; + Appli_PendingPackets.head->appKeyOffset = pmsgParams->rcvdAppKeyOffset; + Appli_PendingPackets.head->netKeyOffset = pmsgParams->rcvdNetKeyOffset; Appli_PendingPackets.head->command = command; Appli_PendingPackets.head->length = length; for (MOBLEUINT8 count=0; count<length; count++) @@ -558,6 +1104,7 @@ void BLEMesh_ModelsDelayPacket(MOBLE_ADDRESS peer, void BLEMesh_ModelsSendDelayedPacket(void) { APPLI_SEND_RESPONSE_MODULE* ptr; + MODEL_MessageHeader_t msgParam; MOBLEUINT8 temp_index; if ((Appli_PendingPackets.packet_count != 0) && @@ -571,9 +1118,17 @@ void BLEMesh_ModelsSendDelayedPacket(void) -count)%MAX_PENDING_PACKETS_QUE_SIZE; ptr = Appli_PendingPackets.packet + temp_index; + /* Initialize the messageParam*/ + msgParam.dst_peer = ptr->dst; + msgParam.peer_addr = ptr->peer; + msgParam.elementIndex = 0; + msgParam.rcvdAppKeyOffset = 0; + msgParam.rcvdNetKeyOffset = 0; + msgParam.rssi = 0; + msgParam.ttl = 0; + VendorModel_SendResponse(VENDOR_STMICRO_CID, - ptr->peer, - ptr->dst, + &msgParam, ptr->command, ptr->data, ptr->length); @@ -587,14 +1142,14 @@ void BLEMesh_ModelsSendDelayedPacket(void) * User is responsible for serializing data into \a data buffer. Vendor_WriteLocalDataCb * callback will be called on the remote device. * @param modelId ID of the model. -* @param srcAddress element Address of the Node +* @param elementIdx element index * @param command vendor model commands * @param data Data buffer. * @param length Length of data in bytes. * @param response If 'MOBLE_TRUE', used to get the response. If 'MOBLE_FALSE', no response * @return MOBLE_RESULT_SUCCESS on success. */ -MOBLE_RESULT MeshClient_SetRemotePublication(MOBLEUINT32 modelId, MOBLEUINT16 elementIdx, +MOBLE_RESULT MeshClient_SetRemotePublication(MOBLEUINT32 modelId, MOBLEUINT8 elementIdx, MOBLEUINT16 msg_opcode, MOBLEUINT8 const *msg_buff, MOBLEUINT32 length, MOBLEBOOL ack_flag, MOBLEUINT8 isVendor) @@ -604,7 +1159,7 @@ MOBLE_RESULT MeshClient_SetRemotePublication(MOBLEUINT32 modelId, MOBLEUINT16 el srcAddress = BLEMesh_GetAddress(); srcAddress += elementIdx; /* Get the Address to send in the message */ - return BLEMesh_SetRemotePublication(GENERIC_MODEL_SERVER_ONOFF_MODEL_ID, + return BLEMesh_SetRemotePublication(modelId, srcAddress , msg_opcode , msg_buff, length, @@ -634,4 +1189,4 @@ __weak void Test_Process(void) * @} */ -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ +/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ |