Merge pull request #137 from webdjoe/output-quality-fix

Output air quality correction

Author: webdjoe

README.md

@@ -102,7 +102,7 @@ To start with the module:
 ```python
 from pyvesync import VeSync
 
-manager = VeSync("EMAIL", "PASSWORD", "TIME_ZONE")
+manager = VeSync("EMAIL", "PASSWORD", "TIME_ZONE", debug=False)
 manager.login()
 
 # Get/Update Devices from server - populate device lists
@@ -543,44 +543,46 @@ This output only applies to dimmable switch.  The standard switch has the defaul
 
 ```python
 {
-	"Device Name": "MyPurifier",
-	"Model": "Core200S",
-	"Subdevice No": "None",
-	"Status": "on",
-	"Online": "online",
-	"Type": "wifi-air",
-	"CID": "<CID>",
-	"Mode": "manual",
-	"Filter Life": "100",
-  "Air Quality": "5",
-	"Fan Level": "1",
-	"Display": true,
-	"Child Lock": false,
-	"Night Light": "off",
-	"Display Config": true,
-	"Display_Forever Config": false
+  "Device Name": "MyPurifier",
+  "Model": "Core200S",
+  "Subdevice No": "None",
+  "Status": "on",
+  "Online": "online",
+  "Type": "wifi-air",
+  "CID": "<CID>",
+  "Mode": "manual",
+  "Filter Life": "100",
+  "Air Quality Level": "5",
+  "Air Quality Value": "1",
+  "Fan Level": "1",
+  "Display": true,
+  "Child Lock": false,
+  "Night Light": "off",
+  "Display Config": true,
+  "Display_Forever Config": false
 }
 ```
 #### JSON Output for 600S Purifier
 
 ```python
 {
-	"Device Name": "My 600s",
-	"Model": "LAP-C601S-WUS",
-	"Subdevice No": "None",
-	"Status": "on",
-	"Online": "online",
-	"Type": "wifi-air",
-	"CID": "<CID>",
-	"Mode": "manual",
-	"Filter Life": "98",
-    "Air Quality": "4",
-	"Fan Level": "3",
-	"Display": true,
-	"Child Lock": false,
-	"Night Light": "off",
-	"Display Config": true,
-	"Display_Forever Config": false
+  "Device Name": "My 600s",
+  "Model": "LAP-C601S-WUS",
+  "Subdevice No": "None",
+  "Status": "on",
+  "Online": "online",
+  "Type": "wifi-air",
+  "CID": "<CID>",
+  "Mode": "manual",
+  "Filter Life": "98",
+  "Air Quality Level": "5",
+  "Air Quality Value": "1",
+  "Fan Level": "3",
+  "Display": true,
+  "Child Lock": false,
+  "Night Light": "off",
+  "Display Config": true,
+  "Display_Forever Config": false
 }
 ```
 

src/pyvesync/vesyncfan.py

@@ -557,8 +557,11 @@ def display(self) -> None:
              self.config['display_forever'], '')
         ]
         if self.air_quality_feature:
-            disp1.append(('Air Quality: ',
-                          self.details['air_quality'], 'ug/m3'))
+            disp1.extend([('Air Quality Level: ',
+                          self.details['air_quality'], ''),
+                          ('Air Quality Value: ',
+                           self.details['air_quality_value'], 'ug/m3')
+                          ])
         for line in disp1:
             print(f'{line[0]:.<20} {line[1]} {line[2]}')
 
@@ -579,9 +582,9 @@ def displayJSON(self) -> str:
             }
         )
         if self.air_quality_feature:
-            sup_val.update(
-                {'Air Quality': str(self.details['air_quality'])}
-            )
+            sup_val['Air Quality Level'] = str(self.details['air_quality'])
+            sup_val['Air Quality Value'] = str(
+                self.details['air_quality_value'])
         return json.dumps(sup_val)
 
 
@@ -802,8 +805,8 @@ def display(self) -> None:
             ('Air Quality: ', self.air_quality, ''),
             ('Mode: ', self.mode, ''),
             ('Screen Status: ', self.screen_status, ''),
-            ('Filter Life: ', json.dumps(self.filter_life), ' percent'),
-        ]
+            ('Filter Life: ', json.dumps(self.filter_life), ' percent')
+            ]
         for line in disp1:
             print(f'{line[0]:.<15} {line[1]} {line[2]}')