From 6ad9a3eb441cd35a50e9dee5c04b903e08352bd5 Mon Sep 17 00:00:00 2001
From: Andrii Kalinich <AKalinich@luxoft.com>
Date: Thu, 21 Jan 2021 11:20:14 +0200
Subject: [PATCH 1/3] Rename ccpu editor to versions editor

---
 app/StateManager.js                              |  2 +-
 ...EditorView.js => systemVersionsEditorView.js} | 16 ++++++++--------
 app/view/settings/policiesView.js                |  2 +-
 app/view/settingsView.js                         |  2 +-
 index.html                                       |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename app/view/settings/policies/{ccpuEditorView.js => systemVersionsEditorView.js} (86%)

diff --git a/app/StateManager.js b/app/StateManager.js
index 9430d0861..10faa97fe 100644
--- a/app/StateManager.js
+++ b/app/StateManager.js
@@ -198,7 +198,7 @@ var StateManager = Em.StateManager.extend(
                 }
               }
             ),
-            ccpuEditor: Em.State.create(
+            versionsEditor: Em.State.create(
               {
                 enter: function() {
                   this._super();
diff --git a/app/view/settings/policies/ccpuEditorView.js b/app/view/settings/policies/systemVersionsEditorView.js
similarity index 86%
rename from app/view/settings/policies/ccpuEditorView.js
rename to app/view/settings/policies/systemVersionsEditorView.js
index bd5c8f5c7..0db8d76da 100644
--- a/app/view/settings/policies/ccpuEditorView.js
+++ b/app/view/settings/policies/systemVersionsEditorView.js
@@ -24,21 +24,21 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-SDL.CcpuEditorView = Em.ContainerView.create(
+SDL.SystemVersionsEditorView = Em.ContainerView.create(
     {
-      elementId: 'policies_settings_ccpu_editor_view',
+      elementId: 'policies_settings_system_versions_editor_view',
       classNames: 'in_settings_separate_view',
       classNameBindings: [
-        'SDL.States.settings.policies.ccpuEditor.active:active_state:inactive_state'
+        'SDL.States.settings.policies.versionsEditor.active:active_state:inactive_state'
       ],
       childViews: [
-        'ccpuTitle',
+        'versionsTitle',
         'backButton',
         'ccpuVersionLabel',
         'ccpuVersionInput',
         'applyButton'
       ],
-      ccpuTitle: SDL.Label.extend(
+      versionsTitle: SDL.Label.extend(
         {
           classNames: 'label',
           content: 'Configure CCPU version'
@@ -72,10 +72,10 @@ SDL.CcpuEditorView = Em.ContainerView.create(
       ),
       applyButton: SDL.Button.extend(
         {
-          elementId: 'applyButton',
-          classNames: 'applyButton button',
+          elementId: 'systemVersionsApplyButton',
+          classNames: 'systemVersionsApplyButton button',
           text: 'Apply',
-          action: 'applyNewCcpuVersionValue',
+          action: 'applyNewVersionValues',
           target: 'SDL.SettingsController',
           onDown: false
         }
diff --git a/app/view/settings/policiesView.js b/app/view/settings/policiesView.js
index 9da817f11..d6036dbcc 100644
--- a/app/view/settings/policiesView.js
+++ b/app/view/settings/policiesView.js
@@ -87,7 +87,7 @@ SDL.PoliciesView = Em.ContainerView.create(
             type: SDL.Button,
             params: {
               action: 'onState',
-              goToState: 'policies.ccpuEditor',
+              goToState: 'policies.versionsEditor',
               text: 'Configure CCPU version',
               target: 'SDL.SettingsController',
               templateName: 'arrow',
diff --git a/app/view/settingsView.js b/app/view/settingsView.js
index 4fdc518de..fb7c78f67 100644
--- a/app/view/settingsView.js
+++ b/app/view/settingsView.js
@@ -63,7 +63,7 @@ SDL.SettingsView = Em.ContainerView.create(
       SDL.ExteriorLightView,
       SDL.SeatView,
       SDL.PolicyConfigListView,
-      SDL.CcpuEditorView
+      SDL.SystemVersionsEditorView,
     ],
     /** Left menu */
     leftMenu: Em.ContainerView.extend(
diff --git a/index.html b/index.html
index 67b62bcd1..bb57dfc32 100644
--- a/index.html
+++ b/index.html
@@ -240,7 +240,7 @@
 <script type="text/javascript" src="app/view/settings/policiesView.js"></script>
 <script type="text/javascript" src="app/view/settings/HMISettingsView.js"></script>
 <script type="text/javascript" src="app/view/settings/policies/policyConfigDataList.js"></script>
-<script type="text/javascript" src="app/view/settings/policies/ccpuEditorView.js"></script>
+<script type="text/javascript" src="app/view/settings/policies/systemVersionsEditorView.js"></script>
 
 <!-- RPCControls view-->
 <script type="text/javascript"

From b93327da5392703b0949e3f598b4842f1accc700 Mon Sep 17 00:00:00 2001
From: Andrii Kalinich <AKalinich@luxoft.com>
Date: Thu, 21 Jan 2021 11:22:13 +0200
Subject: [PATCH 2/3] Added vehicle type editor

---
 app/StateManager.js                           |   8 +
 app/controller/SettingsController.js          |  59 +++++-
 app/model/sdl/VehicleInfoModel.js             |   8 +-
 .../policies/vehicleTypeEditorView.js         | 185 ++++++++++++++++++
 app/view/settings/policiesView.js             |  11 ++
 app/view/settingsView.js                      |   1 +
 css/settings.css                              |  92 ++++++++-
 index.html                                    |   1 +
 8 files changed, 358 insertions(+), 7 deletions(-)
 create mode 100644 app/view/settings/policies/vehicleTypeEditorView.js

diff --git a/app/StateManager.js b/app/StateManager.js
index 10faa97fe..649c029ad 100644
--- a/app/StateManager.js
+++ b/app/StateManager.js
@@ -206,6 +206,14 @@ var StateManager = Em.StateManager.extend(
                 }
               }
             ),
+            vehicleTypeEditor: Em.State.create(
+              {
+                enter: function() {
+                  this._super();
+                  SDL.SettingsController.updateVehicleTypeValues(SDL.SDLVehicleInfoModel.vehicleType);
+                }
+              }
+            ),
             deviceConfig: Em.State.create(
               {
                 enter: function() {
diff --git a/app/controller/SettingsController.js b/app/controller/SettingsController.js
index c98a7e311..268d205bd 100644
--- a/app/controller/SettingsController.js
+++ b/app/controller/SettingsController.js
@@ -74,6 +74,11 @@ SDL.SettingsController = Em.Object.create(
      */
     editedCcpuVersionValue: "",
 
+    /**
+     * @description Map of vehicle type data displayed in user inputs
+     */
+    editedVehicleType: {},
+
     onState: function(event) {
       if(SDL.States.currentState.name === 'rpcconfig'){
         FFW.RPCHelper.setCurrentAppID(null);
@@ -608,8 +613,60 @@ SDL.SettingsController = Em.Object.create(
     /**
      * @description Saves new CCPU version value from user input
      */
-    applyNewCcpuVersionValue: function() {
+    applyNewVersionValues: function() {
       SDL.SDLModel.data.ccpuVersion = this.editedCcpuVersionValue;
+
+      Em.Logger.log("New system version settings have been applied");
+    },
+
+    /**
+     * @description Getter for all available vehicle type data and corresponding controls
+     */
+    getVehicleTypeCheckboxes: function() {
+      return [
+        { checkbox: SDL.VehicleTypeEditorView.vehicleMakeCheckBox, property: 'make' },
+        { checkbox: SDL.VehicleTypeEditorView.vehicleModelCheckBox, property: 'model' },
+        { checkbox: SDL.VehicleTypeEditorView.vehicleYearCheckBox, property: 'modelYear' },
+        { checkbox: SDL.VehicleTypeEditorView.vehicleTrimCheckBox, property: 'trim' }
+      ];
+    },
+
+    /**
+     * @description Applies edited by user vehicle data settings to internal data
+     */
+    applyNewVehicleTypeValues: function() {
+      let setNewVehicleTypeValue = (checkbox, property) => {
+        if (checkbox.checked) {
+          SDL.SDLVehicleInfoModel.set('vehicleType.' + property, this.editedVehicleType[property]);
+        } else {
+          SDL.SDLVehicleInfoModel.set('vehicleType.' + property, null);
+        }
+      };
+
+      this.getVehicleTypeCheckboxes().forEach( (item) => {
+        setNewVehicleTypeValue(item.checkbox, item.property);
+      });
+
+      Em.Logger.log("New vehicle type have been applied");
+    },
+
+    /**
+     * @description Updated UI controls and values according to internal data values
+     * @param {Object} new_values internal data values structure
+     */
+    updateVehicleTypeValues: function(new_values) {
+      let setNewVehicleTypeValue = (checkbox, property) => {
+        if (new_values[property] !== null) {
+          this.set('editedVehicleType.' + property, new_values[property]);
+          checkbox.set('checked', true);
+        } else {
+          checkbox.set('checked', false);
+        }
+      };
+
+      this.getVehicleTypeCheckboxes().forEach( (item) => {
+        setNewVehicleTypeValue(item.checkbox, item.property);
+      });
     },
 
     /**
diff --git a/app/model/sdl/VehicleInfoModel.js b/app/model/sdl/VehicleInfoModel.js
index c76f8a97f..2151810ff 100644
--- a/app/model/sdl/VehicleInfoModel.js
+++ b/app/model/sdl/VehicleInfoModel.js
@@ -357,7 +357,13 @@ SDL.SDLVehicleInfoModel = Em.Object.create(
      * @type {Number}
      */
     getVehicleType: function(id) {
-      FFW.VehicleInfo.GetVehicleTypeResponse(this.vehicleType, id);
+      let data_to_send = {};
+      Object.keys(this.vehicleType).forEach((key) => {
+        if (this.vehicleType[key] !== null) {
+          data_to_send[key] = this.vehicleType[key];
+        }
+      });
+      FFW.VehicleInfo.GetVehicleTypeResponse(data_to_send, id);
     },
     /**
      * SDL VehicleInfo.GetDTCs handler fill data for response about vehicle
diff --git a/app/view/settings/policies/vehicleTypeEditorView.js b/app/view/settings/policies/vehicleTypeEditorView.js
new file mode 100644
index 000000000..6ab69f7d8
--- /dev/null
+++ b/app/view/settings/policies/vehicleTypeEditorView.js
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met: ·
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer. · Redistributions in binary
+ * form must reproduce the above copyright notice, this list of conditions and
+ * the following disclaimer in the documentation and/or other materials provided
+ * with the distribution. · Neither the name of the Ford Motor Company nor the
+ * names of its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+SDL.VehicleTypeEditorView = Em.ContainerView.create(
+    {
+      elementId: 'policies_settings_vehicle_type_editor_view',
+      classNames: 'in_settings_separate_view',
+      classNameBindings: [
+        'SDL.States.settings.policies.vehicleTypeEditor.active:active_state:inactive_state'
+      ],
+      childViews: [
+        'versionsTitle',
+        'backButton',
+        'vehicleMakeLabel',
+        'vehicleMakeCheckBox',
+        'vehicleMakeInput',
+
+        'vehicleModelLabel',
+        'vehicleModelCheckBox',
+        'vehicleModelInput',
+
+        'vehicleYearLabel',
+        'vehicleYearCheckBox',
+        'vehicleYearInput',
+
+        'vehicleTrimLabel',
+        'vehicleTrimCheckBox',
+        'vehicleTrimInput',
+
+        'applyButton'
+      ],
+      versionsTitle: SDL.Label.extend(
+        {
+          classNames: 'label',
+          content: 'Configure vehicle type parameters'
+        }
+      ),
+      backButton: SDL.Button.extend(
+        {
+          classNames: [
+            'backButton'
+          ],
+          action: 'onState',
+          target: 'SDL.SettingsController',
+          goToState: 'policies',
+          icon: 'images/media/ico_back.png',
+          onDown: false
+        }
+      ),
+      vehicleMakeLabel: SDL.Label.extend(
+        {
+          classNames: 'vehicleMakeLabel vehicleBaseLabel',
+          content: 'Make: '
+        }
+      ),
+      vehicleMakeCheckBox: Em.Checkbox.extend(
+        {
+          elementId: 'vehicleMakeCheckBox',
+          classNames: 'vehicleMakeCheckBox vehicleBaseCheckBox item',
+
+          click: function(event) {
+            SDL.VehicleTypeEditorView.vehicleMakeInput.set('disabled', !event.currentTarget.checked)
+          }
+        }
+      ),
+      vehicleMakeInput: Ember.TextField.extend(
+        {
+          elementId: 'vehicleMakeInput',
+          classNames: 'vehicleMakeInput vehicleBaseInput dataInput',
+          placeholder: '<Type vehicle make here>',
+          valueBinding: 'SDL.SettingsController.editedVehicleType.make'
+        }
+      ),
+
+      vehicleModelLabel: SDL.Label.extend(
+        {
+          classNames: 'vehicleModelLabel vehicleBaseLabel',
+          content: 'Model: '
+        }
+      ),
+      vehicleModelCheckBox: Em.Checkbox.extend(
+        {
+          elementId: 'vehicleModelCheckBox',
+          classNames: 'vehicleModelCheckBox vehicleBaseCheckBox item',
+
+          click: function(event) {
+            SDL.VehicleTypeEditorView.vehicleModelInput.set('disabled', !event.currentTarget.checked)
+          }
+        }
+      ),
+      vehicleModelInput: Ember.TextField.extend(
+        {
+          elementId: 'vehicleModelInput',
+          classNames: 'vehicleModelInput vehicleBaseInput dataInput',
+          placeholder: '<Type vehicle model here>',
+          valueBinding: 'SDL.SettingsController.editedVehicleType.model'
+        }
+      ),
+
+      vehicleYearLabel: SDL.Label.extend(
+        {
+          classNames: 'vehicleYearLabel vehicleBaseLabel',
+          content: 'Year: '
+        }
+      ),
+      vehicleYearCheckBox: Em.Checkbox.extend(
+        {
+          elementId: 'vehicleYearCheckBox',
+          classNames: 'vehicleYearCheckBox vehicleBaseCheckBox item',
+
+          click: function(event) {
+            SDL.VehicleTypeEditorView.vehicleYearInput.set('disabled', !event.currentTarget.checked)
+          }
+        }
+      ),
+      vehicleYearInput: Ember.TextField.extend(
+        {
+          elementId: 'vehicleYearInput',
+          classNames: 'vehicleYearInput vehicleBaseInput dataInput',
+          placeholder: '<Type vehicle year here>',
+          valueBinding: 'SDL.SettingsController.editedVehicleType.modelYear'
+        }
+      ),
+
+      vehicleTrimLabel: SDL.Label.extend(
+        {
+          classNames: 'vehicleTrimLabel vehicleBaseLabel',
+          content: 'Trim: '
+        }
+      ),
+      vehicleTrimCheckBox: Em.Checkbox.extend(
+        {
+          elementId: 'vehicleTrimCheckBox',
+          classNames: 'vehicleTrimCheckBox vehicleBaseCheckBox item',
+
+          click: function(event) {
+            SDL.VehicleTypeEditorView.vehicleTrimInput.set('disabled', !event.currentTarget.checked)
+          }
+        }
+      ),
+      vehicleTrimInput: Ember.TextField.extend(
+        {
+          elementId: 'vehicleTrimInput',
+          classNames: 'vehicleTrimInput vehicleBaseInput dataInput',
+          placeholder: '<Type vehicle trim here>',
+          valueBinding: 'SDL.SettingsController.editedVehicleType.trim'
+        }
+      ),
+
+
+      applyButton: SDL.Button.extend(
+        {
+          elementId: 'vehicleTypeApplyButton',
+          classNames: 'vehicleTypeApplyButton button',
+          text: 'Apply',
+          action: 'applyNewVehicleTypeValues',
+          target: 'SDL.SettingsController',
+          onDown: false
+        }
+      )
+    }
+  );
diff --git a/app/view/settings/policiesView.js b/app/view/settings/policiesView.js
index d6036dbcc..1d0e5a7f3 100644
--- a/app/view/settings/policiesView.js
+++ b/app/view/settings/policiesView.js
@@ -94,6 +94,17 @@ SDL.PoliciesView = Em.ContainerView.create(
               onDown: false,
             }
           },
+          {
+            type: SDL.Button,
+            params: {
+              action: 'onState',
+              goToState: 'policies.vehicleTypeEditor',
+              text: 'Configure vehicle type parameters',
+              target: 'SDL.SettingsController',
+              templateName: 'arrow',
+              onDown: false,
+            }
+          },
           {
             type: SDL.Button,
             params: {
diff --git a/app/view/settingsView.js b/app/view/settingsView.js
index fb7c78f67..529d7d00c 100644
--- a/app/view/settingsView.js
+++ b/app/view/settingsView.js
@@ -64,6 +64,7 @@ SDL.SettingsView = Em.ContainerView.create(
       SDL.SeatView,
       SDL.PolicyConfigListView,
       SDL.SystemVersionsEditorView,
+      SDL.VehicleTypeEditorView
     ],
     /** Left menu */
     leftMenu: Em.ContainerView.extend(
diff --git a/css/settings.css b/css/settings.css
index 8e2021d77..85c87e6dc 100644
--- a/css/settings.css
+++ b/css/settings.css
@@ -342,17 +342,99 @@
 
 #settingsView .in_settings_separate_view .ccpuVersionInput {
     position: absolute;
-    left: 145px;
+    left: 190px;
     top: 115px;
-    width: 400px;
+    width: 450px;
+}
+
+#settingsView .in_settings_separate_view .label.vehicleBaseLabel {
+    position: absolute;
+    left: 35px;
+    background: black;
+    width: 120px;
+}
+
+#settingsView .in_settings_separate_view .vehicleBaseInput {
+    position: absolute;
+    left: 120px;
+    width: 609px;
+}
+
+#settingsView .in_settings_separate_view .vehicleBaseInput:disabled {
+    color: gray;
 }
 
-#settingsView .in_settings_separate_view .applyButton {
+#settingsView .in_settings_separate_view .vehicleBaseCheckBox {
     position: absolute;
-    left: 585px;
+    left: 25px;
+    z-index: 2;
+}
+
+#settingsView .in_settings_separate_view .label.vehicleMakeLabel {
+    top: 110px;
+}
+
+#settingsView .in_settings_separate_view .vehicleMakeInput {
     top: 115px;
-    width: 75px;
+}
+
+#settingsView .in_settings_separate_view .vehicleMakeCheckBox {
+    top: 127px;
+}
+
+
+#settingsView .in_settings_separate_view .label.vehicleModelLabel {
+    top: 170px;
+}
+
+#settingsView .in_settings_separate_view .vehicleModelInput {
+    top: 175px;
+}
+
+#settingsView .in_settings_separate_view .vehicleModelCheckBox {
+    top: 187px;
+}
+
+
+#settingsView .in_settings_separate_view .label.vehicleYearLabel {
+    top: 230px;
+}
+
+#settingsView .in_settings_separate_view .vehicleYearInput {
+    top: 235px;
+}
+
+#settingsView .in_settings_separate_view .vehicleYearCheckBox {
+    top: 247px;
+}
+
+
+#settingsView .in_settings_separate_view .label.vehicleTrimLabel {
+    top: 290px;
+}
+
+#settingsView .in_settings_separate_view .vehicleTrimInput {
+    top: 295px;
+}
+
+#settingsView .in_settings_separate_view .vehicleTrimCheckBox {
+    top: 307px;
+}
+
+#settingsView .in_settings_separate_view .systemVersionsApplyButton {
+    position: absolute;
+    top: 170px;
+    left: 190px;
+    width: 125px;
+    text-align: center;
+}
+
+#settingsView .in_settings_separate_view .vehicleTypeApplyButton {
+    position: absolute;
+    top: 338px;
+    width: 125px;
     text-align: center;
+    right: 6px;
 }
 
 #settingsView .in_settings_separate_view .label.ccpuVersionLabel {
diff --git a/index.html b/index.html
index bb57dfc32..567c671f7 100644
--- a/index.html
+++ b/index.html
@@ -241,6 +241,7 @@
 <script type="text/javascript" src="app/view/settings/HMISettingsView.js"></script>
 <script type="text/javascript" src="app/view/settings/policies/policyConfigDataList.js"></script>
 <script type="text/javascript" src="app/view/settings/policies/systemVersionsEditorView.js"></script>
+<script type="text/javascript" src="app/view/settings/policies/vehicleTypeEditorView.js"></script>
 
 <!-- RPCControls view-->
 <script type="text/javascript"

From 770bcf9dbd8630a9b98dff1d59abc6f57aedfe8b Mon Sep 17 00:00:00 2001
From: Andrii Kalinich <AKalinich@luxoft.com>
Date: Tue, 22 Dec 2020 18:15:31 -0500
Subject: [PATCH 3/3] Add systemHardwareVersion according to revision

---
 app/StateManager.js                           |  6 ++++
 app/controller/SettingsController.js          | 14 ++++++++-
 app/model/sdl/Abstract/data.js                |  5 ++++
 .../policies/systemVersionsEditorView.js      | 30 ++++++++++++++++++-
 app/view/settings/policiesView.js             |  2 +-
 css/settings.css                              | 28 ++++++++++++++++-
 ffw/BasicCommunicationRPC.js                  |  3 ++
 7 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/app/StateManager.js b/app/StateManager.js
index 649c029ad..067829bcf 100644
--- a/app/StateManager.js
+++ b/app/StateManager.js
@@ -203,6 +203,12 @@ var StateManager = Em.StateManager.extend(
                 enter: function() {
                   this._super();
                   SDL.SettingsController.set('editedCcpuVersionValue', SDL.SDLModel.data.ccpuVersion);
+                  if (SDL.SDLModel.data.hardwareVersion != null) {
+                    SDL.SettingsController.set('editedHardwareVersionValue', SDL.SDLModel.data.hardwareVersion);
+                    SDL.SettingsController.set('hardwareVersionEditingEnabled', true);
+                  } else {
+                    SDL.SettingsController.set('hardwareVersionEditingEnabled', false);
+                  }
                 }
               }
             ),
diff --git a/app/controller/SettingsController.js b/app/controller/SettingsController.js
index 268d205bd..b9b8d94cc 100644
--- a/app/controller/SettingsController.js
+++ b/app/controller/SettingsController.js
@@ -74,6 +74,16 @@ SDL.SettingsController = Em.Object.create(
      */
     editedCcpuVersionValue: "",
 
+    /**
+     * @description Value of hardware version displayed in user input
+     */
+    editedHardwareVersionValue: "",
+
+    /**
+     * @description Flag to enable/disable hardware version text field
+     */
+    hardwareVersionEditingEnabled: true,
+
     /**
      * @description Map of vehicle type data displayed in user inputs
      */
@@ -611,10 +621,12 @@ SDL.SettingsController = Em.Object.create(
     },
 
     /**
-     * @description Saves new CCPU version value from user input
+     * @description Saves new CCPU and hardware version values from user input
      */
     applyNewVersionValues: function() {
       SDL.SDLModel.data.ccpuVersion = this.editedCcpuVersionValue;
+      SDL.SDLModel.data.hardwareVersion = this.hardwareVersionEditingEnabled ?
+        this.editedHardwareVersionValue : null;
 
       Em.Logger.log("New system version settings have been applied");
     },
diff --git a/app/model/sdl/Abstract/data.js b/app/model/sdl/Abstract/data.js
index 65c3d8624..322b54faf 100644
--- a/app/model/sdl/Abstract/data.js
+++ b/app/model/sdl/Abstract/data.js
@@ -652,6 +652,11 @@ SDL.SDLModelData = Em.Object.create(
      * @type {String}
      */
     ccpuVersion: '12345_US',
+    /**
+     * Hardware version value
+     * @type {String}
+     */
+    hardwareVersion: '123.456.7890',
     /**
      * Parameter describes if performInteraction session was started on HMI
      * this flag set to true when UI.PerformInteraction request came on HMI
diff --git a/app/view/settings/policies/systemVersionsEditorView.js b/app/view/settings/policies/systemVersionsEditorView.js
index 0db8d76da..df3b1757c 100644
--- a/app/view/settings/policies/systemVersionsEditorView.js
+++ b/app/view/settings/policies/systemVersionsEditorView.js
@@ -36,12 +36,15 @@ SDL.SystemVersionsEditorView = Em.ContainerView.create(
         'backButton',
         'ccpuVersionLabel',
         'ccpuVersionInput',
+        'hardwareVersionCheckBox',
+        'hardwareVersionLabel',
+        'hardwareVersionInput',
         'applyButton'
       ],
       versionsTitle: SDL.Label.extend(
         {
           classNames: 'label',
-          content: 'Configure CCPU version'
+          content: 'Configure CCPU and hardware versions'
         }
       ),
       backButton: SDL.Button.extend(
@@ -70,6 +73,31 @@ SDL.SystemVersionsEditorView = Em.ContainerView.create(
           valueBinding: 'SDL.SettingsController.editedCcpuVersionValue'
         }
       ),
+      hardwareVersionCheckBox: Em.Checkbox.extend(
+        {
+            elementId: 'hardwareVersionCheckBox',
+            classNames: 'hardwareVersionCheckBox item',
+            checkedBinding: 'SDL.SettingsController.hardwareVersionEditingEnabled'
+        }
+      ),
+      hardwareVersionLabel: SDL.Label.extend(
+        {
+          classNames: 'hardwareVersionLabel',
+          content: 'Hardware version: '
+        }
+      ),
+      hardwareVersionInput: Ember.TextField.extend(
+        {
+          elementId: 'hardwareVersionInput',
+          classNames: 'hardwareVersionInput dataInput',
+          placeholder: '<Type hardware version here>',
+          valueBinding: 'SDL.SettingsController.editedHardwareVersionValue',
+          disabledBinding: 'isEditingEnabled',
+          isEditingEnabled: function() {
+            return !SDL.SettingsController.hardwareVersionEditingEnabled;
+          }.property('SDL.SettingsController.hardwareVersionEditingEnabled')
+        }
+      ),
       applyButton: SDL.Button.extend(
         {
           elementId: 'systemVersionsApplyButton',
diff --git a/app/view/settings/policiesView.js b/app/view/settings/policiesView.js
index 1d0e5a7f3..4c461e40c 100644
--- a/app/view/settings/policiesView.js
+++ b/app/view/settings/policiesView.js
@@ -88,7 +88,7 @@ SDL.PoliciesView = Em.ContainerView.create(
             params: {
               action: 'onState',
               goToState: 'policies.versionsEditor',
-              text: 'Configure CCPU version',
+              text: 'Configure CCPU and hardware versions',
               target: 'SDL.SettingsController',
               templateName: 'arrow',
               onDown: false,
diff --git a/css/settings.css b/css/settings.css
index 85c87e6dc..ed00b589f 100644
--- a/css/settings.css
+++ b/css/settings.css
@@ -421,9 +421,27 @@
     top: 307px;
 }
 
+#settingsView .in_settings_separate_view .hardwareVersionInput {
+    position: absolute;
+    left: 190px;
+    top: 190px;
+    width: 450px;
+}
+
+#settingsView .in_settings_separate_view .hardwareVersionInput:disabled {
+    color: gray;
+}
+
+#settingsView .in_settings_separate_view .hardwareVersionCheckBox {
+    position: absolute;
+    left: 25px;
+    top: 203px;
+    z-index: 2;
+}
+
 #settingsView .in_settings_separate_view .systemVersionsApplyButton {
     position: absolute;
-    top: 170px;
+    top: 250px;
     left: 190px;
     width: 125px;
     text-align: center;
@@ -445,6 +463,14 @@
     width: 120px;
 }
 
+#settingsView .in_settings_separate_view .label.hardwareVersionLabel {
+    position: absolute;
+    top: 185px;
+    left: 30px;
+    background: black;
+    width: 150px;
+}
+
 #settingsView .in_settings_separate_view .sendRequestButton {
     top: 210px;
     left: 130px;
diff --git a/ffw/BasicCommunicationRPC.js b/ffw/BasicCommunicationRPC.js
index 668151f74..1a32692ef 100644
--- a/ffw/BasicCommunicationRPC.js
+++ b/ffw/BasicCommunicationRPC.js
@@ -704,6 +704,9 @@ FFW.BasicCommunication = FFW.RPCObserver
                 'wersCountryCode': 'wersCountryCode'
               }
             };
+            if (SDL.SDLModel.data.hardwareVersion != null) {
+              JSONMessage.result.systemHardwareVersion = SDL.SDLModel.data.hardwareVersion;
+            }
             this.sendMessage(JSONMessage);
           }
           if (request.method == 'BasicCommunication.PolicyUpdate') {