diff --git a/MLight/MLight.slcp b/MLight/MLight.slcp index ee178f2..02e532a 100644 --- a/MLight/MLight.slcp +++ b/MLight/MLight.slcp @@ -23,8 +23,6 @@ component: - id: zigbee_end_device_support condition: [ zigbee_pro_leaf_stack ] - id: zigbee_source_route - - id: zigbee_enhanced_routing - condition: [ zigbee_pro_router_stack, zigbee_r23_support ] - id: bluetooth_stack - id: gatt_configuration - id: bluetooth_feature_system @@ -83,6 +81,12 @@ component: - {id: zigbee_ota_storage_simple_eeprom} - {id: slot_manager} - {from: raz1_custom_components, id: rz_led_blink} + - id: power_configuration_server + from: raz1_custom_components + condition: [ mgm210la22jif ] + - id: power_configuration_server + from: raz1_custom_components + condition: [ efr32mg12p332f1024gl125 ] configuration: - name: SL_BOARD_ENABLE_VCOM @@ -212,6 +216,11 @@ configuration: value: USE_FIRST_SLOT condition: - zigbee_ota_client + - name: SL_POWER_CONFIGURATION_BATTERY_TYPE + value: SL_POWER_CONFIGURATION_BATTERY_TYPE_18650 + condition: + - efr32mg12p332f1024gl125 + - power_configuration_server define: - name: OS_CFG_COMPAT_INIT @@ -224,6 +233,7 @@ source: - path: mods/device-nwk-join-control.c - path: mods/rz_button_press.h - path: mods/rz_button_press.c + - path: mods/battery-controller.c - path: light/hw_light.h - path: light/hw_light.c - path: light/logical_light.h @@ -249,6 +259,21 @@ config_file: path: template/brd4181b/sl_simple_rgb_pwm_led_rgb_led0_config.h - path: template/rz_button_press_config.h file_id: rz_button_press_configuration_file_id + - path: template/tbs2/sl_battery_monitor_config.h + override: + component: "%extension-raz1_custom_components%sl_battery_monitor_v2" + file_id: sl_battery_monitor_config + condition: [ sl_battery_monitor, efr32mg12p332f1024gl125 ] + - path: template/brd_mgm210_expansion/sl_battery_monitor_config.h + override: + component: "%extension-raz1_custom_components%sl_battery_monitor_v2" + file_id: sl_battery_monitor_config + condition: [ sl_battery_monitor, mgm210la22jif ] + - path: template/brd_mgm210_expansion/power_configuration_server_config.h + override: + component: "%extension-raz1_custom_components%power_configuration_server" + file_id: power_configuration_server + condition: [ sl_battery_monitor, mgm210la22jif ] include: - path: ./ @@ -259,4 +284,4 @@ tag: sdk_extension: - id: raz1_custom_components - version: 0.0.2 \ No newline at end of file + version: 0.0.3 \ No newline at end of file diff --git a/MLight/config/zcl/zcl_config.zap b/MLight/config/zcl/zcl_config.zap index 1d39094..4371938 100644 --- a/MLight/config/zcl/zcl_config.zap +++ b/MLight/config/zcl/zcl_config.zap @@ -19,7 +19,7 @@ "package": [ { "pathRelativity": "relativeToZap", - "path": "..\\..\\..\\..\\..\\..\\SimplicityStudio\\SDKs\\gecko_sdk\\app\\zcl\\zcl-zap.json", + "path": "..\\..\\..\\..\\..\\..\\..\\SimplicityStudio\\SDKs\\gecko_sdk\\app\\zcl\\zcl-zap.json", "type": "zcl-properties", "category": "zigbee", "version": 1, @@ -27,7 +27,7 @@ }, { "pathRelativity": "relativeToZap", - "path": "..\\..\\..\\..\\..\\..\\SimplicityStudio\\SDKs\\gecko_sdk\\protocol\\zigbee\\app\\framework\\gen-template\\gen-templates.json", + "path": "..\\..\\..\\..\\..\\..\\..\\SimplicityStudio\\SDKs\\gecko_sdk\\protocol\\zigbee\\app\\framework\\gen-template\\gen-templates.json", "type": "gen-templates-json", "category": "zigbee", "version": "zigbee-v0" @@ -90,8 +90,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x08", + "bounded": null, + "defaultValue": "8", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -106,8 +106,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -122,8 +122,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -138,8 +138,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -186,8 +186,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -202,8 +202,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -218,8 +218,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0xFF", + "bounded": null, + "defaultValue": "255", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -234,8 +234,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0xFF", + "bounded": null, + "defaultValue": "255", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -250,8 +250,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -266,8 +266,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -282,8 +282,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -298,8 +298,66 @@ "included": 1, "storageOption": "RAM", "singleton": 1, + "bounded": null, + "defaultValue": "1", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + } + ] + }, + { + "name": "Power Configuration", + "code": 1, + "mfgCode": null, + "define": "POWER_CONFIG_CLUSTER", + "side": "server", + "enabled": 1, + "attributes": [ + { + "name": "battery voltage", + "code": 32, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 1, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "", + "reportable": 1, + "minInterval": 30, + "maxInterval": 3600, + "reportableChange": 1 + }, + { + "name": "battery percentage remaining", + "code": 33, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 1, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 30, + "maxInterval": 10800, + "reportableChange": 1 + }, + { + "name": "cluster revision", + "code": 65533, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 1, + "bounded": 0, + "defaultValue": "2", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -358,8 +416,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -374,8 +432,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -482,8 +540,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -498,8 +556,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -654,8 +712,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -670,8 +728,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -686,8 +744,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -702,8 +760,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -718,8 +776,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -734,8 +792,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -810,8 +868,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 900, @@ -826,8 +884,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x01", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -842,8 +900,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -858,8 +916,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -874,8 +932,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -890,8 +948,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -982,8 +1040,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xFE", + "bounded": null, + "defaultValue": "254", "reportable": 1, "minInterval": 2, "maxInterval": 900, @@ -998,8 +1056,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -1014,8 +1072,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -1030,8 +1088,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -1046,8 +1104,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xFE", + "bounded": null, + "defaultValue": "254", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -1062,8 +1120,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -1078,8 +1136,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -1094,8 +1152,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xFE", + "bounded": null, + "defaultValue": "254", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -1110,8 +1168,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -1162,8 +1220,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xffffffffffffffff", + "bounded": null, + "defaultValue": "-1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -1178,8 +1236,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xffffffff", + "bounded": null, + "defaultValue": "4294967295", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -1194,8 +1252,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -1210,8 +1268,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2186,8 +2244,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2253,8 +2311,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x08", + "bounded": null, + "defaultValue": "8", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2269,8 +2327,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2285,8 +2343,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2301,8 +2359,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2349,8 +2407,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2365,8 +2423,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2381,8 +2439,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0xFF", + "bounded": null, + "defaultValue": "255", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2397,8 +2455,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0xFF", + "bounded": null, + "defaultValue": "255", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2413,8 +2471,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2429,8 +2487,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2445,8 +2503,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "uninitialized", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2461,8 +2519,66 @@ "included": 1, "storageOption": "RAM", "singleton": 1, + "bounded": null, + "defaultValue": "1", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + } + ] + }, + { + "name": "Power Configuration", + "code": 1, + "mfgCode": null, + "define": "POWER_CONFIG_CLUSTER", + "side": "server", + "enabled": 1, + "attributes": [ + { + "name": "battery voltage", + "code": 32, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 1, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "", + "reportable": 1, + "minInterval": 30, + "maxInterval": 3600, + "reportableChange": 1 + }, + { + "name": "battery percentage remaining", + "code": 33, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 1, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 30, + "maxInterval": 10800, + "reportableChange": 1 + }, + { + "name": "cluster revision", + "code": 65533, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 1, + "bounded": 0, + "defaultValue": "2", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2521,8 +2637,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2537,8 +2653,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2645,8 +2761,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2661,8 +2777,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2817,8 +2933,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2833,8 +2949,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2849,8 +2965,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2865,8 +2981,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2881,8 +2997,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2897,8 +3013,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -2973,8 +3089,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 900, @@ -2989,8 +3105,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x01", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3005,8 +3121,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3021,8 +3137,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3037,8 +3153,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3053,8 +3169,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3145,8 +3261,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xFE", + "bounded": null, + "defaultValue": "254", "reportable": 1, "minInterval": 2, "maxInterval": 900, @@ -3161,8 +3277,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3177,8 +3293,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3193,8 +3309,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3209,8 +3325,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xFE", + "bounded": null, + "defaultValue": "254", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3225,8 +3341,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3241,8 +3357,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3257,8 +3373,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xFE", + "bounded": null, + "defaultValue": "254", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3273,8 +3389,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3325,8 +3441,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xffffffffffffffff", + "bounded": null, + "defaultValue": "-1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3341,8 +3457,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xffffffff", + "bounded": null, + "defaultValue": "4294967295", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3357,8 +3473,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3373,8 +3489,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3399,8 +3515,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3571,8 +3687,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3638,8 +3754,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x08", + "bounded": null, + "defaultValue": "8", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3654,8 +3770,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3670,8 +3786,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3686,8 +3802,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3734,8 +3850,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3750,8 +3866,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3766,8 +3882,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0xFF", + "bounded": null, + "defaultValue": "255", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3782,8 +3898,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0xFF", + "bounded": null, + "defaultValue": "255", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3798,8 +3914,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3814,8 +3930,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3830,8 +3946,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "uninitialized", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3846,8 +3962,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3906,8 +4022,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -3922,8 +4038,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4030,8 +4146,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4046,8 +4162,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4202,8 +4318,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4218,8 +4334,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4234,8 +4350,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4250,8 +4366,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4266,8 +4382,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4282,8 +4398,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4358,8 +4474,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 900, @@ -4374,8 +4490,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x01", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4390,8 +4506,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4406,8 +4522,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4422,8 +4538,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4438,8 +4554,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4530,8 +4646,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xFE", + "bounded": null, + "defaultValue": "254", "reportable": 1, "minInterval": 2, "maxInterval": 900, @@ -4546,8 +4662,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4562,8 +4678,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4578,8 +4694,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4594,8 +4710,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xFE", + "bounded": null, + "defaultValue": "254", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4610,8 +4726,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4626,8 +4742,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4642,8 +4758,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xFE", + "bounded": null, + "defaultValue": "254", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4658,8 +4774,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4710,8 +4826,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xffffffffffffffff", + "bounded": null, + "defaultValue": "-1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4726,8 +4842,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xffffffff", + "bounded": null, + "defaultValue": "4294967295", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4742,8 +4858,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4758,8 +4874,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4784,8 +4900,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -4956,8 +5072,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5023,8 +5139,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x08", + "bounded": null, + "defaultValue": "8", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5039,8 +5155,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5055,8 +5171,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5071,8 +5187,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5119,8 +5235,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5135,8 +5251,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5151,8 +5267,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0xFF", + "bounded": null, + "defaultValue": "255", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5167,8 +5283,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0xFF", + "bounded": null, + "defaultValue": "255", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5183,8 +5299,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5199,8 +5315,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5215,8 +5331,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "uninitialized", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5231,8 +5347,8 @@ "included": 1, "storageOption": "RAM", "singleton": 1, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5291,8 +5407,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5307,8 +5423,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5415,8 +5531,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5431,8 +5547,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5587,8 +5703,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5603,8 +5719,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5619,8 +5735,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5635,8 +5751,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5651,8 +5767,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5667,8 +5783,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5743,8 +5859,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 900, @@ -5759,8 +5875,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x01", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5775,8 +5891,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5791,8 +5907,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5807,8 +5923,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5823,8 +5939,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5915,8 +6031,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xFE", + "bounded": null, + "defaultValue": "254", "reportable": 1, "minInterval": 2, "maxInterval": 900, @@ -5931,8 +6047,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5947,8 +6063,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5963,8 +6079,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0000", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5979,8 +6095,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xFE", + "bounded": null, + "defaultValue": "254", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5995,8 +6111,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -6011,8 +6127,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -6027,8 +6143,8 @@ "included": 1, "storageOption": "NVM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xFE", + "bounded": null, + "defaultValue": "254", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -6043,8 +6159,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -6095,8 +6211,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xffffffffffffffff", + "bounded": null, + "defaultValue": "-1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -6111,8 +6227,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0xffffffff", + "bounded": null, + "defaultValue": "4294967295", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -6127,8 +6243,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", + "bounded": null, + "defaultValue": "0", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -6143,8 +6259,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -6169,8 +6285,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -6341,8 +6457,8 @@ "included": 1, "storageOption": "RAM", "singleton": 0, - "bounded": 0, - "defaultValue": "0x0001", + "bounded": null, + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, diff --git a/MLight/mods/battery-controller.c b/MLight/mods/battery-controller.c new file mode 100644 index 0000000..d8b92c7 --- /dev/null +++ b/MLight/mods/battery-controller.c @@ -0,0 +1,15 @@ +#include "sl_component_catalog.h" + +#ifdef SL_CATALOG_SL_BATTERY_MONITOR_PRESENT +#include + +#include "app.h" + +void emberAfPowerConfigurationClusterBatteryUpdated(uint8_t endpoint, + uint8_t battery_double_percent, + uint16_t battery_milliV) +{ + sl_zigbee_app_debug_println("%d Battery voltage %dmV, %d%% remaining", + TIMESTAMP_MS, battery_milliV, battery_double_percent>>1); +} +#endif // SL_CATALOG_SL_BATTERY_MONITOR_PRESENT \ No newline at end of file diff --git a/MLight/mods/device-nwk-join-control.c b/MLight/mods/device-nwk-join-control.c index fd3be20..45d79b9 100644 --- a/MLight/mods/device-nwk-join-control.c +++ b/MLight/mods/device-nwk-join-control.c @@ -18,6 +18,9 @@ #ifndef ZDO_POWER_DESCRIPTOR #define ZDO_POWER_DESCRIPTOR 0x0220 #endif // ZDO_POWER_DESCRIPTOR +#ifndef DEFAULT_IDENTIFY_DURATION_S +#define DEFAULT_IDENTIFY_DURATION_S 10 +#endif #define LED_BLINK_SHORT_MS 100 #define LED_BLINK_LONG_MS 750 @@ -271,7 +274,10 @@ EmberNetworkStatus dnjcInit(void) EmberNetworkStatus dnjcIndicateNetworkState(void) { EmberNetworkStatus nwkState = emberAfNetworkState(); - sl_zigbee_app_debug_println("%d Indicating Current Network State: %d", TIMESTAMP_MS, nwkState); + sl_zigbee_app_debug_println("%d Indicating Current Network State: %d, sleep control: %d", + TIMESTAMP_MS, + nwkState, + emberAfGetDefaultSleepControlCallback()); switch (nwkState) { case EMBER_JOINED_NETWORK: @@ -320,7 +326,7 @@ static bool writeIdentifyTime(uint16_t identifyTime) static void startIdentifying(void) { - writeIdentifyTime(180); + writeIdentifyTime(DEFAULT_IDENTIFY_DURATION_S); } static void stopIdentifying(void) diff --git a/MLight/template/brd_mgm210_expansion/power_configuration_server_config.h b/MLight/template/brd_mgm210_expansion/power_configuration_server_config.h new file mode 100644 index 0000000..6a9cd6b --- /dev/null +++ b/MLight/template/brd_mgm210_expansion/power_configuration_server_config.h @@ -0,0 +1,54 @@ +/******************************************************************************* + * @file + * @brief Power Configuration Server Cluster + ******************************************************************************* + * # License + * Copyright 2023 Alexei Chetroi + ******************************************************************************* + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + ******************************************************************************/ + +#ifndef SL_POWER_CONFIGURATION_SERVER_CONFIG_H +#define SL_POWER_CONFIGURATION_SERVER_CONFIG_H + +#define SL_POWER_CONFIGURATION_BATTERY_TYPE_CUSTOM 0 +#define SL_POWER_CONFIGURATION_BATTERY_TYPE_CR2032 1 +#define SL_POWER_CONFIGURATION_BATTERY_TYPE_18650 2 + +#define SL_POWER_CONFIGURATION_BATTERY_VOLTAGE_CAPACITY \ + { { 4.2, 100 }, { 4.0, 95 }, { 3.95, 90 }, { 3.9, 80 }, { 3.8, 70 }, \ + { 3.75, 60 }, { 3.7, 50 }, { 3.60, 40 }, { 3.55, 30 }, { 3.50, 20 }, \ + { 3.4, 10 }, { 3.3, 5 }, { 3.0, 0 } }; + +// <<< Use Configuration Wizard in Context Menu >>> + +// Power Configuration Server Cluster configuration + +// Battery Type +// Default: CR2032 +// Indicates the battery type in use. +// CUSTOM +// CR2032 +// 18650 +#define SL_POWER_CONFIGURATION_BATTERY_TYPE SL_POWER_CONFIGURATION_BATTERY_TYPE_CUSTOM + +// + +// <<< end of configuration section >>> +#endif // SL_POWER_CONFIGURATION_SERVER_CONFIG_H diff --git a/MLight/template/brd_mgm210_expansion/sl_battery_monitor_config.h b/MLight/template/brd_mgm210_expansion/sl_battery_monitor_config.h new file mode 100644 index 0000000..73c391d --- /dev/null +++ b/MLight/template/brd_mgm210_expansion/sl_battery_monitor_config.h @@ -0,0 +1,153 @@ +/***************************************************************************//** + * @file + * @brief sl_battery_monitor Config + ******************************************************************************* + * # License + * Copyright 2019 Silicon Laboratories Inc. www.silabs.com + ******************************************************************************* + * + * The licensor of this software is Silicon Laboratories Inc. Your use of this + * software is governed by the terms of Silicon Labs Master Software License + * Agreement (MSLA) available at + * www.silabs.com/about-us/legal/master-software-license-agreement. This + * software is distributed to you in Source Code format and is governed by the + * sections of the MSLA applicable to Source Code. + * + ******************************************************************************/ + +#ifndef SL_BATTERY_MONITOR_CONFIG_H +#define SL_BATTERY_MONITOR_CONFIG_H + +#include "em_iadc.h" + +// <<< Use Configuration Wizard in Context Menu + +// Battery Monitor settings +// Monitor Timeout (Minutes) +// <1..1000:1> +// Default: 30 +// The length of time between battery reads. +#define SL_BATTERY_MONITOR_TIMEOUT_MINUTES 60 + +// Sample Collection FIFO Size +// <1..20:1> +// Default: 16 +// The number of entries in the fifo used to collect ADC reads of the battery +#define SL_BATTERY_MONITOR_SAMPLE_FIFO_SIZE 16 + +// IADC Pos Select Input +// Default: Avdd +// Avdd +// Vddio +// Dvdd +// Decouple +// PortAPin0 +// PortAPin1 +// PortAPin2 +// PortAPin3 +// PortAPin4 +// PortAPin5 +// PortAPin6 +// PortAPin7 +// PortAPin8 +// PortAPin9 +// PortAPin10 +// PortAPin11 +// PortAPin12 +// PortAPin13 +// PortAPin14 +// PortAPin15 +// PortBPin0 +// PortBPin1 +// PortBPin2 +// PortBPin3 +// PortBPin4 +// PortBPin5 +// PortBPin6 +// PortBPin7 +// PortBPin8 +// PortBPin9 +// PortBPin10 +// PortBPin11 +// PortBPin12 +// PortBPin13 +// PortBPin14 +// PortBPin15 +// PortCPin0 +// PortCPin1 +// PortCPin2 +// PortCPin3 +// PortCPin4 +// PortCPin5 +// PortCPin6 +// PortCPin7 +// PortCPin8 +// PortCPin9 +// PortCPin10 +// PortCPin11 +// PortCPin12 +// PortCPin13 +// PortCPin14 +// PortCPin15 +// PortDPin0 +// PortDPin1 +// PortDPin2 +// PortDPin3 +// PortDPin4 +// PortDPin5 +// PortDPin6 +// PortDPin7 +// PortDPin8 +// PortDPin9 +// PortDPin10 +// PortDPin11 +// PortDPin12 +// PortDPin13 +// PortDPin14 +// PortDPin15 +#define SL_BATTERY_MONITOR_IADC_POS iadcPosInputPortDPin0 + +// IADC Analog Gain +// Default: x0.5 +// <_IADC_CFG_ANALOGGAIN_ANAGAIN0P5=> x0.5 +// <_IADC_CFG_ANALOGGAIN_ANAGAIN1=> x1 +// <_IADC_CFG_ANALOGGAIN_ANAGAIN2=> x2 +// <_IADC_CFG_ANALOGGAIN_ANAGAIN4=> x4 +#define SL_BATTERY_MONITOR_IADC_ANALOG_GAIN _IADC_CFG_ANALOGGAIN_ANAGAIN0P5 + +// Battery Voltage is using R1/R2 resistive divider +#define SL_BATTERY_MONITOR_R_DIVIDER_ENABLED 1 + +// R1 Resistive divider Input Voltage leg +#define SL_BATTERY_MONITOR_R_DIVIDER_R1 2700 + +// R2 Resistive divider Ground leg +#define SL_BATTERY_MONITOR_R_DIVIDER_R2 2700 +// + +// end Battery Monitor config +// <<< end of configuration section >>> + +#define SL_BATTERY_MONITOR_R_DIVIDER_R1_R2 (SL_BATTERY_MONITOR_R_DIVIDER_R1 \ + + SL_BATTERY_MONITOR_R_DIVIDER_R2) +#define SL_BATTERY_MONITOR_R_DIVIDER_COEF SL_BATTERY_MONITOR_R_DIVIDER_R1_R2 \ + / SL_BATTERY_MONITOR_R_DIVIDER_R2 + +// <<< sl:start pin_tool >>> +// SL_BATTERY_MONITOR_TX_ACTIVE +// $[PRS_SL_BATTERY_MONITOR_TX_ACTIVE] +#ifndef SL_BATTERY_MONITOR_TX_ACTIVE_CHANNEL +#define SL_BATTERY_MONITOR_TX_ACTIVE_CHANNEL 6 +#endif + +// PRS ASYNCH6 on PC01 +#ifndef SL_BATTERY_MONITOR_TX_ACTIVE_PORT +#define SL_BATTERY_MONITOR_TX_ACTIVE_PORT gpioPortC +#endif +#ifndef SL_BATTERY_MONITOR_TX_ACTIVE_PIN +#define SL_BATTERY_MONITOR_TX_ACTIVE_PIN 1 +#endif +// [PRS_SL_BATTERY_MONITOR_TX_ACTIVE]$ +// <<< sl:end pin_tool >>> + +#endif // SL_BATTERY_MONITOR_CONFIG_H diff --git a/MLight/template/tbs2/sl_battery_monitor_config.h b/MLight/template/tbs2/sl_battery_monitor_config.h new file mode 100644 index 0000000..1316494 --- /dev/null +++ b/MLight/template/tbs2/sl_battery_monitor_config.h @@ -0,0 +1,252 @@ +/***************************************************************************//** + * @file + * @brief sl_battery_monitor Config + ******************************************************************************* + * # License + * Copyright 2019 Silicon Laboratories Inc. www.silabs.com + ******************************************************************************* + * + * The licensor of this software is Silicon Laboratories Inc. Your use of this + * software is governed by the terms of Silicon Labs Master Software License + * Agreement (MSLA) available at + * www.silabs.com/about-us/legal/master-software-license-agreement. This + * software is distributed to you in Source Code format and is governed by the + * sections of the MSLA applicable to Source Code. + * + ******************************************************************************/ + +#ifndef SL_BATTERY_MONITOR_CONFIG_H +#define SL_BATTERY_MONITOR_CONFIG_H + +#include "em_adc.h" + +// <<< Use Configuration Wizard in Context Menu + +// Battery Monitor settings + +// Monitor Timeout (Minutes) +// <1..1000:1> +// Default: 30 +// The length of time between battery reads. +#define SL_BATTERY_MONITOR_TIMEOUT_MINUTES 60 + +// Sample Collection FIFO Size +// <1..20:1> +// Default: 16 +// The number of entries in the fifo used to collect ADC reads of the battery +#define SL_BATTERY_MONITOR_SAMPLE_FIFO_SIZE 16 + +// ADC Pos Select Input +// Default: AVDD +// AVDD +// APORT0XCH0 +// APORT0XCH1 +// APORT0XCH2 +// APORT0XCH3 +// APORT0XCH4 +// APORT0XCH5 +// APORT0XCH6 +// APORT0XCH7 +// APORT0XCH8 +// APORT0XCH9 +// APORT0XCH10 +// APORT0XCH11 +// APORT0XCH12 +// APORT0XCH13 +// APORT0XCH14 +// APORT0XCH15 +// APORT0YCH0 +// APORT0YCH1 +// APORT0YCH2 +// APORT0YCH3 +// APORT0YCH4 +// APORT0YCH5 +// APORT0YCH6 +// APORT0YCH7 +// APORT0YCH8 +// APORT0YCH9 +// APORT0YCH10 +// APORT0YCH11 +// APORT0YCH12 +// APORT0YCH13 +// APORT0YCH14 +// APORT0YCH15 +// APORT1XCH0 +// APORT1YCH1 +// APORT1XCH2 +// APORT1YCH3 +// APORT1XCH4 +// APORT1YCH5 +// APORT1XCH6 +// APORT1YCH7 +// APORT1XCH8 +// APORT1YCH9 +// APORT1XCH10 +// APORT1YCH11 +// APORT1XCH12 +// APORT1YCH13 +// APORT1XCH14 +// APORT1YCH15 +// APORT1XCH16 +// APORT1YCH17 +// APORT1XCH18 +// APORT1YCH19 +// APORT1XCH20 +// APORT1YCH21 +// APORT1XCH22 +// APORT1YCH23 +// APORT1XCH24 +// APORT1YCH25 +// APORT1XCH26 +// APORT1YCH27 +// APORT1XCH28 +// APORT1YCH29 +// APORT1XCH30 +// APORT1YCH31 +// APORT2YCH0 +// APORT2XCH1 +// APORT2YCH2 +// APORT2XCH3 +// APORT2YCH4 +// APORT2XCH5 +// APORT2YCH6 +// APORT2XCH7 +// APORT2YCH8 +// APORT2XCH9 +// APORT2YCH10 +// APORT2XCH11 +// APORT2YCH12 +// APORT2XCH13 +// APORT2YCH14 +// APORT2XCH15 +// APORT2YCH16 +// APORT2XCH17 +// APORT2YCH18 +// APORT2XCH19 +// APORT2YCH20 +// APORT2XCH21 +// APORT2YCH22 +// APORT2XCH23 +// APORT2YCH24 +// APORT2XCH25 +// APORT2YCH26 +// APORT2XCH27 +// APORT2YCH28 +// APORT2XCH29 +// APORT2YCH30 +// APORT2XCH31 +// APORT3XCH0 +// APORT3YCH1 +// APORT3XCH2 +// APORT3YCH3 +// APORT3XCH4 +// APORT3YCH5 +// APORT3XCH6 +// APORT3YCH7 +// APORT3XCH8 +// APORT3YCH9 +// APORT3XCH10 +// APORT3YCH11 +// APORT3XCH12 +// APORT3YCH13 +// APORT3XCH14 +// APORT3YCH15 +// APORT3XCH16 +// APORT3YCH17 +// APORT3XCH18 +// APORT3YCH19 +// APORT3XCH20 +// APORT3YCH21 +// APORT3XCH22 +// APORT3YCH23 +// APORT3XCH24 +// APORT3YCH25 +// APORT3XCH26 +// APORT3YCH27 +// APORT3XCH28 +// APORT3YCH29 +// APORT3XCH30 +// APORT3YCH31 +// APORT4YCH0 +// APORT4XCH1 +// APORT4YCH2 +// APORT4XCH3 +// APORT4YCH4 +// APORT4XCH5 +// APORT4YCH6 +// APORT4XCH7 +// APORT4YCH8 +// APORT4XCH9 +// APORT4YCH10 +// APORT4XCH11 +// APORT4YCH12 +// APORT4XCH13 +// APORT4YCH14 +// APORT4XCH15 +// APORT4YCH16 +// APORT4XCH17 +// APORT4YCH18 +// APORT4XCH19 +// APORT4YCH20 +// APORT4XCH21 +// APORT4YCH22 +// APORT4XCH23 +// APORT4YCH24 +// APORT4XCH25 +// APORT4YCH26 +// APORT4XCH27 +// APORT4YCH28 +// APORT4XCH29 +// APORT4YCH30 +// APORT4XCH31 +// AVDD +// BUVDD +// DVDD +// PAVDD +// DECOUPLE +// IOVDD +// IOVDD1 +// VSP +// OPA2 +// TEMP +// DAC0OUT0 +// R5VOUT +// SP1 +// SP2 +// DAC0OUT1 +// SUBLSB +// OPA3 +// DEFAULT +// VSS +#define SL_BATTERY_MONITOR_ADC_POS_SEL adcPosSelAPORT3XCH14 + +// Battery Voltage is using R1/R2 resistive divider +#define SL_BATTERY_MONITOR_R_DIVIDER_ENABLED 1 + +// R1 Resistive divider Input Voltage leg +#define SL_BATTERY_MONITOR_R_DIVIDER_R1 1800 + +// R2 Resistive divider Ground leg +#define SL_BATTERY_MONITOR_R_DIVIDER_R2 2700 +// + +// end Battery Monitor config +// <<< end of configuration section >>> + +#define SL_BATTERY_MONITOR_R_DIVIDER_R1_R2 (SL_BATTERY_MONITOR_R_DIVIDER_R1 \ + + SL_BATTERY_MONITOR_R_DIVIDER_R2) +#define SL_BATTERY_MONITOR_R_DIVIDER_COEF SL_BATTERY_MONITOR_R_DIVIDER_R1_R2 \ + / SL_BATTERY_MONITOR_R_DIVIDER_R2 + + +// <<< sl:start pin_tool >>> +// SL_BATTERY_MONITOR_TX_ACTIVE +// $[PRS_SL_BATTERY_MONITOR_TX_ACTIVE] +#define SL_BATTERY_MONITOR_TX_ACTIVE_CHANNEL 0 +#define SL_BATTERY_MONITOR_TX_ACTIVE_PORT gpioPortC +#define SL_BATTERY_MONITOR_TX_ACTIVE_PIN 6 +#define SL_BATTERY_MONITOR_TX_ACTIVE_LOC 8 +// [PRS_SL_BATTERY_MONITOR_TX_ACTIVE]$ +// <<< sl:end pin_tool >>> + +#endif // SL_BATTERY_MONITOR_CONFIG_H \ No newline at end of file