Changeset 248 for uKadecot

Timestamp:

Jul 13, 2016, 8:10:39 AM (7 years ago)

Author:

coas-nagasima

Message:

SVNプロパティにUTF-8を付加

Location:

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices

Files:

• ClassGroupList.json (modified) (1 diff, 1 prop)
• ClassList00.json (modified) (44 diffs, 1 prop)
• ClassList01.json (modified) (31 diffs, 1 prop)
• ClassList02.json (modified) (46 diffs, 1 prop)
• ClassList03.json (modified) (36 diffs, 1 prop)
• ClassList04.json (modified) (5 diffs, 1 prop)
• ClassList05.json (modified) (4 diffs, 1 prop)
• ClassList06.json (modified) (2 diffs, 1 prop)
• ClassList0E.json (modified) (1 diff, 1 prop)
• ClassList0F.json (modified) (1 prop)
• PropertyList0001.json (modified) (62 diffs, 1 prop)
• PropertyList0002.json (modified) (62 diffs, 1 prop)
• PropertyList0003.json (modified) (60 diffs, 1 prop)
• PropertyList0004.json (modified) (62 diffs, 1 prop)
• PropertyList0005.json (modified) (62 diffs, 1 prop)
• PropertyList0006.json (modified) (62 diffs, 1 prop)
• PropertyList0007.json (modified) (60 diffs, 1 prop)
• PropertyList0008.json (modified) (59 diffs, 1 prop)
• PropertyList0009.json (modified) (59 diffs, 1 prop)
• PropertyList000A.json (modified) (60 diffs, 1 prop)
• PropertyList000B.json (modified) (60 diffs, 1 prop)
• PropertyList000C.json (modified) (58 diffs, 1 prop)
• PropertyList000D.json (modified) (59 diffs, 1 prop)
• PropertyList000E.json (modified) (59 diffs, 1 prop)
• PropertyList000F.json (modified) (60 diffs, 1 prop)
• PropertyList0010.json (modified) (60 diffs, 1 prop)
• PropertyList0011.json (modified) (58 diffs, 1 prop)
• PropertyList0012.json (modified) (58 diffs, 1 prop)
• PropertyList0013.json (modified) (60 diffs, 1 prop)
• PropertyList0014.json (modified) (61 diffs, 1 prop)
• PropertyList0015.json (modified) (61 diffs, 1 prop)
• PropertyList0016.json (modified) (60 diffs, 1 prop)
• PropertyList0017.json (modified) (60 diffs, 1 prop)
• PropertyList0018.json (modified) (60 diffs, 1 prop)
• PropertyList0019.json (modified) (62 diffs, 1 prop)
• PropertyList001A.json (modified) (60 diffs, 1 prop)
• PropertyList001B.json (modified) (58 diffs, 1 prop)
• PropertyList001C.json (modified) (61 diffs, 1 prop)
• PropertyList001D.json (modified) (61 diffs, 1 prop)
• PropertyList001E.json (modified) (58 diffs, 1 prop)
• PropertyList001F.json (modified) (59 diffs, 1 prop)
• PropertyList0020.json (modified) (60 diffs, 1 prop)
• PropertyList0021.json (modified) (62 diffs, 1 prop)
• PropertyList0022.json (modified) (64 diffs, 1 prop)
• PropertyList0023.json (modified) (60 diffs, 1 prop)
• PropertyList0025.json (modified) (59 diffs, 1 prop)
• PropertyList0026.json (modified) (61 diffs, 1 prop)
• PropertyList0027.json (modified) (59 diffs, 1 prop)
• PropertyList0028.json (modified) (60 diffs, 1 prop)
• PropertyList0029.json (modified) (62 diffs, 1 prop)
• PropertyList002A.json (modified) (62 diffs, 1 prop)
• PropertyList002B.json (modified) (63 diffs, 1 prop)
• PropertyList002C.json (modified) (60 diffs, 1 prop)
• PropertyList0130.json (modified) (110 diffs, 1 prop)
• PropertyList0133.json (modified) (57 diffs, 1 prop)
• PropertyList0134.json (modified) (63 diffs, 1 prop)
• PropertyList0135.json (modified) (64 diffs, 1 prop)
• PropertyList0139.json (modified) (66 diffs, 1 prop)
• PropertyList0142.json (modified) (73 diffs, 1 prop)
• PropertyList0143.json (modified) (79 diffs, 1 prop)
• PropertyList0145.json (modified) (103 diffs, 1 prop)
• PropertyList0146.json (modified) (68 diffs, 1 prop)
• PropertyList0260.json (modified) (60 diffs, 1 prop)
• PropertyList0261.json (modified) (63 diffs, 1 prop)
• PropertyList0263.json (modified) (63 diffs, 1 prop)
• PropertyList0267.json (modified) (65 diffs, 1 prop)
• PropertyList026B.json (modified) (83 diffs, 1 prop)
• PropertyList026E.json (modified) (76 diffs, 1 prop)
• PropertyList026F.json (modified) (62 diffs, 1 prop)
• PropertyList0272.json (modified) (88 diffs, 1 prop)
• PropertyList0273.json (modified) (80 diffs, 1 prop)
• PropertyList0279.json (modified) (68 diffs, 1 prop)
• PropertyList027A.json (modified) (89 diffs, 1 prop)
• PropertyList027B.json (modified) (89 diffs, 1 prop)
• PropertyList027C.json (modified) (78 diffs, 1 prop)
• PropertyList027D.json (modified) (110 diffs, 1 prop)
• PropertyList027E.json (modified) (101 diffs, 1 prop)
• PropertyList027F.json (modified) (78 diffs, 1 prop)
• PropertyList0280.json (modified) (62 diffs, 1 prop)
• PropertyList0281.json (modified) (65 diffs, 1 prop)
• PropertyList0282.json (modified) (60 diffs, 1 prop)
• PropertyList0283.json (modified) (89 diffs, 1 prop)
• PropertyList0287.json (modified) (202 diffs, 1 prop)
• PropertyList0288.json (modified) (105 diffs, 1 prop)
• PropertyList0289.json (modified) (99 diffs, 1 prop)
• PropertyList0290.json (modified) (83 diffs, 1 prop)
• PropertyList02A0.json (modified) (57 diffs, 1 prop)
• PropertyList03B2.json (modified) (64 diffs, 1 prop)
• PropertyList03B7.json (modified) (99 diffs, 1 prop)
• PropertyList03B8.json (modified) (91 diffs, 1 prop)
• PropertyList03B9.json (modified) (70 diffs, 1 prop)
• PropertyList03BB.json (modified) (67 diffs, 1 prop)
• PropertyList03C5.json (modified) (68 diffs, 1 prop)
• PropertyList03C6.json (modified) (68 diffs, 1 prop)
• PropertyList03D3.json (modified) (120 diffs, 1 prop)
• PropertyList0405.json (modified) (59 diffs, 1 prop)
• PropertyList05FD.json (modified) (58 diffs, 1 prop)
• PropertyList0601.json (modified) (66 diffs, 1 prop)
• PropertyList0602.json (modified) (59 diffs, 1 prop)
• PropertyList0EF0.json (modified) (36 diffs, 1 prop)
• PropertyListBase.json (modified) (56 diffs, 1 prop)

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/ClassGroupList.json

@@ -2 +2 @@
         {
                 "classGroupCode":0,
-                "description":"センサー関連機器",
+                "description":"センサー関連機器",
                 "define":"EOJ_X1_SENSOR"
         },
         {
                 "classGroupCode":1,
-                "description":"空調関連機器",
+                "description":"空調関連機器",
                 "define":"EOJ_X1_AIR_CONDITIONER"
         },
         {
                 "classGroupCode":2,
-                "description":"住å®
-・設備関連機器",
+                "description":"住宅・設備関連機器",
                 "define":"EOJ_X1_AMENITY"
         },
         {
                 "classGroupCode":3,
-                "description":"調理・家事関連機器",
+                "description":"調理・家事関連機器",
                 "define":"EOJ_X1_HOUSEWORK"
         },
         {
                 "classGroupCode":4,
-                "description":"健康関連機器",
+                "description":"健康関連機器",
                 "define":"EOJ_X1_WELLNESS"
         },
         {
                 "classGroupCode":5,
-                "description":"管理・操作関連機器",
+                "description":"管理・操作関連機器",
                 "define":"EOJ_X1_CONTROLLER"
         },
         {
                 "classGroupCode":6,
-                "description":"AV関連機器",
+                "description":"AV関連機器",
                 "define":"EOJ_X1_AUDIO_VISUAL"
         },
         {
                 "classGroupCode":14,
-                "description":"プロファイル",
+                "description":"プロファイル",
                 "define":"EOJ_X1_PROFILE"
         },
         {
                 "classGroupCode":15,
-                "description":"ユーザー定義",
+                "description":"ユーザー定義",
                 "define":"EOJ_X1_USER_DEFINED"
         }

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/ClassList00.json

@@ -2 +2 @@
         {
                 "classCode":1,
-                "description":"ガス漏れセンサ",
+                "description":"ガス漏れセンサ",
                 "name":"GAS_LEAK_SENSOR_EOBJ",
                 "define":"EOJ_X2_GAS_LEAK_SENSOR",
@@ -9 +9 @@
         {
                 "classCode":2,
-                "description":"防犯センサ",
+                "description":"防犯センサ",
                 "name":"CRIME_PREVENTION_SENSOR_EOBJ",
                 "define":"EOJ_X2_CRIME_PREVENTION_SENSOR",
@@ -16 +16 @@
         {
                 "classCode":3,
-                "description":"非常ボタン",
+                "description":"非常ボタン",
                 "name":"EMERGENCY_BUTTON_EOBJ",
                 "define":"EOJ_X2_EMERGENCY_BUTTON",
@@ -23 +23 @@
         {
                 "classCode":4,
-                "description":"救急用センサ",
+                "description":"救急用センサ",
                 "name":"FIRST_AID_SENSOR_EOBJ",
                 "define":"EOJ_X2_FIRST_AID_SENSOR",
@@ -30 +30 @@
         {
                 "classCode":5,
-                "description":"地震センサ",
+                "description":"地震センサ",
                 "name":"EARTHQUAKE_SENSOR_EOBJ",
                 "define":"EOJ_X2_EARTHQUAKE_SENSOR",
@@ -37 +37 @@
         {
                 "classCode":6,
-                "description":"漏電センサ",
+                "description":"漏電センサ",
                 "name":"ELECTRIC_LEAK_SENSOR_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_LEAK_SENSOR",
@@ -44 +44 @@
         {
                 "classCode":7,
-                "description":"人体検知センサ",
+                "description":"人体検知センサ",
                 "name":"HUMAN_DETECTION_SENSOR_EOBJ",
                 "define":"EOJ_X2_HUMAN_DETECTION_SENSOR",
@@ -51 +51 @@
         {
                 "classCode":8,
-                "description":"来客センサ",
+                "description":"来客センサ",
                 "name":"VISITOR_SENSOR_EOBJ",
                 "define":"EOJ_X2_VISITOR_SENSOR",
@@ -58 +58 @@
         {
                 "classCode":9,
-                "description":"呼び出しセンサ",
+                "description":"呼び出しセンサ",
                 "name":"CALL_SENSOR_EOBJ",
                 "define":"EOJ_X2_CALL_SENSOR",
@@ -65 +65 @@
         {
                 "classCode":10,
-                "description":"結露センサ",
+                "description":"結露センサ",
                 "name":"CONDENSATION_SENSOR_EOBJ",
                 "define":"EOJ_X2_CONDENSATION_SENSOR",
@@ -72 +72 @@
         {
                 "classCode":11,
-                "description":"空気汚染センサ",
+                "description":"空気汚染センサ",
                 "name":"AIR_POLLUTION_SENSOR_EOBJ",
                 "define":"EOJ_X2_AIR_POLLUTION_SENSOR",
@@ -79 +79 @@
         {
                 "classCode":12,
-                "description":"é
-¸ç´ センサ",
+                "description":"酸素センサ",
                 "name":"OXYGEN_SENSOR_EOBJ",
                 "define":"EOJ_X2_OXYGEN_SENSOR",
@@ -87 +86 @@
         {
                 "classCode":13,
-                "description":"ç
-§åº¦ã‚»ãƒ³ã‚µ",
+                "description":"照度センサ",
                 "name":"ILLUMINANCE_SENSOR_EOBJ",
                 "define":"EOJ_X2_ILLUMINANCE_SENSOR",
@@ -95 +93 @@
         {
                 "classCode":14,
-                "description":"音センサ",
+                "description":"音センサ",
                 "name":"SOUND_SENSOR_EOBJ",
                 "define":"EOJ_X2_SOUND_SENSOR",
@@ -102 +100 @@
         {
                 "classCode":15,
-                "description":"投函センサ",
+                "description":"投函センサ",
                 "name":"MAILING_SENSOR_EOBJ",
                 "define":"EOJ_X2_MAILING_SENSOR",
@@ -109 +107 @@
         {
                 "classCode":16,
-                "description":"重荷センサ",
+                "description":"重荷センサ",
                 "name":"WEIGHT_SENSOR_EOBJ",
                 "define":"EOJ_X2_WEIGHT_SENSOR",
@@ -116 +114 @@
         {
                 "classCode":17,
-                "description":"温度センサ",
+                "description":"温度センサ",
                 "name":"TEMPERATURE_SENSOR_EOBJ",
                 "define":"EOJ_X2_TEMPERATURE_SENSOR",
@@ -123 +121 @@
         {
                 "classCode":18,
-                "description":"湿度センサ",
+                "description":"湿度センサ",
                 "name":"HUMIDITY_SENSOR_EOBJ",
                 "define":"EOJ_X2_HUMIDITY_SENSOR",
@@ -130 +128 @@
         {
                 "classCode":19,
-                "description":"雨センサ",
+                "description":"雨センサ",
                 "name":"RAIN_SENSOR_EOBJ",
                 "define":"EOJ_X2_RAIN_SENSOR",
@@ -137 +135 @@
         {
                 "classCode":20,
-                "description":"水位センサ",
+                "description":"水位センサ",
                 "name":"WATER_LEVEL_SENSOR_EOBJ",
                 "define":"EOJ_X2_WATER_LEVEL_SENSOR",
@@ -144 +142 @@
         {
                 "classCode":21,
-                "description":"風呂水位センサ",
+                "description":"風呂水位センサ",
                 "name":"BATH_WATER_LEVEL_SENSOR_EOBJ",
                 "define":"EOJ_X2_BATH_WATER_LEVEL_SENSOR",
@@ -151 +149 @@
         {
                 "classCode":22,
-                "description":"風呂沸き上がりセンサ",
+                "description":"風呂沸き上がりセンサ",
                 "name":"BATH_HEATING_STATUS_SENSOR_EOBJ",
                 "define":"EOJ_X2_BATH_HEATING_STATUS_SENSOR",
@@ -158 +156 @@
         {
                 "classCode":23,
-                "description":"水漏れセンサ",
+                "description":"水漏れセンサ",
                 "name":"WATER_LEAK_SENSOR_EOBJ",
                 "define":"EOJ_X2_WATER_LEAK_SENSOR",
@@ -165 +163 @@
         {
                 "classCode":24,
-                "description":"水あふれセンサ",
+                "description":"水あふれセンサ",
                 "name":"WATER_OVERFLOW_SENSOR_EOBJ",
                 "define":"EOJ_X2_WATER_OVERFLOW_SENSOR",
@@ -172 +170 @@
         {
                 "classCode":25,
-                "description":"火災センサ",
+                "description":"火災センサ",
                 "name":"FIRE_SENSOR_EOBJ",
                 "define":"EOJ_X2_FIRE_SENSOR",
@@ -179 +177 @@
         {
                 "classCode":26,
-                "description":"タバコç
-™ã‚»ãƒ³ã‚µ",
+                "description":"タバコ煙センサ",
                 "name":"CIGARETTE_SMOKE_SENSOR_EOBJ",
                 "define":"EOJ_X2_CIGARETTE_SMOKE_SENSOR",
@@ -187 +184 @@
         {
                 "classCode":27,
-                "description":"CO2センサ",
+                "description":"CO2センサ",
                 "name":"CO2_SENSOR_EOBJ",
                 "define":"EOJ_X2_CO2_SENSOR",
@@ -194 +191 @@
         {
                 "classCode":28,
-                "description":"ガスセンサ",
+                "description":"ガスセンサ",
                 "name":"GAS_SENSOR_EOBJ",
                 "define":"EOJ_X2_GAS_SENSOR",
@@ -201 +198 @@
         {
                 "classCode":29,
-                "description":"VOCセンサ",
+                "description":"VOCセンサ",
                 "name":"VOC_SENSOR_EOBJ",
                 "define":"EOJ_X2_VOC_SENSOR",
@@ -208 +205 @@
         {
                 "classCode":30,
-                "description":"差圧センサ",
+                "description":"差圧センサ",
                 "name":"DIFFERENTIAL_PRESSURE_SENSOR_EOBJ",
                 "define":"EOJ_X2_DIFFERENTIAL_PRESSURE_SENSOR",
@@ -215 +212 @@
         {
                 "classCode":31,
-                "description":"風速センサ",
+                "description":"風速センサ",
                 "name":"AIR_SPEED_SENSOR_EOBJ",
                 "define":"EOJ_X2_AIR_SPEED_SENSOR",
@@ -222 +219 @@
         {
                 "classCode":32,
-                "description":"臭いセンサ",
+                "description":"臭いセンサ",
                 "name":"ODOR_SENSOR_EOBJ",
                 "define":"EOJ_X2_ODOR_SENSOR",
@@ -229 +226 @@
         {
                 "classCode":33,
-                "description":"炎センサ",
+                "description":"炎センサ",
                 "name":"FLAME_SENSOR_EOBJ",
                 "define":"EOJ_X2_FLAME_SENSOR",
@@ -236 +233 @@
         {
                 "classCode":34,
-                "description":"電力量センサ",
+                "description":"電力量センサ",
                 "name":"ELECTRIC_ENERGY_SENSOR_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_ENERGY_SENSOR",
@@ -243 +240 @@
         {
                 "classCode":35,
-                "description":"電流値センサ",
+                "description":"電流値センサ",
                 "name":"CURRENT_VALUE_SENSOR_EOBJ",
                 "define":"EOJ_X2_CURRENT_VALUE_SENSOR",
@@ -250 +247 @@
         {
                 "classCode":36,
-                "description":"昼å
-‰ã‚»ãƒ³ã‚µ",
+                "description":"昼光センサ",
                 "name":"DAYLIGHT_SENSOR_EOBJ",
                 "define":"EOJ_X2_DAYLIGHT_SENSOR",
@@ -258 +254 @@
         {
                 "classCode":37,
-                "description":"水流量センサ",
+                "description":"水流量センサ",
                 "name":"WATER_FLOW_RATE_SENSOR_EOBJ",
                 "define":"EOJ_X2_WATER_FLOW_RATE_SENSOR",
@@ -265 +261 @@
         {
                 "classCode":38,
-                "description":"微動センサ",
+                "description":"微動センサ",
                 "name":"MICROMOTION_SENSOR_EOBJ",
                 "define":"EOJ_X2_MICROMOTION_SENSOR",
@@ -272 +268 @@
         {
                 "classCode":39,
-                "description":"通過センサ",
+                "description":"通過センサ",
                 "name":"PASSAGE_SENSOR_EOBJ",
                 "define":"EOJ_X2_PASSAGE_SENSOR",
@@ -279 +275 @@
         {
                 "classCode":40,
-                "description":"在床センサ",
+                "description":"在床センサ",
                 "name":"BED_PRESENCE_SENSOR_EOBJ",
                 "define":"EOJ_X2_BED_PRESENCE_SENSOR",
@@ -286 +282 @@
         {
                 "classCode":41,
-                "description":"開閉センサ",
+                "description":"開閉センサ",
                 "name":"OPEN_CLOSE_SENSOR_EOBJ",
                 "define":"EOJ_X2_OPEN_CLOSE_SENSOR",
@@ -293 +289 @@
         {
                 "classCode":42,
-                "description":"活動量センサ",
+                "description":"活動量センサ",
                 "name":"ACTIVITY_AMOUNT_SENSOR_EOBJ",
                 "define":"EOJ_X2_ACTIVITY_AMOUNT_SENSOR",
@@ -300 +296 @@
         {
                 "classCode":43,
-                "description":"人体位置センサ",
+                "description":"人体位置センサ",
                 "name":"HUMAN_BODY_LOCATION_SENSOR_EOBJ",
                 "define":"EOJ_X2_HUMAN_BODY_LOCATION_SENSOR",
@@ -307 +303 @@
         {
                 "classCode":44,
-                "description":"雪センサ",
+                "description":"雪センサ",
                 "name":"SNOW_SENSOR_EOBJ",
                 "define":"EOJ_X2_SNOW_SENSOR",

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/ClassList01.json

@@ -2 +2 @@
         {
                 "classCode":48,
-                "description":"家庭用エアコン",
+                "description":"家庭用エアコン",
                 "name":"HOME_AIR_CONDITIONER_EOBJ",
                 "define":"EOJ_X2_HOME_AIR_CONDITIONER",
@@ -9 +9 @@
         {
                 "classCode":49,
-                "description":"冷風機",
+                "description":"冷風機",
                 "name":"COLD_BLASTER_EOBJ",
                 "define":"EOJ_X2_COLD_BLASTER",
@@ -16 +16 @@
         {
                 "classCode":50,
-                "description":"扇風機",
+                "description":"扇風機",
                 "name":"ELECTRIC_FAN_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_FAN",
@@ -23 +23 @@
         {
                 "classCode":51,
-                "description":"換気扇",
+                "description":"換気扇",
                 "name":"VENTILATION_FAN_EOBJ",
                 "define":"EOJ_X2_VENTILATION_FAN",
@@ -30 +30 @@
         {
                 "classCode":52,
-                "description":"空調換気扇",
+                "description":"空調換気扇",
                 "name":"AIR_CONDITIONING_VENTILATION_FAN_EOBJ",
                 "define":"EOJ_X2_AIR_CONDITIONING_VENTILATION_FAN",
@@ -37 +37 @@
         {
                 "classCode":53,
-                "description":"空気æ¸
-浄器",
+                "description":"空気清浄器",
                 "name":"AIR_CLEANER_EOBJ",
                 "define":"EOJ_X2_AIR_CLEANER",
@@ -45 +44 @@
         {
                 "classCode":54,
-                "description":"冷風扇",
+                "description":"冷風扇",
                 "name":"COLD_BLAST_FAN_EOBJ",
                 "define":"EOJ_X2_COLD_BLAST_FAN",
@@ -52 +51 @@
         {
                 "classCode":55,
-                "description":"サーキュレータ",
+                "description":"サーキュレータ",
                 "name":"CIRCULATOR_EOBJ",
                 "define":"EOJ_X2_CIRCULATOR",
@@ -59 +58 @@
         {
                 "classCode":56,
-                "description":"除湿機",
+                "description":"除湿機",
                 "name":"DEHUMIDIFIER_EOBJ",
                 "define":"EOJ_X2_DEHUMIDIFIER",
@@ -66 +65 @@
         {
                 "classCode":57,
-                "description":"åŠ æ¹¿å™¨",
+                "description":"加湿器",
                 "name":"HUMIDIFIER_EOBJ",
                 "define":"EOJ_X2_HUMIDIFIER",
@@ -73 +72 @@
         {
                 "classCode":58,
-                "description":"天井扇",
+                "description":"天井扇",
                 "name":"CEILING_FAN_EOBJ",
                 "define":"EOJ_X2_CEILING_FAN",
@@ -80 +79 @@
         {
                 "classCode":59,
-                "description":"電気こたつ",
+                "description":"電気こたつ",
                 "name":"ELECTRIC_KOTATSU_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_KOTATSU",
@@ -87 +86 @@
         {
                 "classCode":60,
-                "description":"電気あんか",
+                "description":"電気あんか",
                 "name":"ELECTRIC_HEATING_PAD_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_HEATING_PAD",
@@ -94 +93 @@
         {
                 "classCode":61,
-                "description":"電気毛布",
+                "description":"電気毛布",
                 "name":"ELECTRIC_BLANKET_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_BLANKET",
@@ -101 +100 @@
         {
                 "classCode":62,
-                "description":"ストーブ",
+                "description":"ストーブ",
                 "name":"SPACE_HEATER_EOBJ",
                 "define":"EOJ_X2_SPACE_HEATER",
@@ -108 +107 @@
         {
                 "classCode":63,
-                "description":"パネルヒータ",
+                "description":"パネルヒータ",
                 "name":"PANEL_HEATER_EOBJ",
                 "define":"EOJ_X2_PANEL_HEATER",
@@ -115 +114 @@
         {
                 "classCode":64,
-                "description":"電気カーペット",
+                "description":"電気カーペット",
                 "name":"ELECTRIC_CARPET_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_CARPET",
@@ -122 +121 @@
         {
                 "classCode":65,
-                "description":"フロアヒータ",
+                "description":"フロアヒータ",
                 "name":"FLOOR_HEATER_EOBJ",
                 "define":"EOJ_X2_FLOOR_HEATER",
@@ -129 +128 @@
         {
                 "classCode":66,
-                "description":"電気暖房機",
+                "description":"電気暖房機",
                 "name":"ELECTRIC_HEATER_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_HEATER",
@@ -136 +135 @@
         {
                 "classCode":67,
-                "description":"ファンヒータ",
+                "description":"ファンヒータ",
                 "name":"FAN_HEATER_EOBJ",
                 "define":"EOJ_X2_FAN_HEATER",
@@ -143 +142 @@
         {
                 "classCode":68,
-                "description":"å
-
-電器",
+                "description":"充電器",
                 "name":"BATTERY_CHARGER_EOBJ",
                 "define":"EOJ_X2_BATTERY_CHARGER",
@@ -152 +149 @@
         {
                 "classCode":69,
-                "description":"業務用パッケージエアコン室å†
-機",
+                "description":"業務用パッケージエアコン室内機",
                 "name":"PACKAGE_TYPE_COMMERCIAL_AIR_CONDITIONER_INDOOR_UNIT_EOBJ",
                 "define":"EOJ_X2_PACKAGE_TYPE_COMMERCIAL_AIR_CONDITIONER_INDOOR_UNIT",
@@ -160 +156 @@
         {
                 "classCode":70,
-                "description":"業務用パッケージエアコン室外機",
+                "description":"業務用パッケージエアコン室外機",
                 "name":"PACKAGE_TYPE_COMMERCIAL_AIR_CONDITIONER_OUTDOOR_UNIT_EOBJ",
                 "define":"EOJ_X2_PACKAGE_TYPE_COMMERCIAL_AIR_CONDITIONER_OUTDOOR_UNIT",
@@ -167 +163 @@
         {
                 "classCode":71,
-                "description":"業務用パッケージエアコン蓄熱ユニット",
+                "description":"業務用パッケージエアコン蓄熱ユニット",
                 "name":"PACKAGE_TYPE_COMMERCIAL_AIR_CONDITIONER_THERMAL_STORAGE_UNIT_EOBJ",
                 "define":"EOJ_X2_PACKAGE_TYPE_COMMERCIAL_AIR_CONDITIONER_THERMAL_STORAGE_UNIT",
@@ -174 +170 @@
         {
                 "classCode":72,
-                "description":"業務用ファンコイルユニット",
+                "description":"業務用ファンコイルユニット",
                 "name":"COMMERCIAL_FAN_COIL_UNIT_EOBJ",
                 "define":"EOJ_X2_COMMERCIAL_FAN_COIL_UNIT",
@@ -181 +177 @@
         {
                 "classCode":73,
-                "description":"業務用空調冷熱源(チラー)",
+                "description":"業務用空調冷熱源(チラー)",
                 "name":"COMMERCIAL_AIR_CONDITIONING_COLD_SOURCE_CHILLER_EOBJ",
                 "define":"EOJ_X2_COMMERCIAL_AIR_CONDITIONING_COLD_SOURCE_CHILLER",
@@ -188 +184 @@
         {
                 "classCode":74,
-                "description":"業務用空調温熱源(ボイラー)",
+                "description":"業務用空調温熱源(ボイラー)",
                 "name":"COMMERCIAL_AIR_CONDITIONING_HOT_SOURCE_BOILER_EOBJ",
                 "define":"EOJ_X2_COMMERCIAL_AIR_CONDITIONING_HOT_SOURCE_BOILER",
@@ -195 +191 @@
         {
                 "classCode":75,
-                "description":"業務用空調VAV",
+                "description":"業務用空調VAV",
                 "name":"AIR_CONDITIONING_VAV_FOR_COMMERCIAL_APPLICATIONS_EOBJ",
                 "define":"EOJ_X2_AIR_CONDITIONING_VAV_FOR_COMMERCIAL_APPLICATIONS",
@@ -202 +198 @@
         {
                 "classCode":76,
-                "description":"業務用空調エアハンドリングユニット",
+                "description":"業務用空調エアハンドリングユニット",
                 "name":"AIR_HANDLING_UNIT_AIR_CONDITIONING_FOR_COMMERCIAL_APPLICATIONS_EOBJ",
                 "define":"EOJ_X2_AIR_HANDLING_UNIT_AIR_CONDITIONING_FOR_COMMERCIAL_APPLICATIONS",
@@ -209 +205 @@
         {
                 "classCode":77,
-                "description":"ユニットクーラー",
+                "description":"ユニットクーラー",
                 "name":"UNIT_COOLER_EOBJ",
                 "define":"EOJ_X2_UNIT_COOLER",
@@ -216 +212 @@
         {
                 "classCode":78,
-                "description":"業務用コンデンシングユニット",
+                "description":"業務用コンデンシングユニット",
                 "name":"CONDENSING_UNIT_FOR_COMMERCIAL_APPLICATIONS_EOBJ",
                 "define":"EOJ_X2_CONDENSING_UNIT_FOR_COMMERCIAL_APPLICATIONS",

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/ClassList02.json

@@ -2 +2 @@
         {
                 "classCode":96,
-                "description":"電動ブラインド",
+                "description":"電動ブラインド",
                 "name":"ELECTRICALLY_OPERATED_SHADE_EOBJ",
                 "define":"EOJ_X2_ELECTRICALLY_OPERATED_SHADE",
@@ -9 +9 @@
         {
                 "classCode":97,
-                "description":"電動シャッター",
+                "description":"電動シャッター",
                 "name":"ELECTRICALLY_OPERATED_SHUTTER_EOBJ",
                 "define":"EOJ_X2_ELECTRICALLY_OPERATED_SHUTTER",
@@ -16 +16 @@
         {
                 "classCode":98,
-                "description":"電動カーテン",
+                "description":"電動カーテン",
                 "name":"ELECTRICALLY_OPERATED_CURTAIN_EOBJ",
                 "define":"EOJ_X2_ELECTRICALLY_OPERATED_CURTAIN",
@@ -23 +23 @@
         {
                 "classCode":99,
-                "description":"電動雨戸",
+                "description":"電動雨戸",
                 "name":"ELECTRICALLY_OPERATED_STORM_WINDOW_EOBJ",
                 "define":"EOJ_X2_ELECTRICALLY_OPERATED_STORM_WINDOW",
@@ -30 +30 @@
         {
                 "classCode":100,
-                "description":"電動ガレージ",
+                "description":"電動ガレージ",
                 "name":"ELECTRICALLY_OPERATED_DOOR_EOBJ",
                 "define":"EOJ_X2_ELECTRICALLY_OPERATED_DOOR",
@@ -37 +37 @@
         {
                 "classCode":101,
-                "description":"電動天窓",
+                "description":"電動天窓",
                 "name":"ELECTRICALLY_OPERATED_SKYLIGHT_EOBJ",
                 "define":"EOJ_X2_ELECTRICALLY_OPERATED_SKYLIGHT",
@@ -44 +44 @@
         {
                 "classCode":102,
-                "description":"オーニング（日よけ）",
+                "description":"オーニング（日よけ）",
                 "name":"AWNING_EOBJ",
                 "define":"EOJ_X2_AWNING",
@@ -51 +51 @@
         {
                 "classCode":103,
-                "description":"散水器（庭用）",
+                "description":"散水器（庭用）",
                 "name":"GARDEN_SPRINKLER_EOBJ",
                 "define":"EOJ_X2_GARDEN_SPRINKLER",
@@ -58 +58 @@
         {
                 "classCode":104,
-                "description":"散水器（火災用）",
+                "description":"散水器（火災用）",
                 "name":"FIRE_SPRINKLER_EOBJ",
                 "define":"EOJ_X2_FIRE_SPRINKLER",
@@ -65 +65 @@
         {
                 "classCode":105,
-                "description":"噴水",
+                "description":"噴水",
                 "name":"FOUNTAIN_EOBJ",
                 "define":"EOJ_X2_FOUNTAIN",
@@ -72 +72 @@
         {
                 "classCode":106,
-                "description":"瞬間湯沸器",
+                "description":"瞬間湯沸器",
                 "name":"INSTANTANEOUS_WATER_HEATER_EOBJ",
                 "define":"EOJ_X2_INSTANTANEOUS_WATER_HEATER",
@@ -79 +79 @@
         {
                 "classCode":107,
-                "description":"電気温水器",
+                "description":"電気温水器",
                 "name":"ELECTRIC_WATER_HEATER_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_WATER_HEATER",
@@ -86 +86 @@
         {
                 "classCode":108,
-                "description":"太陽熱温水器",
+                "description":"太陽熱温水器",
                 "name":"SOLAR_WATER_HEATER_EOBJ",
                 "define":"EOJ_X2_SOLAR_WATER_HEATER",
@@ -93 +93 @@
         {
                 "classCode":109,
-                "description":"循環ポンプ",
+                "description":"循環ポンプ",
                 "name":"CIRCULATION_PUMP_EOBJ",
                 "define":"EOJ_X2_CIRCULATION_PUMP",
@@ -100 +100 @@
         {
                 "classCode":110,
-                "description":"電気便座（温水洗浄便座・暖房便座など）",
+                "description":"電気便座（温水洗浄便座・暖房便座など）",
                 "name":"BIDET_EQUIPPED_TOILET_EOBJ",
                 "define":"EOJ_X2_BIDET_EQUIPPED_TOILET",
@@ -107 +107 @@
         {
                 "classCode":111,
-                "description":"é›»æ°—éŒ ",
+                "description":"電気錠",
                 "name":"ELECTRIC_KEY_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_KEY",
@@ -114 +114 @@
         {
                 "classCode":112,
-                "description":"ガスå
-ƒå¼",
+                "description":"ガス元弁",
                 "name":"GAS_LINE_VALVE_EOBJ",
                 "define":"EOJ_X2_GAS_LINE_VALVE",
@@ -122 +121 @@
         {
                 "classCode":113,
-                "description":"ホームサウナ",
+                "description":"ホームサウナ",
                 "name":"HOME_SAUNA_EOBJ",
                 "define":"EOJ_X2_HOME_SAUNA",
@@ -129 +128 @@
         {
                 "classCode":114,
-                "description":"瞬間式給湯器",
+                "description":"瞬間式給湯器",
                 "name":"HOT_WATER_GENERATOR_EOBJ",
                 "define":"EOJ_X2_HOT_WATER_GENERATOR",
@@ -136 +135 @@
         {
                 "classCode":115,
-                "description":"浴室暖房乾燥機",
+                "description":"浴室暖房乾燥機",
                 "name":"BATHROOM_DRYER_EOBJ",
                 "define":"EOJ_X2_BATHROOM_DRYER",
@@ -143 +142 @@
         {
                 "classCode":116,
-                "description":"ホームエレベータ",
+                "description":"ホームエレベータ",
                 "name":"HOME_ELEVATOR_EOBJ",
                 "define":"EOJ_X2_HOME_ELEVATOR",
@@ -150 +149 @@
         {
                 "classCode":117,
-                "description":"電動間仕切り",
+                "description":"電動間仕切り",
                 "name":"ELECTRICALLY_OPERATED_ROOM_DIVIDER_EOBJ",
                 "define":"EOJ_X2_ELECTRICALLY_OPERATED_ROOM_DIVIDER",
@@ -157 +156 @@
         {
                 "classCode":118,
-                "description":"水平トランスファ",
+                "description":"水平トランスファ",
                 "name":"HORIZONTAL_TRANSFER_EOBJ",
                 "define":"EOJ_X2_HORIZONTAL_TRANSFER",
@@ -164 +163 @@
         {
                 "classCode":119,
-                "description":"電動物干し",
+                "description":"電動物干し",
                 "name":"ELECTRICALLY_OPERATED_CLOTHES_DRYING_POLE_EOBJ",
                 "define":"EOJ_X2_ELECTRICALLY_OPERATED_CLOTHES_DRYING_POLE",
@@ -171 +170 @@
         {
                 "classCode":120,
-                "description":"浄化槽",
+                "description":"浄化槽",
                 "name":"SEPTIC_TANK_EOBJ",
                 "define":"EOJ_X2_SEPTIC_TANK",
@@ -178 +177 @@
         {
                 "classCode":121,
-                "description":"住å®
-用太陽å
-‰ç™ºé›»",
+                "description":"住宅用太陽光発電",
                 "name":"HOME_SOLAR_POWER_GENERATION_EOBJ",
                 "define":"EOJ_X2_HOME_SOLAR_POWER_GENERATION",
@@ -187 +184 @@
         {
                 "classCode":122,
-                "description":"冷温水熱源機",
+                "description":"冷温水熱源機",
                 "name":"COLD_AND_HOT_WATER_HEAT_SOURCE_EQUIPMENT_EOBJ",
                 "define":"EOJ_X2_COLD_AND_HOT_WATER_HEAT_SOURCE_EQUIPMENT",
@@ -194 +191 @@
         {
                 "classCode":123,
-                "description":"床暖房",
+                "description":"床暖房",
                 "name":"FLOOR_HEATING_EOBJ",
                 "define":"EOJ_X2_FLOOR_HEATING",
@@ -201 +198 @@
         {
                 "classCode":124,
-                "description":"ç‡ƒæ–™é›»æ± ",
+                "description":"燃料電池",
                 "name":"FUEL_CELL_EOBJ",
                 "define":"EOJ_X2_FUEL_CELL",
@@ -208 +205 @@
         {
                 "classCode":125,
-                "description":"è“„é›»æ± ",
+                "description":"蓄電池",
                 "name":"STORAGE_BATTERY_EOBJ",
                 "define":"EOJ_X2_STORAGE_BATTERY",
@@ -215 +212 @@
         {
                 "classCode":126,
-                "description":"電気自動車å
-
-放電システム",
+                "description":"電気自動車充放電システム",
                 "name":"ELECTRIC_VEHICLE_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_VEHICLE",
@@ -224 +219 @@
         {
                 "classCode":127,
-                "description":"エンジンコージェネレーション",
+                "description":"エンジンコージェネレーション",
                 "name":"ENGINE_COGENERATION_EOBJ",
                 "define":"EOJ_X2_ENGINE_COGENERATION",
@@ -231 +226 @@
         {
                 "classCode":128,
-                "description":"電力量メータ",
+                "description":"電力量メータ",
                 "name":"ELECTRIC_ENERGY_METER_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_ENERGY_METER",
@@ -238 +233 @@
         {
                 "classCode":129,
-                "description":"水流量メータ",
+                "description":"水流量メータ",
                 "name":"WATER_FLOW_METER_EOBJ",
                 "define":"EOJ_X2_WATER_FLOW_METER",
@@ -245 +240 @@
         {
                 "classCode":130,
-                "description":"ガスメータ",
+                "description":"ガスメータ",
                 "name":"GAS_METER_EOBJ",
                 "define":"EOJ_X2_GAS_METER",
@@ -252 +247 @@
         {
                 "classCode":131,
-                "description":"ＬＰガスメータ",
+                "description":"ＬＰガスメータ",
                 "name":"LP_GAS_METERS_EOBJ",
                 "define":"EOJ_X2_LP_GAS_METERS",
@@ -259 +254 @@
         {
                 "classCode":132,
-                "description":"時計",
+                "description":"時計",
                 "name":"CLOCK_EOBJ",
                 "define":"EOJ_X2_CLOCK",
@@ -266 +261 @@
         {
                 "classCode":133,
-                "description":"自動ドア",
+                "description":"自動ドア",
                 "name":"AUTOMATIC_DOOR_EOBJ",
                 "define":"EOJ_X2_AUTOMATIC_DOOR",
@@ -273 +268 @@
         {
                 "classCode":134,
-                "description":"業務用エレベータ",
+                "description":"業務用エレベータ",
                 "name":"COMMERCIAL_ELEVATOR_EOBJ",
                 "define":"EOJ_X2_COMMERCIAL_ELEVATOR",
@@ -280 +275 @@
         {
                 "classCode":135,
-                "description":"分電盤メータリング",
+                "description":"分電盤メータリング",
                 "name":"DISTRIBUTION_PANEL_METERING_EOBJ",
                 "define":"EOJ_X2_DISTRIBUTION_PANEL_METERING",
@@ -287 +282 @@
         {
                 "classCode":136,
-                "description":"スマート電力量メータ",
+                "description":"スマート電力量メータ",
                 "name":"SMART_ELECTRIC_ENERGY_METER_EOBJ",
                 "define":"EOJ_X2_SMART_ELECTRIC_ENERGY_METER",
@@ -294 +289 @@
         {
                 "classCode":137,
-                "description":"スマートガスメータ",
+                "description":"スマートガスメータ",
                 "name":"SMART_GAS_METER_EOBJ",
                 "define":"EOJ_X2_SMART_GAS_METER",
@@ -301 +296 @@
         {
                 "classCode":144,
-                "description":"一般ç
-§æ˜Ž",
+                "description":"一般照明",
                 "name":"GENERAL_LIGHTING_CLASS_EOBJ",
                 "define":"EOJ_X2_GENERAL_LIGHTING_CLASS",
@@ -309 +303 @@
         {
                 "classCode":153,
-                "description":"非常ç
-§æ˜Ž",
+                "description":"非常照明",
                 "name":"EMERGENCY_LIGHTING_EOBJ",
                 "define":"EOJ_X2_EMERGENCY_LIGHTING",
@@ -317 +310 @@
         {
                 "classCode":157,
-                "description":"設備ç
-§æ˜Ž",
+                "description":"設備照明",
                 "name":"EQUIPMENT_LIGHT_EOBJ",
                 "define":"EOJ_X2_EQUIPMENT_LIGHT",
@@ -325 +317 @@
         {
                 "classCode":160,
-                "description":"ブザー",
+                "description":"ブザー",
                 "name":"BUZZER_EOBJ",
                 "define":"EOJ_X2_BUZZER",

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/ClassList03.json

@@ -2 +2 @@
         {
                 "classCode":176,
-                "description":"コーヒーメーカ",
+                "description":"コーヒーメーカ",
                 "name":"COFFEE_MACHINE_EOBJ",
                 "define":"EOJ_X2_COFFEE_MACHINE",
@@ -9 +9 @@
         {
                 "classCode":177,
-                "description":"コーヒーミル",
+                "description":"コーヒーミル",
                 "name":"COFFEE_MILL_EOBJ",
                 "define":"EOJ_X2_COFFEE_MILL",
@@ -16 +16 @@
         {
                 "classCode":178,
-                "description":"電気ポット",
+                "description":"電気ポット",
                 "name":"ELECTRIC_HOT_WATER_POT_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_HOT_WATER_POT",
@@ -23 +23 @@
         {
                 "classCode":179,
-                "description":"電気こんろ",
+                "description":"電気こんろ",
                 "name":"ELECTRIC_STOVE_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_STOVE",
@@ -30 +30 @@
         {
                 "classCode":180,
-                "description":"トースタ",
+                "description":"トースタ",
                 "name":"TOASTER_EOBJ",
                 "define":"EOJ_X2_TOASTER",
@@ -37 +37 @@
         {
                 "classCode":181,
-                "description":"ジューサ・ミキサ",
+                "description":"ジューサ・ミキサ",
                 "name":"JUICER_FOOD_MIXER_EOBJ",
                 "define":"EOJ_X2_JUICER_FOOD_MIXER",
@@ -44 +44 @@
         {
                 "classCode":182,
-                "description":"フードプロセッサ",
+                "description":"フードプロセッサ",
                 "name":"FOOD_PROCESSOR_EOBJ",
                 "define":"EOJ_X2_FOOD_PROCESSOR",
@@ -51 +51 @@
         {
                 "classCode":183,
-                "description":"冷凍冷蔵庫",
+                "description":"冷凍冷蔵庫",
                 "name":"REFRIGERATOR_FREEZER_EOBJ",
                 "define":"EOJ_X2_REFRIGERATOR_FREEZER",
@@ -58 +58 @@
         {
                 "classCode":184,
-                "description":"オーブンレンジ",
+                "description":"オーブンレンジ",
                 "name":"COMBINATION_MICROWAVE_OVEN_EOBJ",
                 "define":"EOJ_X2_COMBINATION_MICROWAVE_OVEN",
@@ -65 +65 @@
         {
                 "classCode":185,
-                "description":"クッキングヒータ",
+                "description":"クッキングヒータ",
                 "name":"COOKING_HEATER_EOBJ",
                 "define":"EOJ_X2_COOKING_HEATER",
@@ -72 +72 @@
         {
                 "classCode":186,
-                "description":"オーブン",
+                "description":"オーブン",
                 "name":"OVEN_EOBJ",
                 "define":"EOJ_X2_OVEN",
@@ -79 +79 @@
         {
                 "classCode":187,
-                "description":"炊飯器",
+                "description":"炊飯器",
                 "name":"RICE_COOKER_EOBJ",
                 "define":"EOJ_X2_RICE_COOKER",
@@ -86 +86 @@
         {
                 "classCode":188,
-                "description":"電子ジャー",
+                "description":"電子ジャー",
                 "name":"ELECTRONIC_JAR_EOBJ",
                 "define":"EOJ_X2_ELECTRONIC_JAR",
@@ -93 +93 @@
         {
                 "classCode":189,
-                "description":"食器洗い機",
+                "description":"食器洗い機",
                 "name":"DISH_WASHER_EOBJ",
                 "define":"EOJ_X2_DISH_WASHER",
@@ -100 +100 @@
         {
                 "classCode":190,
-                "description":"食器乾燥機",
+                "description":"食器乾燥機",
                 "name":"DISH_DRYER_EOBJ",
                 "define":"EOJ_X2_DISH_DRYER",
@@ -107 +107 @@
         {
                 "classCode":191,
-                "description":"電気もちつき機",
+                "description":"電気もちつき機",
                 "name":"ELECTRIC_RICE_CARD_COOKER_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_RICE_CARD_COOKER",
@@ -114 +114 @@
         {
                 "classCode":192,
-                "description":"保温機",
+                "description":"保温機",
                 "name":"KEEP_WARM_MACHINE_EOBJ",
                 "define":"EOJ_X2_KEEP_WARM_MACHINE",
@@ -121 +121 @@
         {
                 "classCode":193,
-                "description":"精米機",
+                "description":"精米機",
                 "name":"RICE_MILL_EOBJ",
                 "define":"EOJ_X2_RICE_MILL",
@@ -128 +128 @@
         {
                 "classCode":194,
-                "description":"自動製パン機",
+                "description":"自動製パン機",
                 "name":"AUTOMATIC_BREAD_COOKER_EOBJ",
                 "define":"EOJ_X2_AUTOMATIC_BREAD_COOKER",
@@ -135 +135 @@
         {
                 "classCode":195,
-                "description":"スロークッカ",
+                "description":"スロークッカ",
                 "name":"SLOW_COOKER_EOBJ",
                 "define":"EOJ_X2_SLOW_COOKER",
@@ -142 +142 @@
         {
                 "classCode":196,
-                "description":"電気漬物機",
+                "description":"電気漬物機",
                 "name":"ELECTRIC_PICKLES_COOKER_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_PICKLES_COOKER",
@@ -149 +149 @@
         {
                 "classCode":197,
-                "description":"洗濯機",
+                "description":"洗濯機",
                 "name":"WASHING_MACHINE_EOBJ",
                 "define":"EOJ_X2_WASHING_MACHINE",
@@ -156 +156 @@
         {
                 "classCode":198,
-                "description":"衣類乾燥機",
+                "description":"衣類乾燥機",
                 "name":"CLOTH_DRYER_EOBJ",
                 "define":"EOJ_X2_CLOTH_DRYER",
@@ -163 +163 @@
         {
                 "classCode":199,
-                "description":"電気アイロン",
+                "description":"電気アイロン",
                 "name":"ELECTRIC_IRON_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_IRON",
@@ -170 +170 @@
         {
                 "classCode":200,
-                "description":"ズボンプレッサ",
+                "description":"ズボンプレッサ",
                 "name":"TROUSER_PRESS_EOBJ",
                 "define":"EOJ_X2_TROUSER_PRESS",
@@ -177 +177 @@
         {
                 "classCode":201,
-                "description":"ふとん乾燥機",
+                "description":"ふとん乾燥機",
                 "name":"FUTON_DRYER_EOBJ",
                 "define":"EOJ_X2_FUTON_DRYER",
@@ -184 +184 @@
         {
                 "classCode":202,
-                "description":"小物・くつ乾燥機",
+                "description":"小物・くつ乾燥機",
                 "name":"SMALL_ARTICLE,_SHOES_DRYER_EOBJ",
                 "define":"EOJ_X2_SMALL_ARTICLE,_SHOES_DRYER",
@@ -191 +191 @@
         {
                 "classCode":203,
-                "description":"電気掃除機（セントラルクリーナ含む）",
+                "description":"電気掃除機（セントラルクリーナ含む）",
                 "name":"ELECTRIC_VACUUM_CLEANER_INCLUDING_CENTRAL_VACUUM_CLEANER_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_VACUUM_CLEANER_INCLUDING_CENTRAL_VACUUM_CLEANER",
@@ -198 +198 @@
         {
                 "classCode":204,
-                "description":"ディスポーザ",
+                "description":"ディスポーザ",
                 "name":"DISPOSER_EOBJ",
                 "define":"EOJ_X2_DISPOSER",
@@ -205 +205 @@
         {
                 "classCode":205,
-                "description":"電気蚊取り機",
+                "description":"電気蚊取り機",
                 "name":"ELECTRIC_MOSQUITO_CATCHER_EOBJ",
                 "define":"EOJ_X2_ELECTRIC_MOSQUITO_CATCHER",
@@ -212 +212 @@
         {
                 "classCode":206,
-                "description":"業務用ショーケース",
+                "description":"業務用ショーケース",
                 "name":"COMMERCIAL_SHOW_CASE_EOBJ",
                 "define":"EOJ_X2_COMMERCIAL_SHOW_CASE",
@@ -219 +219 @@
         {
                 "classCode":207,
-                "description":"業務用冷蔵庫",
+                "description":"業務用冷蔵庫",
                 "name":"COMMERCIAL_REFRIGERATOR_EOBJ",
                 "define":"EOJ_X2_COMMERCIAL_REFRIGERATOR",
@@ -226 +226 @@
         {
                 "classCode":208,
-                "description":"業務用ホットケース",
+                "description":"業務用ホットケース",
                 "name":"COMMERCIAL_HOT_CASE_EOBJ",
                 "define":"EOJ_X2_COMMERCIAL_HOT_CASE",
@@ -233 +233 @@
         {
                 "classCode":209,
-                "description":"業務用フライヤー",
+                "description":"業務用フライヤー",
                 "name":"COMMERCIAL_FRYER_EOBJ",
                 "define":"EOJ_X2_COMMERCIAL_FRYER",
@@ -240 +240 @@
         {
                 "classCode":210,
-                "description":"業務用電子レンジ",
+                "description":"業務用電子レンジ",
                 "name":"COMMERCIAL_MICROWAVE_OVEN_EOBJ",
                 "define":"EOJ_X2_COMMERCIAL_MICROWAVE_OVEN",
@@ -247 +247 @@
         {
                 "classCode":211,
-                "description":"洗濯乾燥機",
+                "description":"洗濯乾燥機",
                 "name":"WASHER_AND_DRYER_EOBJ",
                 "define":"EOJ_X2_WASHER_AND_DRYER",

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/ClassList04.json

@@ -2 +2 @@
         {
                 "classCode":1,
-                "description":"体重計",
+                "description":"体重計",
                 "name":"WEIGHING_MACHINE_EOBJ",
                 "define":"EOJ_X2_WEIGHING_MACHINE",
@@ -9 +9 @@
         {
                 "classCode":2,
-                "description":"体温計",
+                "description":"体温計",
                 "name":"CLINICAL_THERMOMETER_EOBJ",
                 "define":"EOJ_X2_CLINICAL_THERMOMETER",
@@ -16 +16 @@
         {
                 "classCode":3,
-                "description":"血圧計",
+                "description":"血圧計",
                 "name":"BLOOD_PRESSURE_METER_EOBJ",
                 "define":"EOJ_X2_BLOOD_PRESSURE_METER",
@@ -23 +23 @@
         {
                 "classCode":4,
-                "description":"血糖値計",
+                "description":"血糖値計",
                 "name":"BLOOD_SUGAR_METER_EOBJ",
                 "define":"EOJ_X2_BLOOD_SUGAR_METER",
@@ -30 +30 @@
         {
                 "classCode":5,
-                "description":"体脂肪計",
+                "description":"体脂肪計",
                 "name":"BODY_FAT_METER_EOBJ",
                 "define":"EOJ_X2_BODY_FAT_METER",

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/ClassList05.json

@@ -2 +2 @@
         {
                 "classCode": 252,
-                "description": "セキュア通信用å
-±æœ‰éµè¨­å®šãƒŽãƒ¼ãƒ‰",
+                "description": "セキュア通信用共有鍵設定ノード",
                 "name": "SECURE_COMMUNICATION_SHARED_KEY_SETUP_NODE_EOBJ",
                 "define": "EOJ_X2_SECURE_COMMUNICATION_SHARED_KEY_SETUP_NODE",
@@ -10 +9 @@
         {
                 "classCode": 253,
-                "description": "スイッチ（JEMA/HA端子対応）",
+                "description": "スイッチ（JEMA/HA端子対応）",
                 "name": "SWITCH_EOBJ",
                 "define": "EOJ_X2_SWITCH",
@@ -17 +16 @@
         {
                 "classCode": 254,
-                "description": "携帯端末",
+                "description": "携帯端末",
                 "name": "PORTABLE_TERMINAL_EOBJ",
                 "define": "EOJ_X2_PORTABLE_TERMINAL",
@@ -24 +23 @@
         {
                 "classCode": 255,
-                "description": "コントローラ",
+                "description": "コントローラ",
                 "name": "CONTROLLER_EOBJ",
                 "define": "EOJ_X2_CONTROLLER",

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/ClassList06.json

@@ -2 +2 @@
         {
                 "classCode":1,
-                "description":"ディスプレー",
+                "description":"ディスプレー",
                 "name":"DISPLAY_EOBJ",
                 "define":"EOJ_X2_DISPLAY",
@@ -9 +9 @@
         {
                 "classCode":2,
-                "description":"テレビ",
+                "description":"テレビ",
                 "name":"TELEVISION_EOBJ",
                 "define":"EOJ_X2_TELEVISION",

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/ClassList0E.json

@@ -2 +2 @@
         {
                 "classCode":240,
-                "description":"ノードプロファイルオブジェクト",
+                "description":"ノードプロファイルオブジェクト",
                 "name":"NODE_PROFILE_EOBJ",
                 "define":"EOJ_X2_NODE_PROFILE",

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/PropertyList0001.json

@@ -7 +7 @@
                 ],
                 "arrayCount":0,
-                "description":"動作状æ
-‹",
+                "description":"動作状態",
                 "fields":[
                         
@@ -31 +30 @@
                 ],
                 "arrayCount":0,
-                "description":"検知閾値レベル設定",
+                "description":"検知閾値レベル設定",
                 "fields":[
                         
@@ -46 +45 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x31～0x38"
+                "valueDescription":"0x31～0x38"
         },
         {
@@ -54 +53 @@
                 ],
                 "arrayCount":0,
-                "description":"ガス漏れ発生状æ
-‹",
+                "description":"ガス漏れ発生状態",
                 "fields":[
                         
@@ -70 +68 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=ガス漏れ発生有,0x42=ガス漏れ発生無"
+                "valueDescription":"0x41=ガス漏れ発生有,0x42=ガス漏れ発生無"
         },
         {
@@ -77 +75 @@
                 ],
                 "arrayCount":0,
-                "description":"ガス漏れ発生状æ
-‹ãƒªã‚»ãƒƒãƒˆè¨­å®š",
+                "description":"ガス漏れ発生状態リセット設定",
                 "fields":[
                         
@@ -93 +90 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x00=リセット"
+                "valueDescription":"0x00=リセット"
         },
         {
@@ -102 +99 @@
                 ],
                 "arrayCount":0,
-                "description":"è¨­ç½®å ´æ‰€",
+                "description":"設置場所",
                 "fields":[
                         
@@ -118 +115 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"2.2è¨­ç½®å ´æ‰€ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£å‚ç
-§"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"è¦æ ¼ï¼¶ï½
-ｒｓｉｏｎæƒ
-å ±",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"固定1(for future reserved)",
+                "valueDescription":"2.2設置場所プロパティ参照"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"規格Ｖｅｒｓｉｏｎ情報",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"固定1(for future reserved)",
                                 "fields":[
                                         
@@ -147 +141 @@
                         {
                                 "arrayCount":0,
-                                "description":"固定2(for future reserved)",
+                                "description":"固定2(for future reserved)",
                                 "fields":[
                                         
@@ -162 +156 @@
                         {
                                 "arrayCount":0,
-                                "description":"ãƒªãƒªãƒ¼ã‚¹é †ã‚’ASCIIで示す",
+                                "description":"リリース順をASCIIで示す",
                                 "fields":[
                                         
@@ -177 +171 @@
                         {
                                 "arrayCount":0,
-                                "description":"固定4(for future reserved)",
+                                "description":"固定4(for future reserved)",
                                 "fields":[
                                         
@@ -209 +203 @@
                 ],
                 "arrayCount":0,
-                "description":"識別番号",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"下位通信層IDフィールド",
+                "description":"識別番号",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"下位通信層IDフィールド",
                                 "fields":[
                                         
@@ -224 +218 @@
                                 "type":"uint8_t",
                                 "unitDescription":null,
-                                "valueDescription":"0x01～0xFD=ä¸‹ä½é€šä¿¡å±¤ã§ä½¿ç”¨ã•ã‚Œã‚‹é€šä¿¡ãƒ—ãƒ­ãƒˆã‚³ãƒ«ã§å›ºæœ‰ã®ç•ªå·ãŒæŒ¯ã‚‰ã‚Œã¦ã„ã‚‹å ´åˆã€ãƒ—ãƒ­ãƒˆã‚³ãƒ«åˆ¥ã«å¿œã˜ã¦ã€ä»»æ„ã«è¨­å®šï¼ˆECHONET Liteでは使用しない）,0x11～0x1F=電灯線a\/d方式,0x31～0x3F=特定小電力無線,0x41～0x4F=拡張HBS,0x51～0x5F=IrDA,0x61～0x6F=LonTalk,0x71～0x7F=Bluetooth,0x81～0x8F=イーサネット,0x91～0x9F=IEEE802.11\/11b,0xA1=電灯線c方式,0xB1=IPv6\/Ethernet,0xB2=IPv6\/6LoWPAN,0xFE=2から17バイトをメーカ規定。形式により設定（詳細説明参ç
-§ï¼‰,0xFF=2から9ãƒã‚¤ãƒˆã‚’ä¹±æ•°ã«ã‚ˆã‚Šç”Ÿæˆã™ã‚‹ãƒ—ãƒ­ãƒˆã‚³ãƒ«ã‚’ä¸‹ä½é€šä¿¡å±¤ã§ä½¿ç”¨ã™ã‚‹å ´åˆã«è¨­å®š,0x00=識別番号未設定"
+                                "valueDescription":"0x01～0xFD=下位通信層で使用される通信プロトコルで固有の番号が振られている場合、プロトコル別に応じて、任意に設定（ECHONET Liteでは使用しない）,0x11～0x1F=電灯線a\/d方式,0x31～0x3F=特定小電力無線,0x41～0x4F=拡張HBS,0x51～0x5F=IrDA,0x61～0x6F=LonTalk,0x71～0x7F=Bluetooth,0x81～0x8F=イーサネット,0x91～0x9F=IEEE802.11\/11b,0xA1=電灯線c方式,0xB1=IPv6\/Ethernet,0xB2=IPv6\/6LoWPAN,0xFE=2から17バイトをメーカ規定。形式により設定（詳細説明参照）,0xFF=2から9バイトを乱数により生成するプロトコルを下位通信層で使用する場合に設定,0x00=識別番号未設定"
                         },
                         {
                                 "arrayCount":16,
-                                "description":"固有番号フィールド",
+                                "description":"固有番号フィールド",
                                 "fields":[
                                         
@@ -261 +254 @@
                 ],
                 "arrayCount":0,
-                "description":"瞬時消費電力計測値",
+                "description":"瞬時消費電力計測値",
                 "fields":[
                         
@@ -276 +269 @@
                 "type":"uint16_t",
                 "unitDescription":"W",
-                "valueDescription":"0x0000～0xFFFD(0～65533W)"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"積算消費電力計測値",
+                "valueDescription":"0x0000～0xFFFD(0～65533W)"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"積算消費電力計測値",
                 "fields":[
                         
@@ -298 +291 @@
                 "type":"uint32_t",
                 "unitDescription":"kWh",
-                "valueDescription":"0x00000000～0x3B9AC9FF(0～999,999.999kWh)"
+                "valueDescription":"0x00000000～0x3B9AC9FF(0～999,999.999kWh)"
         },
         {
@@ -306 +299 @@
                 ],
                 "arrayCount":0,
-                "description":"メーカ異常コード",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"異常コード部のデータサイズ",
+                "description":"メーカ異常コード",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"異常コード部のデータサイズ",
                                 "fields":[
                                         
@@ -325 +318 @@
                         {
                                 "arrayCount":0,
-                                "description":"メーカーコード",
+                                "description":"メーカーコード",
                                 "fields":[
                                         {
                                                 "arrayCount":3,
-                                                "description":"メーカーコード",
+                                                "description":"メーカーコード",
                                                 "fields":[
                                                         
@@ -340 +333 @@
                                                 "type":"uint8_t",
                                                 "unitDescription":null,
-                                                "valueDescription":"ECHONETコンソーシアムで規定。"
+                                                "valueDescription":"ECHONETコンソーシアムで規定。"
                                         }
                                 ],
@@ -354 +347 @@
                         {
                                 "arrayCount":221,
-                                "description":"各メーカ独自の異常コード部",
+                                "description":"各メーカ独自の異常コード部",
                                 "fields":[
                                         
@@ -387 +380 @@
                 ],
                 "arrayCount":0,
-                "description":"電流制限設定",
+                "description":"電流制限設定",
                 "fields":[
                         
@@ -401 +394 @@
                 "size":1,
                 "type":"uint8_t",
-                "unitDescription":"ï¼
-",
-                "valueDescription":"0x00～0x64(0～100%)"
+                "unitDescription":"％",
+                "valueDescription":"0x00～0x64(0～100%)"
         },
         {
@@ -411 +403 @@
                 ],
                 "arrayCount":0,
-                "description":"異常発生状æ
-‹",
+                "description":"異常発生状態",
                 "fields":[
                         
@@ -427 +418 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=異常発生有,0x42=異常発生無"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"異常å†
-容",
+                "valueDescription":"0x41=異常発生有,0x42=異常発生無"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"異常内容",
                 "fields":[
                         
@@ -450 +440 @@
                 "type":"uint16_t",
                 "unitDescription":null,
-                "valueDescription":"2.5異常å†
-容プロパティ参ç
-§"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"メーカーコード",
+                "valueDescription":"2.5異常内容プロパティ参照"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"メーカーコード",
                 "fields":[
                         {
                                 "arrayCount":3,
-                                "description":"メーカーコード",
+                                "description":"メーカーコード",
                                 "fields":[
                                         
@@ -474 +462 @@
                                 "type":"uint8_t",
                                 "unitDescription":null,
-                                "valueDescription":"ECHONETコンソーシアムで規定。"
+                                "valueDescription":"ECHONETコンソーシアムで規定。"
                         }
                 ],
@@ -488 +476 @@
                 "type":"manufacturer_code_t",
                 "unitDescription":null,
-                "valueDescription":"(ECHONETコンソーシアムで規定。)"
+                "valueDescription":"(ECHONETコンソーシアムで規定。)"
         },
         {
@@ -495 +483 @@
                 ],
                 "arrayCount":3,
-                "description":"äº‹æ¥­å ´ã‚³ãƒ¼ãƒ‰",
+                "description":"事業場コード",
                 "fields":[
                         
@@ -510 +498 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"(各メーカ毎に規定。)"
+                "valueDescription":"(各メーカ毎に規定。)"
         },
         {
@@ -517 +505 @@
                 ],
                 "arrayCount":12,
-                "description":"商品コード",
+                "description":"商品コード",
                 "fields":[
                         
@@ -532 +520 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"(各メーカ毎に規定。)"
+                "valueDescription":"(各メーカ毎に規定。)"
         },
         {
@@ -539 +527 @@
                 ],
                 "arrayCount":12,
-                "description":"è£½é€ ç•ªå·",
+                "description":"製造番号",
                 "fields":[
                         
@@ -554 +542 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"(各メーカ毎に規定。)"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"è£½é€ å¹´æœˆæ—¥",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"å¹´",
+                "valueDescription":"(各メーカ毎に規定。)"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"製造年月日",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"年",
                                 "fields":[
                                         
@@ -575 +563 @@
                                 "size":2,
                                 "type":"uint16_t",
-                                "unitDescription":"å¹´",
-                                "valueDescription":"0x0001～0x270F(1～9999)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"月",
+                                "unitDescription":"年",
+                                "valueDescription":"0x0001～0x270F(1～9999)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"月",
                                 "fields":[
                                         
@@ -590 +578 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"月",
-                                "valueDescription":"0x01～0x0C(1～12)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"日",
+                                "unitDescription":"月",
+                                "valueDescription":"0x01～0x0C(1～12)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"日",
                                 "fields":[
                                         
@@ -605 +593 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"日",
-                                "valueDescription":"0x01～0x1F(1～31)"
+                                "unitDescription":"日",
+                                "valueDescription":"0x01～0x1F(1～31)"
                         }
                 ],
@@ -628 +616 @@
                 ],
                 "arrayCount":0,
-                "description":"節電動作設定",
+                "description":"節電動作設定",
                 "fields":[
                         
@@ -643 +631 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=節電動作中,0x42=通常動作中"
+                "valueDescription":"0x41=節電動作中,0x42=通常動作中"
         },
         {
@@ -651 +639 @@
                 ],
                 "arrayCount":0,
-                "description":"é éš”æ“ä½œè¨­å®š",
+                "description":"遠隔操作設定",
                 "fields":[
                         
@@ -666 +654 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=å
-¬è¡†å›žç·šæœªçµŒç”±æ“ä½œ,0x42=å
-¬è¡†å›žç·šçµŒç”±æ“ä½œ"
+                "valueDescription":"0x41=公衆回線未経由操作,0x42=公衆回線経由操作"
         },
         {
@@ -676 +662 @@
                 ],
                 "arrayCount":0,
-                "description":"現在時刻設定",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"時",
+                "description":"現在時刻設定",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"時",
                                 "fields":[
                                         
@@ -690 +676 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"時",
-                                "valueDescription":"0x00～0x17(0～23)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"分",
+                                "unitDescription":"時",
+                                "valueDescription":"0x00～0x17(0～23)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"分",
                                 "fields":[
                                         
@@ -705 +691 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"分",
-                                "valueDescription":"0x00～0x3B(0～59)"
+                                "unitDescription":"分",
+                                "valueDescription":"0x00～0x3B(0～59)"
                         }
                 ],
@@ -728 +714 @@
                 ],
                 "arrayCount":0,
-                "description":"現在年月日設定",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"å¹´",
+                "description":"現在年月日設定",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"年",
                                 "fields":[
                                         
@@ -742 +728 @@
                                 "size":2,
                                 "type":"uint16_t",
-                                "unitDescription":"å¹´",
-                                "valueDescription":"0x0001～0x270F(1～9999)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"月",
+                                "unitDescription":"年",
+                                "valueDescription":"0x0001～0x270F(1～9999)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"月",
                                 "fields":[
                                         
@@ -757 +743 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"月",
-                                "valueDescription":"0x01～0x0C(1～12)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"日",
+                                "unitDescription":"月",
+                                "valueDescription":"0x01～0x0C(1～12)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"日",
                                 "fields":[
                                         
@@ -772 +758 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"日",
-                                "valueDescription":"0x01～0x1F(1～31)"
+                                "unitDescription":"日",
+                                "valueDescription":"0x01～0x1F(1～31)"
                         }
                 ],
@@ -795 +781 @@
                 ],
                 "arrayCount":0,
-                "description":"電力制限設定",
+                "description":"電力制限設定",
                 "fields":[
                         
@@ -810 +796 @@
                 "type":"uint16_t",
                 "unitDescription":null,
-                "valueDescription":"0x0000～0xFFFF(0～65535W)"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"積算運転時間",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"単位",
+                "valueDescription":"0x0000～0xFFFF(0～65535W)"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"積算運転時間",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"単位",
                                 "fields":[
                                         
@@ -832 +818 @@
                                 "type":"uint8_t",
                                 "unitDescription":null,
-                                "valueDescription":"0x41=秒,0x42=分,0x43=時,0x44=日"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"経過時間",
+                                "valueDescription":"0x41=秒,0x42=分,0x43=時,0x44=日"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"経過時間",
                                 "fields":[
                                         
@@ -847 +833 @@
                                 "type":"uint32_t",
                                 "unitDescription":null,
-                                "valueDescription":"0x00000000～0xFFFFFFFF(0～4294967295)"
+                                "valueDescription":"0x00000000～0xFFFFFFFF(0～4294967295)"
                         }
                 ],
@@ -869 +855 @@
                 ],
                 "arrayCount":17,
-                "description":"ï¼³ï½
-ｔＭプロパティマップ",
+                "description":"ＳｅｔＭプロパティマップ",
                 "fields":[
                         
@@ -885 +870 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -894 +878 @@
                 ],
                 "arrayCount":17,
-                "description":"Ｇï½
-ｔＭプロパティマップ",
+                "description":"ＧｅｔＭプロパティマップ",
                 "fields":[
                         
@@ -910 +893 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -919 +901 @@
                 ],
                 "arrayCount":17,
-                "description":"状変アナウンスプロパティマップ",
+                "description":"状変アナウンスプロパティマップ",
                 "fields":[
                         
@@ -934 +916 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -943 +924 @@
                 ],
                 "arrayCount":17,
-                "description":"ï¼³ï½
-ｔプロパティマップ",
+                "description":"Ｓｅｔプロパティマップ",
                 "fields":[
                         
@@ -959 +939 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -968 +947 @@
                 ],
                 "arrayCount":17,
-                "description":"Ｇï½
-ｔプロパティマップ",
+                "description":"Ｇｅｔプロパティマップ",
                 "fields":[
                         
@@ -984 +962 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         }
 ]

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/PropertyList0002.json

@@ -7 +7 @@
                 ],
                 "arrayCount":0,
-                "description":"動作状æ
-‹",
+                "description":"動作状態",
                 "fields":[
                         
@@ -31 +30 @@
                 ],
                 "arrayCount":0,
-                "description":"検知閾値レベル設定",
+                "description":"検知閾値レベル設定",
                 "fields":[
                         
@@ -46 +45 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x31～0x38"
+                "valueDescription":"0x31～0x38"
         },
         {
@@ -54 +53 @@
                 ],
                 "arrayCount":0,
-                "description":"ä¾µå
-¥ç™ºç”ŸçŠ¶æ
-‹",
+                "description":"侵入発生状態",
                 "fields":[
                         
@@ -71 +68 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=ä¾µå
-¥ç™ºç”Ÿæœ‰,0x42=ä¾µå
-¥ç™ºç”Ÿç„¡"
+                "valueDescription":"0x41=侵入発生有,0x42=侵入発生無"
         },
         {
@@ -80 +75 @@
                 ],
                 "arrayCount":0,
-                "description":"ä¾µå
-¥ç™ºç”ŸçŠ¶æ
-‹ãƒªã‚»ãƒƒãƒˆè¨­å®š",
+                "description":"侵入発生状態リセット設定",
                 "fields":[
                         
@@ -97 +90 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x00=リセット"
+                "valueDescription":"0x00=リセット"
         },
         {
@@ -106 +99 @@
                 ],
                 "arrayCount":0,
-                "description":"è¨­ç½®å ´æ‰€",
+                "description":"設置場所",
                 "fields":[
                         
@@ -122 +115 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"2.2è¨­ç½®å ´æ‰€ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£å‚ç
-§"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"è¦æ ¼ï¼¶ï½
-ｒｓｉｏｎæƒ
-å ±",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"固定1(for future reserved)",
+                "valueDescription":"2.2設置場所プロパティ参照"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"規格Ｖｅｒｓｉｏｎ情報",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"固定1(for future reserved)",
                                 "fields":[
                                         
@@ -151 +141 @@
                         {
                                 "arrayCount":0,
-                                "description":"固定2(for future reserved)",
+                                "description":"固定2(for future reserved)",
                                 "fields":[
                                         
@@ -166 +156 @@
                         {
                                 "arrayCount":0,
-                                "description":"ãƒªãƒªãƒ¼ã‚¹é †ã‚’ASCIIで示す",
+                                "description":"リリース順をASCIIで示す",
                                 "fields":[
                                         
@@ -181 +171 @@
                         {
                                 "arrayCount":0,
-                                "description":"固定4(for future reserved)",
+                                "description":"固定4(for future reserved)",
                                 "fields":[
                                         
@@ -213 +203 @@
                 ],
                 "arrayCount":0,
-                "description":"識別番号",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"下位通信層IDフィールド",
+                "description":"識別番号",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"下位通信層IDフィールド",
                                 "fields":[
                                         
@@ -228 +218 @@
                                 "type":"uint8_t",
                                 "unitDescription":null,
-                                "valueDescription":"0x01～0xFD=ä¸‹ä½é€šä¿¡å±¤ã§ä½¿ç”¨ã•ã‚Œã‚‹é€šä¿¡ãƒ—ãƒ­ãƒˆã‚³ãƒ«ã§å›ºæœ‰ã®ç•ªå·ãŒæŒ¯ã‚‰ã‚Œã¦ã„ã‚‹å ´åˆã€ãƒ—ãƒ­ãƒˆã‚³ãƒ«åˆ¥ã«å¿œã˜ã¦ã€ä»»æ„ã«è¨­å®šï¼ˆECHONET Liteでは使用しない）,0x11～0x1F=電灯線a\/d方式,0x31～0x3F=特定小電力無線,0x41～0x4F=拡張HBS,0x51～0x5F=IrDA,0x61～0x6F=LonTalk,0x71～0x7F=Bluetooth,0x81～0x8F=イーサネット,0x91～0x9F=IEEE802.11\/11b,0xA1=電灯線c方式,0xB1=IPv6\/Ethernet,0xB2=IPv6\/6LoWPAN,0xFE=2から17バイトをメーカ規定。形式により設定（詳細説明参ç
-§ï¼‰,0xFF=2から9ãƒã‚¤ãƒˆã‚’ä¹±æ•°ã«ã‚ˆã‚Šç”Ÿæˆã™ã‚‹ãƒ—ãƒ­ãƒˆã‚³ãƒ«ã‚’ä¸‹ä½é€šä¿¡å±¤ã§ä½¿ç”¨ã™ã‚‹å ´åˆã«è¨­å®š,0x00=識別番号未設定"
+                                "valueDescription":"0x01～0xFD=下位通信層で使用される通信プロトコルで固有の番号が振られている場合、プロトコル別に応じて、任意に設定（ECHONET Liteでは使用しない）,0x11～0x1F=電灯線a\/d方式,0x31～0x3F=特定小電力無線,0x41～0x4F=拡張HBS,0x51～0x5F=IrDA,0x61～0x6F=LonTalk,0x71～0x7F=Bluetooth,0x81～0x8F=イーサネット,0x91～0x9F=IEEE802.11\/11b,0xA1=電灯線c方式,0xB1=IPv6\/Ethernet,0xB2=IPv6\/6LoWPAN,0xFE=2から17バイトをメーカ規定。形式により設定（詳細説明参照）,0xFF=2から9バイトを乱数により生成するプロトコルを下位通信層で使用する場合に設定,0x00=識別番号未設定"
                         },
                         {
                                 "arrayCount":16,
-                                "description":"固有番号フィールド",
+                                "description":"固有番号フィールド",
                                 "fields":[
                                         
@@ -265 +254 @@
                 ],
                 "arrayCount":0,
-                "description":"瞬時消費電力計測値",
+                "description":"瞬時消費電力計測値",
                 "fields":[
                         
@@ -280 +269 @@
                 "type":"uint16_t",
                 "unitDescription":"W",
-                "valueDescription":"0x0000～0xFFFD(0～65533W)"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"積算消費電力計測値",
+                "valueDescription":"0x0000～0xFFFD(0～65533W)"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"積算消費電力計測値",
                 "fields":[
                         
@@ -302 +291 @@
                 "type":"uint32_t",
                 "unitDescription":"kWh",
-                "valueDescription":"0x00000000～0x3B9AC9FF(0～999,999.999kWh)"
+                "valueDescription":"0x00000000～0x3B9AC9FF(0～999,999.999kWh)"
         },
         {
@@ -310 +299 @@
                 ],
                 "arrayCount":0,
-                "description":"メーカ異常コード",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"異常コード部のデータサイズ",
+                "description":"メーカ異常コード",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"異常コード部のデータサイズ",
                                 "fields":[
                                         
@@ -329 +318 @@
                         {
                                 "arrayCount":0,
-                                "description":"メーカーコード",
+                                "description":"メーカーコード",
                                 "fields":[
                                         {
                                                 "arrayCount":3,
-                                                "description":"メーカーコード",
+                                                "description":"メーカーコード",
                                                 "fields":[
                                                         
@@ -344 +333 @@
                                                 "type":"uint8_t",
                                                 "unitDescription":null,
-                                                "valueDescription":"ECHONETコンソーシアムで規定。"
+                                                "valueDescription":"ECHONETコンソーシアムで規定。"
                                         }
                                 ],
@@ -358 +347 @@
                         {
                                 "arrayCount":221,
-                                "description":"各メーカ独自の異常コード部",
+                                "description":"各メーカ独自の異常コード部",
                                 "fields":[
                                         
@@ -391 +380 @@
                 ],
                 "arrayCount":0,
-                "description":"電流制限設定",
+                "description":"電流制限設定",
                 "fields":[
                         
@@ -405 +394 @@
                 "size":1,
                 "type":"uint8_t",
-                "unitDescription":"ï¼
-",
-                "valueDescription":"0x00～0x64(0～100%)"
+                "unitDescription":"％",
+                "valueDescription":"0x00～0x64(0～100%)"
         },
         {
@@ -415 +403 @@
                 ],
                 "arrayCount":0,
-                "description":"異常発生状æ
-‹",
+                "description":"異常発生状態",
                 "fields":[
                         
@@ -431 +418 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=異常発生有,0x42=異常発生無"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"異常å†
-容",
+                "valueDescription":"0x41=異常発生有,0x42=異常発生無"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"異常内容",
                 "fields":[
                         
@@ -454 +440 @@
                 "type":"uint16_t",
                 "unitDescription":null,
-                "valueDescription":"2.5異常å†
-容プロパティ参ç
-§"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"メーカーコード",
+                "valueDescription":"2.5異常内容プロパティ参照"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"メーカーコード",
                 "fields":[
                         {
                                 "arrayCount":3,
-                                "description":"メーカーコード",
+                                "description":"メーカーコード",
                                 "fields":[
                                         
@@ -478 +462 @@
                                 "type":"uint8_t",
                                 "unitDescription":null,
-                                "valueDescription":"ECHONETコンソーシアムで規定。"
+                                "valueDescription":"ECHONETコンソーシアムで規定。"
                         }
                 ],
@@ -492 +476 @@
                 "type":"manufacturer_code_t",
                 "unitDescription":null,
-                "valueDescription":"(ECHONETコンソーシアムで規定。)"
+                "valueDescription":"(ECHONETコンソーシアムで規定。)"
         },
         {
@@ -499 +483 @@
                 ],
                 "arrayCount":3,
-                "description":"äº‹æ¥­å ´ã‚³ãƒ¼ãƒ‰",
+                "description":"事業場コード",
                 "fields":[
                         
@@ -514 +498 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"(各メーカ毎に規定。)"
+                "valueDescription":"(各メーカ毎に規定。)"
         },
         {
@@ -521 +505 @@
                 ],
                 "arrayCount":12,
-                "description":"商品コード",
+                "description":"商品コード",
                 "fields":[
                         
@@ -536 +520 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"(各メーカ毎に規定。)"
+                "valueDescription":"(各メーカ毎に規定。)"
         },
         {
@@ -543 +527 @@
                 ],
                 "arrayCount":12,
-                "description":"è£½é€ ç•ªå·",
+                "description":"製造番号",
                 "fields":[
                         
@@ -558 +542 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"(各メーカ毎に規定。)"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"è£½é€ å¹´æœˆæ—¥",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"å¹´",
+                "valueDescription":"(各メーカ毎に規定。)"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"製造年月日",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"年",
                                 "fields":[
                                         
@@ -579 +563 @@
                                 "size":2,
                                 "type":"uint16_t",
-                                "unitDescription":"å¹´",
-                                "valueDescription":"0x0001～0x270F(1～9999)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"月",
+                                "unitDescription":"年",
+                                "valueDescription":"0x0001～0x270F(1～9999)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"月",
                                 "fields":[
                                         
@@ -594 +578 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"月",
-                                "valueDescription":"0x01～0x0C(1～12)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"日",
+                                "unitDescription":"月",
+                                "valueDescription":"0x01～0x0C(1～12)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"日",
                                 "fields":[
                                         
@@ -609 +593 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"日",
-                                "valueDescription":"0x01～0x1F(1～31)"
+                                "unitDescription":"日",
+                                "valueDescription":"0x01～0x1F(1～31)"
                         }
                 ],
@@ -632 +616 @@
                 ],
                 "arrayCount":0,
-                "description":"節電動作設定",
+                "description":"節電動作設定",
                 "fields":[
                         
@@ -647 +631 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=節電動作中,0x42=通常動作中"
+                "valueDescription":"0x41=節電動作中,0x42=通常動作中"
         },
         {
@@ -655 +639 @@
                 ],
                 "arrayCount":0,
-                "description":"é éš”æ“ä½œè¨­å®š",
+                "description":"遠隔操作設定",
                 "fields":[
                         
@@ -670 +654 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=å
-¬è¡†å›žç·šæœªçµŒç”±æ“ä½œ,0x42=å
-¬è¡†å›žç·šçµŒç”±æ“ä½œ"
+                "valueDescription":"0x41=公衆回線未経由操作,0x42=公衆回線経由操作"
         },
         {
@@ -680 +662 @@
                 ],
                 "arrayCount":0,
-                "description":"現在時刻設定",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"時",
+                "description":"現在時刻設定",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"時",
                                 "fields":[
                                         
@@ -694 +676 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"時",
-                                "valueDescription":"0x00～0x17(0～23)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"分",
+                                "unitDescription":"時",
+                                "valueDescription":"0x00～0x17(0～23)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"分",
                                 "fields":[
                                         
@@ -709 +691 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"分",
-                                "valueDescription":"0x00～0x3B(0～59)"
+                                "unitDescription":"分",
+                                "valueDescription":"0x00～0x3B(0～59)"
                         }
                 ],
@@ -732 +714 @@
                 ],
                 "arrayCount":0,
-                "description":"現在年月日設定",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"å¹´",
+                "description":"現在年月日設定",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"年",
                                 "fields":[
                                         
@@ -746 +728 @@
                                 "size":2,
                                 "type":"uint16_t",
-                                "unitDescription":"å¹´",
-                                "valueDescription":"0x0001～0x270F(1～9999)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"月",
+                                "unitDescription":"年",
+                                "valueDescription":"0x0001～0x270F(1～9999)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"月",
                                 "fields":[
                                         
@@ -761 +743 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"月",
-                                "valueDescription":"0x01～0x0C(1～12)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"日",
+                                "unitDescription":"月",
+                                "valueDescription":"0x01～0x0C(1～12)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"日",
                                 "fields":[
                                         
@@ -776 +758 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"日",
-                                "valueDescription":"0x01～0x1F(1～31)"
+                                "unitDescription":"日",
+                                "valueDescription":"0x01～0x1F(1～31)"
                         }
                 ],
@@ -799 +781 @@
                 ],
                 "arrayCount":0,
-                "description":"電力制限設定",
+                "description":"電力制限設定",
                 "fields":[
                         
@@ -814 +796 @@
                 "type":"uint16_t",
                 "unitDescription":null,
-                "valueDescription":"0x0000～0xFFFF(0～65535W)"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"積算運転時間",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"単位",
+                "valueDescription":"0x0000～0xFFFF(0～65535W)"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"積算運転時間",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"単位",
                                 "fields":[
                                         
@@ -836 +818 @@
                                 "type":"uint8_t",
                                 "unitDescription":null,
-                                "valueDescription":"0x41=秒,0x42=分,0x43=時,0x44=日"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"経過時間",
+                                "valueDescription":"0x41=秒,0x42=分,0x43=時,0x44=日"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"経過時間",
                                 "fields":[
                                         
@@ -851 +833 @@
                                 "type":"uint32_t",
                                 "unitDescription":null,
-                                "valueDescription":"0x00000000～0xFFFFFFFF(0～4294967295)"
+                                "valueDescription":"0x00000000～0xFFFFFFFF(0～4294967295)"
                         }
                 ],
@@ -873 +855 @@
                 ],
                 "arrayCount":17,
-                "description":"ï¼³ï½
-ｔＭプロパティマップ",
+                "description":"ＳｅｔＭプロパティマップ",
                 "fields":[
                         
@@ -889 +870 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -898 +878 @@
                 ],
                 "arrayCount":17,
-                "description":"Ｇï½
-ｔＭプロパティマップ",
+                "description":"ＧｅｔＭプロパティマップ",
                 "fields":[
                         
@@ -914 +893 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -923 +901 @@
                 ],
                 "arrayCount":17,
-                "description":"状変アナウンスプロパティマップ",
+                "description":"状変アナウンスプロパティマップ",
                 "fields":[
                         
@@ -938 +916 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -947 +924 @@
                 ],
                 "arrayCount":17,
-                "description":"ï¼³ï½
-ｔプロパティマップ",
+                "description":"Ｓｅｔプロパティマップ",
                 "fields":[
                         
@@ -963 +939 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -972 +947 @@
                 ],
                 "arrayCount":17,
-                "description":"Ｇï½
-ｔプロパティマップ",
+                "description":"Ｇｅｔプロパティマップ",
                 "fields":[
                         
@@ -988 +962 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         }
 ]

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/PropertyList0003.json

@@ -7 +7 @@
                 ],
                 "arrayCount":0,
-                "description":"動作状æ
-‹",
+                "description":"動作状態",
                 "fields":[
                         
@@ -31 +30 @@
                 ],
                 "arrayCount":0,
-                "description":"非常発生状æ
-‹",
+                "description":"非常発生状態",
                 "fields":[
                         
@@ -47 +45 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=非常発生有,0x42=非常発生無"
+                "valueDescription":"0x41=非常発生有,0x42=非常発生無"
         },
         {
@@ -54 +52 @@
                 ],
                 "arrayCount":0,
-                "description":"非常発生状æ
-‹ãƒªã‚»ãƒƒãƒˆè¨­å®š",
+                "description":"非常発生状態リセット設定",
                 "fields":[
                         
@@ -70 +67 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x00=リセット"
+                "valueDescription":"0x00=リセット"
         },
         {
@@ -79 +76 @@
                 ],
                 "arrayCount":0,
-                "description":"è¨­ç½®å ´æ‰€",
+                "description":"設置場所",
                 "fields":[
                         
@@ -95 +92 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"2.2è¨­ç½®å ´æ‰€ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£å‚ç
-§"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"è¦æ ¼ï¼¶ï½
-ｒｓｉｏｎæƒ
-å ±",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"固定1(for future reserved)",
+                "valueDescription":"2.2設置場所プロパティ参照"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"規格Ｖｅｒｓｉｏｎ情報",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"固定1(for future reserved)",
                                 "fields":[
                                         
@@ -124 +118 @@
                         {
                                 "arrayCount":0,
-                                "description":"固定2(for future reserved)",
+                                "description":"固定2(for future reserved)",
                                 "fields":[
                                         
@@ -139 +133 @@
                         {
                                 "arrayCount":0,
-                                "description":"ãƒªãƒªãƒ¼ã‚¹é †ã‚’ASCIIで示す",
+                                "description":"リリース順をASCIIで示す",
                                 "fields":[
                                         
@@ -154 +148 @@
                         {
                                 "arrayCount":0,
-                                "description":"固定4(for future reserved)",
+                                "description":"固定4(for future reserved)",
                                 "fields":[
                                         
@@ -186 +180 @@
                 ],
                 "arrayCount":0,
-                "description":"識別番号",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"下位通信層IDフィールド",
+                "description":"識別番号",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"下位通信層IDフィールド",
                                 "fields":[
                                         
@@ -201 +195 @@
                                 "type":"uint8_t",
                                 "unitDescription":null,
-                                "valueDescription":"0x01～0xFD=ä¸‹ä½é€šä¿¡å±¤ã§ä½¿ç”¨ã•ã‚Œã‚‹é€šä¿¡ãƒ—ãƒ­ãƒˆã‚³ãƒ«ã§å›ºæœ‰ã®ç•ªå·ãŒæŒ¯ã‚‰ã‚Œã¦ã„ã‚‹å ´åˆã€ãƒ—ãƒ­ãƒˆã‚³ãƒ«åˆ¥ã«å¿œã˜ã¦ã€ä»»æ„ã«è¨­å®šï¼ˆECHONET Liteでは使用しない）,0x11～0x1F=電灯線a\/d方式,0x31～0x3F=特定小電力無線,0x41～0x4F=拡張HBS,0x51～0x5F=IrDA,0x61～0x6F=LonTalk,0x71～0x7F=Bluetooth,0x81～0x8F=イーサネット,0x91～0x9F=IEEE802.11\/11b,0xA1=電灯線c方式,0xB1=IPv6\/Ethernet,0xB2=IPv6\/6LoWPAN,0xFE=2から17バイトをメーカ規定。形式により設定（詳細説明参ç
-§ï¼‰,0xFF=2から9ãƒã‚¤ãƒˆã‚’ä¹±æ•°ã«ã‚ˆã‚Šç”Ÿæˆã™ã‚‹ãƒ—ãƒ­ãƒˆã‚³ãƒ«ã‚’ä¸‹ä½é€šä¿¡å±¤ã§ä½¿ç”¨ã™ã‚‹å ´åˆã«è¨­å®š,0x00=識別番号未設定"
+                                "valueDescription":"0x01～0xFD=下位通信層で使用される通信プロトコルで固有の番号が振られている場合、プロトコル別に応じて、任意に設定（ECHONET Liteでは使用しない）,0x11～0x1F=電灯線a\/d方式,0x31～0x3F=特定小電力無線,0x41～0x4F=拡張HBS,0x51～0x5F=IrDA,0x61～0x6F=LonTalk,0x71～0x7F=Bluetooth,0x81～0x8F=イーサネット,0x91～0x9F=IEEE802.11\/11b,0xA1=電灯線c方式,0xB1=IPv6\/Ethernet,0xB2=IPv6\/6LoWPAN,0xFE=2から17バイトをメーカ規定。形式により設定（詳細説明参照）,0xFF=2から9バイトを乱数により生成するプロトコルを下位通信層で使用する場合に設定,0x00=識別番号未設定"
                         },
                         {
                                 "arrayCount":16,
-                                "description":"固有番号フィールド",
+                                "description":"固有番号フィールド",
                                 "fields":[
                                         
@@ -238 +231 @@
                 ],
                 "arrayCount":0,
-                "description":"瞬時消費電力計測値",
+                "description":"瞬時消費電力計測値",
                 "fields":[
                         
@@ -253 +246 @@
                 "type":"uint16_t",
                 "unitDescription":"W",
-                "valueDescription":"0x0000～0xFFFD(0～65533W)"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"積算消費電力計測値",
+                "valueDescription":"0x0000～0xFFFD(0～65533W)"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"積算消費電力計測値",
                 "fields":[
                         
@@ -275 +268 @@
                 "type":"uint32_t",
                 "unitDescription":"kWh",
-                "valueDescription":"0x00000000～0x3B9AC9FF(0～999,999.999kWh)"
+                "valueDescription":"0x00000000～0x3B9AC9FF(0～999,999.999kWh)"
         },
         {
@@ -283 +276 @@
                 ],
                 "arrayCount":0,
-                "description":"メーカ異常コード",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"異常コード部のデータサイズ",
+                "description":"メーカ異常コード",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"異常コード部のデータサイズ",
                                 "fields":[
                                         
@@ -302 +295 @@
                         {
                                 "arrayCount":0,
-                                "description":"メーカーコード",
+                                "description":"メーカーコード",
                                 "fields":[
                                         {
                                                 "arrayCount":3,
-                                                "description":"メーカーコード",
+                                                "description":"メーカーコード",
                                                 "fields":[
                                                         
@@ -317 +310 @@
                                                 "type":"uint8_t",
                                                 "unitDescription":null,
-                                                "valueDescription":"ECHONETコンソーシアムで規定。"
+                                                "valueDescription":"ECHONETコンソーシアムで規定。"
                                         }
                                 ],
@@ -331 +324 @@
                         {
                                 "arrayCount":221,
-                                "description":"各メーカ独自の異常コード部",
+                                "description":"各メーカ独自の異常コード部",
                                 "fields":[
                                         
@@ -364 +357 @@
                 ],
                 "arrayCount":0,
-                "description":"電流制限設定",
+                "description":"電流制限設定",
                 "fields":[
                         
@@ -378 +371 @@
                 "size":1,
                 "type":"uint8_t",
-                "unitDescription":"ï¼
-",
-                "valueDescription":"0x00～0x64(0～100%)"
+                "unitDescription":"％",
+                "valueDescription":"0x00～0x64(0～100%)"
         },
         {
@@ -388 +380 @@
                 ],
                 "arrayCount":0,
-                "description":"異常発生状æ
-‹",
+                "description":"異常発生状態",
                 "fields":[
                         
@@ -404 +395 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=異常発生有,0x42=異常発生無"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"異常å†
-容",
+                "valueDescription":"0x41=異常発生有,0x42=異常発生無"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"異常内容",
                 "fields":[
                         
@@ -427 +417 @@
                 "type":"uint16_t",
                 "unitDescription":null,
-                "valueDescription":"2.5異常å†
-容プロパティ参ç
-§"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"メーカーコード",
+                "valueDescription":"2.5異常内容プロパティ参照"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"メーカーコード",
                 "fields":[
                         {
                                 "arrayCount":3,
-                                "description":"メーカーコード",
+                                "description":"メーカーコード",
                                 "fields":[
                                         
@@ -451 +439 @@
                                 "type":"uint8_t",
                                 "unitDescription":null,
-                                "valueDescription":"ECHONETコンソーシアムで規定。"
+                                "valueDescription":"ECHONETコンソーシアムで規定。"
                         }
                 ],
@@ -465 +453 @@
                 "type":"manufacturer_code_t",
                 "unitDescription":null,
-                "valueDescription":"(ECHONETコンソーシアムで規定。)"
+                "valueDescription":"(ECHONETコンソーシアムで規定。)"
         },
         {
@@ -472 +460 @@
                 ],
                 "arrayCount":3,
-                "description":"äº‹æ¥­å ´ã‚³ãƒ¼ãƒ‰",
+                "description":"事業場コード",
                 "fields":[
                         
@@ -487 +475 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"(各メーカ毎に規定。)"
+                "valueDescription":"(各メーカ毎に規定。)"
         },
         {
@@ -494 +482 @@
                 ],
                 "arrayCount":12,
-                "description":"商品コード",
+                "description":"商品コード",
                 "fields":[
                         
@@ -509 +497 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"(各メーカ毎に規定。)"
+                "valueDescription":"(各メーカ毎に規定。)"
         },
         {
@@ -516 +504 @@
                 ],
                 "arrayCount":12,
-                "description":"è£½é€ ç•ªå·",
+                "description":"製造番号",
                 "fields":[
                         
@@ -531 +519 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"(各メーカ毎に規定。)"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"è£½é€ å¹´æœˆæ—¥",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"å¹´",
+                "valueDescription":"(各メーカ毎に規定。)"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"製造年月日",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"年",
                                 "fields":[
                                         
@@ -552 +540 @@
                                 "size":2,
                                 "type":"uint16_t",
-                                "unitDescription":"å¹´",
-                                "valueDescription":"0x0001～0x270F(1～9999)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"月",
+                                "unitDescription":"年",
+                                "valueDescription":"0x0001～0x270F(1～9999)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"月",
                                 "fields":[
                                         
@@ -567 +555 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"月",
-                                "valueDescription":"0x01～0x0C(1～12)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"日",
+                                "unitDescription":"月",
+                                "valueDescription":"0x01～0x0C(1～12)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"日",
                                 "fields":[
                                         
@@ -582 +570 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"日",
-                                "valueDescription":"0x01～0x1F(1～31)"
+                                "unitDescription":"日",
+                                "valueDescription":"0x01～0x1F(1～31)"
                         }
                 ],
@@ -605 +593 @@
                 ],
                 "arrayCount":0,
-                "description":"節電動作設定",
+                "description":"節電動作設定",
                 "fields":[
                         
@@ -620 +608 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=節電動作中,0x42=通常動作中"
+                "valueDescription":"0x41=節電動作中,0x42=通常動作中"
         },
         {
@@ -628 +616 @@
                 ],
                 "arrayCount":0,
-                "description":"é éš”æ“ä½œè¨­å®š",
+                "description":"遠隔操作設定",
                 "fields":[
                         
@@ -643 +631 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=å
-¬è¡†å›žç·šæœªçµŒç”±æ“ä½œ,0x42=å
-¬è¡†å›žç·šçµŒç”±æ“ä½œ"
+                "valueDescription":"0x41=公衆回線未経由操作,0x42=公衆回線経由操作"
         },
         {
@@ -653 +639 @@
                 ],
                 "arrayCount":0,
-                "description":"現在時刻設定",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"時",
+                "description":"現在時刻設定",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"時",
                                 "fields":[
                                         
@@ -667 +653 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"時",
-                                "valueDescription":"0x00～0x17(0～23)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"分",
+                                "unitDescription":"時",
+                                "valueDescription":"0x00～0x17(0～23)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"分",
                                 "fields":[
                                         
@@ -682 +668 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"分",
-                                "valueDescription":"0x00～0x3B(0～59)"
+                                "unitDescription":"分",
+                                "valueDescription":"0x00～0x3B(0～59)"
                         }
                 ],
@@ -705 +691 @@
                 ],
                 "arrayCount":0,
-                "description":"現在年月日設定",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"å¹´",
+                "description":"現在年月日設定",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"年",
                                 "fields":[
                                         
@@ -719 +705 @@
                                 "size":2,
                                 "type":"uint16_t",
-                                "unitDescription":"å¹´",
-                                "valueDescription":"0x0001～0x270F(1～9999)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"月",
+                                "unitDescription":"年",
+                                "valueDescription":"0x0001～0x270F(1～9999)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"月",
                                 "fields":[
                                         
@@ -734 +720 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"月",
-                                "valueDescription":"0x01～0x0C(1～12)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"日",
+                                "unitDescription":"月",
+                                "valueDescription":"0x01～0x0C(1～12)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"日",
                                 "fields":[
                                         
@@ -749 +735 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"日",
-                                "valueDescription":"0x01～0x1F(1～31)"
+                                "unitDescription":"日",
+                                "valueDescription":"0x01～0x1F(1～31)"
                         }
                 ],
@@ -772 +758 @@
                 ],
                 "arrayCount":0,
-                "description":"電力制限設定",
+                "description":"電力制限設定",
                 "fields":[
                         
@@ -787 +773 @@
                 "type":"uint16_t",
                 "unitDescription":null,
-                "valueDescription":"0x0000～0xFFFF(0～65535W)"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"積算運転時間",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"単位",
+                "valueDescription":"0x0000～0xFFFF(0～65535W)"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"積算運転時間",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"単位",
                                 "fields":[
                                         
@@ -809 +795 @@
                                 "type":"uint8_t",
                                 "unitDescription":null,
-                                "valueDescription":"0x41=秒,0x42=分,0x43=時,0x44=日"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"経過時間",
+                                "valueDescription":"0x41=秒,0x42=分,0x43=時,0x44=日"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"経過時間",
                                 "fields":[
                                         
@@ -824 +810 @@
                                 "type":"uint32_t",
                                 "unitDescription":null,
-                                "valueDescription":"0x00000000～0xFFFFFFFF(0～4294967295)"
+                                "valueDescription":"0x00000000～0xFFFFFFFF(0～4294967295)"
                         }
                 ],
@@ -846 +832 @@
                 ],
                 "arrayCount":17,
-                "description":"ï¼³ï½
-ｔＭプロパティマップ",
+                "description":"ＳｅｔＭプロパティマップ",
                 "fields":[
                         
@@ -862 +847 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -871 +855 @@
                 ],
                 "arrayCount":17,
-                "description":"Ｇï½
-ｔＭプロパティマップ",
+                "description":"ＧｅｔＭプロパティマップ",
                 "fields":[
                         
@@ -887 +870 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -896 +878 @@
                 ],
                 "arrayCount":17,
-                "description":"状変アナウンスプロパティマップ",
+                "description":"状変アナウンスプロパティマップ",
                 "fields":[
                         
@@ -911 +893 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -920 +901 @@
                 ],
                 "arrayCount":17,
-                "description":"ï¼³ï½
-ｔプロパティマップ",
+                "description":"Ｓｅｔプロパティマップ",
                 "fields":[
                         
@@ -936 +916 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -945 +924 @@
                 ],
                 "arrayCount":17,
-                "description":"Ｇï½
-ｔプロパティマップ",
+                "description":"Ｇｅｔプロパティマップ",
                 "fields":[
                         
@@ -961 +939 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         }
 ]

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/PropertyList0004.json

@@ -7 +7 @@
                 ],
                 "arrayCount":0,
-                "description":"動作状æ
-‹",
+                "description":"動作状態",
                 "fields":[
                         
@@ -31 +30 @@
                 ],
                 "arrayCount":0,
-                "description":"検知閾値レベル設定",
+                "description":"検知閾値レベル設定",
                 "fields":[
                         
@@ -46 +45 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x31～0x38"
+                "valueDescription":"0x31～0x38"
         },
         {
@@ -54 +53 @@
                 ],
                 "arrayCount":0,
-                "description":"救急発生状æ
-‹",
+                "description":"救急発生状態",
                 "fields":[
                         
@@ -70 +68 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=救急発生有,0x42=救急発生無"
+                "valueDescription":"0x41=救急発生有,0x42=救急発生無"
         },
         {
@@ -77 +75 @@
                 ],
                 "arrayCount":0,
-                "description":"救急発生状æ
-‹ãƒªã‚»ãƒƒãƒˆè¨­å®š",
+                "description":"救急発生状態リセット設定",
                 "fields":[
                         
@@ -93 +90 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x00=リセット"
+                "valueDescription":"0x00=リセット"
         },
         {
@@ -102 +99 @@
                 ],
                 "arrayCount":0,
-                "description":"è¨­ç½®å ´æ‰€",
+                "description":"設置場所",
                 "fields":[
                         
@@ -118 +115 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"2.2è¨­ç½®å ´æ‰€ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£å‚ç
-§"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"è¦æ ¼ï¼¶ï½
-ｒｓｉｏｎæƒ
-å ±",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"固定1(for future reserved)",
+                "valueDescription":"2.2設置場所プロパティ参照"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"規格Ｖｅｒｓｉｏｎ情報",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"固定1(for future reserved)",
                                 "fields":[
                                         
@@ -147 +141 @@
                         {
                                 "arrayCount":0,
-                                "description":"固定2(for future reserved)",
+                                "description":"固定2(for future reserved)",
                                 "fields":[
                                         
@@ -162 +156 @@
                         {
                                 "arrayCount":0,
-                                "description":"ãƒªãƒªãƒ¼ã‚¹é †ã‚’ASCIIで示す",
+                                "description":"リリース順をASCIIで示す",
                                 "fields":[
                                         
@@ -177 +171 @@
                         {
                                 "arrayCount":0,
-                                "description":"固定4(for future reserved)",
+                                "description":"固定4(for future reserved)",
                                 "fields":[
                                         
@@ -209 +203 @@
                 ],
                 "arrayCount":0,
-                "description":"識別番号",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"下位通信層IDフィールド",
+                "description":"識別番号",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"下位通信層IDフィールド",
                                 "fields":[
                                         
@@ -224 +218 @@
                                 "type":"uint8_t",
                                 "unitDescription":null,
-                                "valueDescription":"0x01～0xFD=ä¸‹ä½é€šä¿¡å±¤ã§ä½¿ç”¨ã•ã‚Œã‚‹é€šä¿¡ãƒ—ãƒ­ãƒˆã‚³ãƒ«ã§å›ºæœ‰ã®ç•ªå·ãŒæŒ¯ã‚‰ã‚Œã¦ã„ã‚‹å ´åˆã€ãƒ—ãƒ­ãƒˆã‚³ãƒ«åˆ¥ã«å¿œã˜ã¦ã€ä»»æ„ã«è¨­å®šï¼ˆECHONET Liteでは使用しない）,0x11～0x1F=電灯線a\/d方式,0x31～0x3F=特定小電力無線,0x41～0x4F=拡張HBS,0x51～0x5F=IrDA,0x61～0x6F=LonTalk,0x71～0x7F=Bluetooth,0x81～0x8F=イーサネット,0x91～0x9F=IEEE802.11\/11b,0xA1=電灯線c方式,0xB1=IPv6\/Ethernet,0xB2=IPv6\/6LoWPAN,0xFE=2から17バイトをメーカ規定。形式により設定（詳細説明参ç
-§ï¼‰,0xFF=2から9ãƒã‚¤ãƒˆã‚’ä¹±æ•°ã«ã‚ˆã‚Šç”Ÿæˆã™ã‚‹ãƒ—ãƒ­ãƒˆã‚³ãƒ«ã‚’ä¸‹ä½é€šä¿¡å±¤ã§ä½¿ç”¨ã™ã‚‹å ´åˆã«è¨­å®š,0x00=識別番号未設定"
+                                "valueDescription":"0x01～0xFD=下位通信層で使用される通信プロトコルで固有の番号が振られている場合、プロトコル別に応じて、任意に設定（ECHONET Liteでは使用しない）,0x11～0x1F=電灯線a\/d方式,0x31～0x3F=特定小電力無線,0x41～0x4F=拡張HBS,0x51～0x5F=IrDA,0x61～0x6F=LonTalk,0x71～0x7F=Bluetooth,0x81～0x8F=イーサネット,0x91～0x9F=IEEE802.11\/11b,0xA1=電灯線c方式,0xB1=IPv6\/Ethernet,0xB2=IPv6\/6LoWPAN,0xFE=2から17バイトをメーカ規定。形式により設定（詳細説明参照）,0xFF=2から9バイトを乱数により生成するプロトコルを下位通信層で使用する場合に設定,0x00=識別番号未設定"
                         },
                         {
                                 "arrayCount":16,
-                                "description":"固有番号フィールド",
+                                "description":"固有番号フィールド",
                                 "fields":[
                                         
@@ -261 +254 @@
                 ],
                 "arrayCount":0,
-                "description":"瞬時消費電力計測値",
+                "description":"瞬時消費電力計測値",
                 "fields":[
                         
@@ -276 +269 @@
                 "type":"uint16_t",
                 "unitDescription":"W",
-                "valueDescription":"0x0000～0xFFFD(0～65533W)"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"積算消費電力計測値",
+                "valueDescription":"0x0000～0xFFFD(0～65533W)"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"積算消費電力計測値",
                 "fields":[
                         
@@ -298 +291 @@
                 "type":"uint32_t",
                 "unitDescription":"kWh",
-                "valueDescription":"0x00000000～0x3B9AC9FF(0～999,999.999kWh)"
+                "valueDescription":"0x00000000～0x3B9AC9FF(0～999,999.999kWh)"
         },
         {
@@ -306 +299 @@
                 ],
                 "arrayCount":0,
-                "description":"メーカ異常コード",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"異常コード部のデータサイズ",
+                "description":"メーカ異常コード",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"異常コード部のデータサイズ",
                                 "fields":[
                                         
@@ -325 +318 @@
                         {
                                 "arrayCount":0,
-                                "description":"メーカーコード",
+                                "description":"メーカーコード",
                                 "fields":[
                                         {
                                                 "arrayCount":3,
-                                                "description":"メーカーコード",
+                                                "description":"メーカーコード",
                                                 "fields":[
                                                         
@@ -340 +333 @@
                                                 "type":"uint8_t",
                                                 "unitDescription":null,
-                                                "valueDescription":"ECHONETコンソーシアムで規定。"
+                                                "valueDescription":"ECHONETコンソーシアムで規定。"
                                         }
                                 ],
@@ -354 +347 @@
                         {
                                 "arrayCount":221,
-                                "description":"各メーカ独自の異常コード部",
+                                "description":"各メーカ独自の異常コード部",
                                 "fields":[
                                         
@@ -387 +380 @@
                 ],
                 "arrayCount":0,
-                "description":"電流制限設定",
+                "description":"電流制限設定",
                 "fields":[
                         
@@ -401 +394 @@
                 "size":1,
                 "type":"uint8_t",
-                "unitDescription":"ï¼
-",
-                "valueDescription":"0x00～0x64(0～100%)"
+                "unitDescription":"％",
+                "valueDescription":"0x00～0x64(0～100%)"
         },
         {
@@ -411 +403 @@
                 ],
                 "arrayCount":0,
-                "description":"異常発生状æ
-‹",
+                "description":"異常発生状態",
                 "fields":[
                         
@@ -427 +418 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=異常発生有,0x42=異常発生無"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"異常å†
-容",
+                "valueDescription":"0x41=異常発生有,0x42=異常発生無"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"異常内容",
                 "fields":[
                         
@@ -450 +440 @@
                 "type":"uint16_t",
                 "unitDescription":null,
-                "valueDescription":"2.5異常å†
-容プロパティ参ç
-§"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"メーカーコード",
+                "valueDescription":"2.5異常内容プロパティ参照"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"メーカーコード",
                 "fields":[
                         {
                                 "arrayCount":3,
-                                "description":"メーカーコード",
+                                "description":"メーカーコード",
                                 "fields":[
                                         
@@ -474 +462 @@
                                 "type":"uint8_t",
                                 "unitDescription":null,
-                                "valueDescription":"ECHONETコンソーシアムで規定。"
+                                "valueDescription":"ECHONETコンソーシアムで規定。"
                         }
                 ],
@@ -488 +476 @@
                 "type":"manufacturer_code_t",
                 "unitDescription":null,
-                "valueDescription":"(ECHONETコンソーシアムで規定。)"
+                "valueDescription":"(ECHONETコンソーシアムで規定。)"
         },
         {
@@ -495 +483 @@
                 ],
                 "arrayCount":3,
-                "description":"äº‹æ¥­å ´ã‚³ãƒ¼ãƒ‰",
+                "description":"事業場コード",
                 "fields":[
                         
@@ -510 +498 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"(各メーカ毎に規定。)"
+                "valueDescription":"(各メーカ毎に規定。)"
         },
         {
@@ -517 +505 @@
                 ],
                 "arrayCount":12,
-                "description":"商品コード",
+                "description":"商品コード",
                 "fields":[
                         
@@ -532 +520 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"(各メーカ毎に規定。)"
+                "valueDescription":"(各メーカ毎に規定。)"
         },
         {
@@ -539 +527 @@
                 ],
                 "arrayCount":12,
-                "description":"è£½é€ ç•ªå·",
+                "description":"製造番号",
                 "fields":[
                         
@@ -554 +542 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"(各メーカ毎に規定。)"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"è£½é€ å¹´æœˆæ—¥",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"å¹´",
+                "valueDescription":"(各メーカ毎に規定。)"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"製造年月日",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"年",
                                 "fields":[
                                         
@@ -575 +563 @@
                                 "size":2,
                                 "type":"uint16_t",
-                                "unitDescription":"å¹´",
-                                "valueDescription":"0x0001～0x270F(1～9999)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"月",
+                                "unitDescription":"年",
+                                "valueDescription":"0x0001～0x270F(1～9999)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"月",
                                 "fields":[
                                         
@@ -590 +578 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"月",
-                                "valueDescription":"0x01～0x0C(1～12)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"日",
+                                "unitDescription":"月",
+                                "valueDescription":"0x01～0x0C(1～12)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"日",
                                 "fields":[
                                         
@@ -605 +593 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"日",
-                                "valueDescription":"0x01～0x1F(1～31)"
+                                "unitDescription":"日",
+                                "valueDescription":"0x01～0x1F(1～31)"
                         }
                 ],
@@ -628 +616 @@
                 ],
                 "arrayCount":0,
-                "description":"節電動作設定",
+                "description":"節電動作設定",
                 "fields":[
                         
@@ -643 +631 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=節電動作中,0x42=通常動作中"
+                "valueDescription":"0x41=節電動作中,0x42=通常動作中"
         },
         {
@@ -651 +639 @@
                 ],
                 "arrayCount":0,
-                "description":"é éš”æ“ä½œè¨­å®š",
+                "description":"遠隔操作設定",
                 "fields":[
                         
@@ -666 +654 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=å
-¬è¡†å›žç·šæœªçµŒç”±æ“ä½œ,0x42=å
-¬è¡†å›žç·šçµŒç”±æ“ä½œ"
+                "valueDescription":"0x41=公衆回線未経由操作,0x42=公衆回線経由操作"
         },
         {
@@ -676 +662 @@
                 ],
                 "arrayCount":0,
-                "description":"現在時刻設定",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"時",
+                "description":"現在時刻設定",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"時",
                                 "fields":[
                                         
@@ -690 +676 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"時",
-                                "valueDescription":"0x00～0x17(0～23)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"分",
+                                "unitDescription":"時",
+                                "valueDescription":"0x00～0x17(0～23)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"分",
                                 "fields":[
                                         
@@ -705 +691 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"分",
-                                "valueDescription":"0x00～0x3B(0～59)"
+                                "unitDescription":"分",
+                                "valueDescription":"0x00～0x3B(0～59)"
                         }
                 ],
@@ -728 +714 @@
                 ],
                 "arrayCount":0,
-                "description":"現在年月日設定",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"å¹´",
+                "description":"現在年月日設定",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"年",
                                 "fields":[
                                         
@@ -742 +728 @@
                                 "size":2,
                                 "type":"uint16_t",
-                                "unitDescription":"å¹´",
-                                "valueDescription":"0x0001～0x270F(1～9999)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"月",
+                                "unitDescription":"年",
+                                "valueDescription":"0x0001～0x270F(1～9999)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"月",
                                 "fields":[
                                         
@@ -757 +743 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"月",
-                                "valueDescription":"0x01～0x0C(1～12)"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"日",
+                                "unitDescription":"月",
+                                "valueDescription":"0x01～0x0C(1～12)"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"日",
                                 "fields":[
                                         
@@ -772 +758 @@
                                 "size":1,
                                 "type":"uint8_t",
-                                "unitDescription":"日",
-                                "valueDescription":"0x01～0x1F(1～31)"
+                                "unitDescription":"日",
+                                "valueDescription":"0x01～0x1F(1～31)"
                         }
                 ],
@@ -795 +781 @@
                 ],
                 "arrayCount":0,
-                "description":"電力制限設定",
+                "description":"電力制限設定",
                 "fields":[
                         
@@ -810 +796 @@
                 "type":"uint16_t",
                 "unitDescription":null,
-                "valueDescription":"0x0000～0xFFFF(0～65535W)"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"積算運転時間",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"単位",
+                "valueDescription":"0x0000～0xFFFF(0～65535W)"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"積算運転時間",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"単位",
                                 "fields":[
                                         
@@ -832 +818 @@
                                 "type":"uint8_t",
                                 "unitDescription":null,
-                                "valueDescription":"0x41=秒,0x42=分,0x43=時,0x44=日"
-                        },
-                        {
-                                "arrayCount":0,
-                                "description":"経過時間",
+                                "valueDescription":"0x41=秒,0x42=分,0x43=時,0x44=日"
+                        },
+                        {
+                                "arrayCount":0,
+                                "description":"経過時間",
                                 "fields":[
                                         
@@ -847 +833 @@
                                 "type":"uint32_t",
                                 "unitDescription":null,
-                                "valueDescription":"0x00000000～0xFFFFFFFF(0～4294967295)"
+                                "valueDescription":"0x00000000～0xFFFFFFFF(0～4294967295)"
                         }
                 ],
@@ -869 +855 @@
                 ],
                 "arrayCount":17,
-                "description":"ï¼³ï½
-ｔＭプロパティマップ",
+                "description":"ＳｅｔＭプロパティマップ",
                 "fields":[
                         
@@ -885 +870 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -894 +878 @@
                 ],
                 "arrayCount":17,
-                "description":"Ｇï½
-ｔＭプロパティマップ",
+                "description":"ＧｅｔＭプロパティマップ",
                 "fields":[
                         
@@ -910 +893 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -919 +901 @@
                 ],
                 "arrayCount":17,
-                "description":"状変アナウンスプロパティマップ",
+                "description":"状変アナウンスプロパティマップ",
                 "fields":[
                         
@@ -934 +916 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -943 +924 @@
                 ],
                 "arrayCount":17,
-                "description":"ï¼³ï½
-ｔプロパティマップ",
+                "description":"Ｓｅｔプロパティマップ",
                 "fields":[
                         
@@ -959 +939 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         },
         {
@@ -968 +947 @@
                 ],
                 "arrayCount":17,
-                "description":"Ｇï½
-ｔプロパティマップ",
+                "description":"Ｇｅｔプロパティマップ",
                 "fields":[
                         
@@ -984 +962 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"付録1.参ç
-§"
+                "valueDescription":"付録1.参照"
         }
 ]

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/devices/PropertyList0005.json

@@ -7 +7 @@
                 ],
                 "arrayCount":0,
-                "description":"動作状æ
-‹",
+                "description":"動作状態",
                 "fields":[
                         
@@ -31 +30 @@
                 ],
                 "arrayCount":0,
-                "description":"検知閾値レベル設定",
+                "description":"検知閾値レベル設定",
                 "fields":[
                         
@@ -46 +45 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x31～0x38"
+                "valueDescription":"0x31～0x38"
         },
         {
@@ -54 +53 @@
                 ],
                 "arrayCount":0,
-                "description":"地震発生状æ
-‹",
+                "description":"地震発生状態",
                 "fields":[
                         
@@ -70 +68 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x41=地震発生有,0x42=地震発生無"
+                "valueDescription":"0x41=地震発生有,0x42=地震発生無"
         },
         {
@@ -77 +75 @@
                 ],
                 "arrayCount":0,
-                "description":"地震発生状æ
-‹ãƒªã‚»ãƒƒãƒˆè¨­å®š",
+                "description":"地震発生状態リセット設定",
                 "fields":[
                         
@@ -93 +90 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"0x00=リセット"
+                "valueDescription":"0x00=リセット"
         },
         {
@@ -102 +99 @@
                 ],
                 "arrayCount":0,
-                "description":"è¨­ç½®å ´æ‰€",
+                "description":"設置場所",
                 "fields":[
                         
@@ -118 +115 @@
                 "type":"uint8_t",
                 "unitDescription":null,
-                "valueDescription":"2.2è¨­ç½®å ´æ‰€ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£å‚ç
-§"
-        },
-        {
-                "access":[
-                        "RULE_GET"
-                ],
-                "arrayCount":0,
-                "description":"è¦æ ¼ï¼¶ï½
-ｒｓｉｏｎæƒ
-å ±",
-                "fields":[
-                        {
-                                "arrayCount":0,
-                                "description":"固定1(for future reserved)",
+                "valueDescription":"2.2設置場所プロパティ参照"
+        },
+        {
+                "access":[
+                        "RULE_GET"
+                ],
+                "arrayCount":0,
+                "description":"規格Ｖｅｒｓｉｏｎ情報",
+                "fields":[
+                        {
+                                "arrayCount":0,
+                                "description":"固定1(for future reserved)",
                                 "fields":[
                                         
@@ -147 +141 @@
                         {
                                 "arrayCount":0,
-                                "description":"固定2(for future reserved)",
+                                "description":"固定2(for future reserved)",
                                 "fields":[
                                         
@@ -162 +156 @@
                         {
                                 "arrayCount":0,
-                                "description":"ãƒªãƒªãƒ¼ã‚¹é †ã‚’ASCIIで示す",
+                                "description":"リリース順をASCIIで示す",
                                 "fields":[
                                         
@@ -177 +171 @@
                         {
                                 "arrayCount":0,
-                                "description":"固定4(for future reserved)",
+                                "description":"固定4(for future reserved)",
                                 "fields":[