Fixes validation of SetInteriorVehicleData parameters with HMI capabilities

1 files changed, 549 insertions, 321 deletions

diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json
index 58b1883884..46a94f2af5 100755
--- a/src/appMain/hmi_capabilities.json
+++ b/src/appMain/hmi_capabilities.json
@@ -340,338 +340,566 @@
       "phoneCapability": {
         "dialNumberEnabled": true
       },
-      "videoStreamingCapability": {
-        "preferredResolution": {
-          "resolutionWidth": 800,
-          "resolutionHeight": 350
-        },
-        "maxBitrate": 10000,
-        "supportedFormats": [
+      "remoteControlCapability": {
+        "climateControlCapabilities": [
           {
-            "protocol": "RAW",
-            "codec": "H264"
+            "moduleName": "primary_climate",
+            "fanSpeedAvailable": true,
+            "desiredTemperatureAvailable": true,
+            "currentTemperatureAvailable": true,
+            "acEnableAvailable": true,
+            "acMaxEnableAvailable": true,
+            "circulateAirEnableAvailable": true,
+            "autoModeEnableAvailable": true,
+            "dualModeEnableAvailable": true,
+            "defrostZoneAvailable": true,
+            "ventilationModeAvailable": true,
+            "defrostZone": [
+              "FRONT",
+              "REAR",
+              "ALL",
+              "NONE"
+            ],
+            "ventilationMode": [
+              "UPPER",
+              "LOWER",
+              "BOTH",
+              "NONE"
+            ]
           }
         ],
-        "remoteControlCapability": {
-          "climateControlCapabilities": [
-            {
-              "moduleName": "primary_climate",
-              "fanSpeedAvailable": true,
-              "desiredTemperatureAvailable": true,
-              "acEnableAvailable": true,
-              "acMaxEnableAvailable": true,
-              "circulateAirEnableAvailable": true,
-              "autoModeEnableAvailable": true,
-              "dualModeEnableAvailable": true,
-              "defrostZoneAvailable": true,
-              "ventilationModeAvailable": true,
-              "defrostZone": [
-                "FRONT",
-                "REAR",
-                "ALL",
-                "NONE"
-              ],
-              "ventilationMode": [
-                "UPPER",
-                "LOWER",
-                "BOTH",
-                "NONE"
-              ]
-            }
-          ],
-          "radioControlCapabilities": [
-            {
-              "moduleName": "radio",
-              "radioEnableAvailable": true,
-              "radioBandAvailable": true,
-              "radioFrequencyAvailable": true,
-              "hdChannelAvailable": true,
-              "rdsDataAvailable": true,
-              "availableHDsAvailable": true,
-              "stateAvailable": true,
-              "signalStrengthAvailable": true,
-              "signalChangeThresholdAvailable": true
-            }
-          ],
-          "buttonCapabilities": [
-            {
-              "name": "AC_MAX",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "AC",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "RECIRCULATE",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "FAN_UP",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "FAN_DOWN",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "TEMP_UP",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "TEMP_DOWN",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "DEFROST_MAX",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "DEFROST",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "DEFROST_REAR",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "UPPER_VENT",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "LOWER_VENT",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "VOLUME_UP",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "VOLUME_DOWN",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "EJECT",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "SOURCE",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "SHUFFLE",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            },
-            {
-              "name": "REPEAT",
-              "shortPressAvailable": true,
-              "longPressAvailable": true,
-              "upDownAvailable": false
-            }
-          ]
-        }
+        "radioControlCapabilities": [
+          {
+            "moduleName": "radio",
+            "radioEnableAvailable": true,
+            "radioBandAvailable": true,
+            "radioFrequencyAvailable": true,
+            "hdChannelAvailable": true,
+            "rdsDataAvailable": true,
+            "availableHDsAvailable": true,
+            "stateAvailable": true,
+            "signalStrengthAvailable": true,
+            "signalChangeThresholdAvailable": true
+          }
+        ],
+        "buttonCapabilities": [
+          {
+            "name": "AC_MAX",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "AC",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "RECIRCULATE",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "FAN_UP",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "FAN_DOWN",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "TEMP_UP",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "TEMP_DOWN",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "DEFROST_MAX",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "DEFROST",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "DEFROST_REAR",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "UPPER_VENT",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "LOWER_VENT",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "VOLUME_UP",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "VOLUME_DOWN",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "EJECT",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "SOURCE",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "SHUFFLE",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "REPEAT",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          }
+        ]
       }
     },
-    "VR": {
-      "capabilities": [
-        "TEXT"
-      ],
-      "language": "EN-US",
-      "languages": [
-        "EN-US",
-        "ES-MX",
-        "FR-CA",
-        "DE-DE",
-        "ES-ES",
-        "EN-GB",
-        "RU-RU",
-        "TR-TR",
-        "PL-PL",
-        "FR-FR",
-        "IT-IT",
-        "SV-SE",
-        "PT-PT",
-        "NL-NL",
-        "ZH-TW",
-        "JA-JP",
-        "AR-SA",
-        "KO-KR",
-        "PT-BR",
-        "CS-CZ",
-        "DA-DK",
-        "NO-NO"
-      ]
+    "mediaClockFormats": [
+      "CLOCK1",
+      "CLOCK2",
+      "CLOCK3",
+      "CLOCKTEXT1",
+      "CLOCKTEXT2",
+      "CLOCKTEXT3",
+      "CLOCKTEXT4"
+    ],
+    "graphicSupported": true,
+    "templatesAvailable": [
+      "DEFAULT",
+      "MEDIA",
+      "NON-MEDIA",
+      "ONSCREEN_PRESETS",
+      "NAV_FULLSCREEN_MAP",
+      "NAV_KEYBOARD",
+      "GRAPHIC_WITH_TEXT",
+      "TEXT_WITH_GRAPHIC",
+      "TILES_ONLY",
+      "TEXTBUTTONS_ONLY",
+      "GRAPHIC_WITH_TILES",
+      "TILES_WITH_GRAPHIC",
+      "GRAPHIC_WITH_TEXT_AND_SOFTBUTTONS",
+      "TEXT_AND_SOFTBUTTONS_WITH_GRAPHIC",
+      "GRAPHIC_WITH_TEXTBUTTONS",
+      "TEXTBUTTONS_WITH_GRAPHIC",
+      "LARGE_GRAPHIC_WITH_SOFTBUTTONS",
+      "DOUBLE_GRAPHIC_WITH_SOFTBUTTONS",
+      "LARGE_GRAPHIC_ONLY"
+    ],
+    "screenParams": {
+      "resolution": {
+        "resolutionWidth": 800,
+        "resolutionHeight": 350
+      },
+      "touchEventAvailable": {
+        "pressAvailable": true,
+        "multiTouchAvailable": false,
+        "doublePressAvailable": false
+      }
     },
-    "TTS": {
-      "capabilities": [
-        "TEXT"
-      ],
-      "language": "EN-US",
-      "languages": [
-        "EN-US",
-        "ES-MX",
-        "FR-CA",
-        "DE-DE",
-        "ES-ES",
-        "EN-GB",
-        "RU-RU",
-        "TR-TR",
-        "PL-PL",
-        "FR-FR",
-        "IT-IT",
-        "SV-SE",
-        "PT-PT",
-        "NL-NL",
-        "ZH-TW",
-        "JA-JP",
-        "AR-SA",
-        "KO-KR",
-        "PT-BR",
-        "CS-CZ",
-        "DA-DK",
-        "NO-NO"
-      ]
+    "numCustomPresetsAvailable": 8,
+    "imageCapabilities": [
+      "DYNAMIC",
+      "STATIC"
+    ]
+  },
+  "audioPassThruCapabilities": {
+    "samplingRate": "44KHZ",
+    "bitsPerSample": "RATE_8_BIT",
+    "audioType": "PCM"
+  },
+  "pcmStreamCapabilities": {
+    "samplingRate": "16KHZ",
+    "bitsPerSample": "RATE_16_BIT",
+    "audioType": "PCM"
+  },
+  "hmiZoneCapabilities": "FRONT",
+  "softButtonCapabilities": [
+    {
+      "shortPressAvailable": true,
+      "longPressAvailable": true,
+      "upDownAvailable": true,
+      "imageSupported": true
+    }
+  ],
+  "systemCapabilities": {
+    "navigationCapability": {
+      "sendLocationEnabled": true,
+      "getWayPointsEnabled": true
     },
-    "Buttons": {
-      "capabilities": [
-        {
-          "name": "PRESET_0",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
-        {
-          "name": "PRESET_1",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
-        {
-          "name": "PRESET_2",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
-        {
-          "name": "PRESET_3",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
-        {
-          "name": "PRESET_4",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
-        {
-          "name": "PRESET_5",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
-        {
-          "name": "PRESET_6",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
-        {
-          "name": "PRESET_7",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
-        {
-          "name": "PRESET_8",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
-        {
-          "name": "PRESET_9",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
-        {
-          "name": "OK",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
-        {
-          "name": "SEEKLEFT",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
-        {
-          "name": "SEEKRIGHT",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
-        {
-          "name": "TUNEUP",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
-        },
+    "phoneCapability": {
+      "dialNumberEnabled": true
+    },
+    "videoStreamingCapability": {
+      "preferredResolution": {
+        "resolutionWidth": 800,
+        "resolutionHeight": 350
+      },
+      "maxBitrate": 10000,
+      "supportedFormats": [
         {
-          "name": "TUNEDOWN",
-          "shortPressAvailable": true,
-          "longPressAvailable": true,
-          "upDownAvailable": true
+          "protocol": "RAW",
+          "codec": "H264"
         }
       ],
-      "presetBankCapabilities": {
-        "onScreenPresetsAvailable": true
+      "remoteControlCapability": {
+        "climateControlCapabilities": [
+          {
+            "moduleName": "primary_climate",
+            "fanSpeedAvailable": true,
+            "desiredTemperatureAvailable": true,
+            "acEnableAvailable": true,
+            "acMaxEnableAvailable": true,
+            "circulateAirEnableAvailable": true,
+            "autoModeEnableAvailable": true,
+            "dualModeEnableAvailable": true,
+            "defrostZoneAvailable": true,
+            "ventilationModeAvailable": true,
+            "defrostZone": [
+              "FRONT",
+              "REAR",
+              "ALL",
+              "NONE"
+            ],
+            "ventilationMode": [
+              "UPPER",
+              "LOWER",
+              "BOTH",
+              "NONE"
+            ]
+          }
+        ],
+        "radioControlCapabilities": [
+          {
+            "moduleName": "radio",
+            "radioEnableAvailable": true,
+            "radioBandAvailable": true,
+            "radioFrequencyAvailable": true,
+            "hdChannelAvailable": true,
+            "rdsDataAvailable": true,
+            "availableHDsAvailable": true,
+            "stateAvailable": true,
+            "signalStrengthAvailable": true,
+            "signalChangeThresholdAvailable": true
+          }
+        ],
+        "buttonCapabilities": [
+          {
+            "name": "AC_MAX",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "AC",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "RECIRCULATE",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "FAN_UP",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "FAN_DOWN",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "TEMP_UP",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "TEMP_DOWN",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "DEFROST_MAX",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "DEFROST",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "DEFROST_REAR",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "UPPER_VENT",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "LOWER_VENT",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "VOLUME_UP",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "VOLUME_DOWN",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "EJECT",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "SOURCE",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "SHUFFLE",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          },
+          {
+            "name": "REPEAT",
+            "shortPressAvailable": true,
+            "longPressAvailable": true,
+            "upDownAvailable": false
+          }
+        ]
       }
-    },
-    "VehicleInfo": {
-      "make": "Ford",
-      "model": "Fiesta",
-      "modelYear": "2013",
-      "trim": "SE"
-    },
-    "SyncMessageVersion": {
-      "majorVersion": 3,
-      "minorVersion": 0
     }
+  },
+  "VR": {
+    "capabilities": [
+      "TEXT"
+    ],
+    "language": "EN-US",
+    "languages": [
+      "EN-US",
+      "ES-MX",
+      "FR-CA",
+      "DE-DE",
+      "ES-ES",
+      "EN-GB",
+      "RU-RU",
+      "TR-TR",
+      "PL-PL",
+      "FR-FR",
+      "IT-IT",
+      "SV-SE",
+      "PT-PT",
+      "NL-NL",
+      "ZH-TW",
+      "JA-JP",
+      "AR-SA",
+      "KO-KR",
+      "PT-BR",
+      "CS-CZ",
+      "DA-DK",
+      "NO-NO"
+    ]
+  },
+  "TTS": {
+    "capabilities": [
+      "TEXT"
+    ],
+    "language": "EN-US",
+    "languages": [
+      "EN-US",
+      "ES-MX",
+      "FR-CA",
+      "DE-DE",
+      "ES-ES",
+      "EN-GB",
+      "RU-RU",
+      "TR-TR",
+      "PL-PL",
+      "FR-FR",
+      "IT-IT",
+      "SV-SE",
+      "PT-PT",
+      "NL-NL",
+      "ZH-TW",
+      "JA-JP",
+      "AR-SA",
+      "KO-KR",
+      "PT-BR",
+      "CS-CZ",
+      "DA-DK",
+      "NO-NO"
+    ]
+  },
+  "Buttons": {
+    "capabilities": [
+      {
+        "name": "PRESET_0",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "PRESET_1",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "PRESET_2",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "PRESET_3",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "PRESET_4",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "PRESET_5",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "PRESET_6",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "PRESET_7",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "PRESET_8",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "PRESET_9",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "OK",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "SEEKLEFT",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "SEEKRIGHT",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "TUNEUP",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      },
+      {
+        "name": "TUNEDOWN",
+        "shortPressAvailable": true,
+        "longPressAvailable": true,
+        "upDownAvailable": true
+      }
+    ],
+    "presetBankCapabilities": {
+      "onScreenPresetsAvailable": true
+    }
+  },
+  "VehicleInfo": {
+    "make": "Ford",
+    "model": "Fiesta",
+    "modelYear": "2013",
+    "trim": "SE"
+  },
+  "SyncMessageVersion": {
+    "majorVersion": 3,
+    "minorVersion": 0
   }
 }
\ No newline at end of file