WFP: Move to 2 pid zone configuration

This is a better example of the possibilites. Also
use new regex support to add all cpus.

Tested-by: Verified fan control using sensor list
and journalctl to make sure configs were loaded

Change-Id: I9b1da9f42f8cf97d4ea749baca3cd89a30301633
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index 96ededf..a2853b6 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -286,7 +286,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Pid 1"
+                "Left"
             ]
         },
         {
@@ -311,7 +311,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Pid 1"
+                "Left"
             ]
         },
         {
@@ -336,7 +336,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Pid 1"
+                "Left"
             ]
         },
         {
@@ -361,7 +361,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Pid 1"
+                "Right"
             ]
         },
         {
@@ -386,7 +386,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Pid 1"
+                "Right"
             ]
         },
         {
@@ -411,7 +411,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Pid 1"
+                "Right"
             ]
         },
         {
@@ -431,13 +431,20 @@
             ],
             "Type": "Stepwise",
             "Zones": [
-                "Pid 1"
+                "Left",
+                "Right"
             ]
         },
         {
             "FailSafePercent": 100,
             "MinThermalRpm": 3000,
-            "Name": "Pid 1",
+            "Name": "Left",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalRpm": 3000,
+            "Name": "Right",
             "Type": "Pid.Zone"
         },
         {
@@ -492,4 +499,4 @@
         "PartNumber": "R1208",
         "SerialNumber": "23165"
     }
-}
+}
\ No newline at end of file