diff -r b930440af354 -r de9122b5680a HP3562A/enum_types.py
--- a/HP3562A/enum_types.py	Tue Dec 18 00:38:33 2007 +0100
+++ b/HP3562A/enum_types.py	Wed Dec 19 00:19:25 2007 +0100
@@ -70,52 +70,52 @@
         2: "Volt (indicates peak only)",
         }
 
-EAMP = {0: "Volts",
-        1: "Volts squared",
-        2: "PSD (V²/Hz)",
-        3: "ESD (V²s/Hz)",
-        4: "PSD¹² (V/Hz¹²)",
-        5: "No unit",
-        6: "Unit volts",
-        7: "Unit volts²",
+EAMP = {0: u"Volts",
+        1: u"Volts²",
+        2: u"PSD (V²/Hz)",
+        3: u"ESD (V²s/Hz)",
+        4: u"PSD¹² (V/Hz¹²)",
+        5: u"No unit",
+        6: u"Unit volts",
+        7: u"Unit volts²",
         }
         
-EXAXIS= {0: "No units",
-         1: "Hertz",
-         2: "RPM",
-         3: "Orders",
-         4: "Seconds",
-         5: "Revs",
-         6: "Degrees",
-         7: "dB",
-         8: "dBV",
-         9: "Volts",
-         10: "V Hz¹²",
-         11: "Hz/s",
-         12: "V/EU",
-         13: "Vrms",
-         14: "V²/Hz",
-         15: "%",
-         16: "Points",
-         17: "Records",
-         18: "Ohms",
-         19: "Hertz/octave",
-         20: "Pulse/Rev",
-         21: "Decades",
-         22: "Minutes",
-         23: "V²s/Hz",
-         24: "Octave",
-         25: "Seconds/Decade",
-         26: "Seconds/Octave",
-         27: "Hz/Point",
-         28: "Points/Sweep",
-         29: "Points/Decade",
-         30: "Points/Octave",
-         31: "V/Vrms",
-         32: "V²",
-         33: "EU referenced to chan 1",
-         34: "EU referenced to chan 2",
-         35: "EU value",
+EXAXIS= {0: u"No units",
+         1: u"Hertz",
+         2: u"RPM",
+         3: u"Orders",
+         4: u"Seconds",
+         5: u"Revs",
+         6: u"Degrees",
+         7: u"dB",
+         8: u"dBV",
+         9: u"Volts",
+         10: u"V\u221AHz",
+         11: u"Hz/s",
+         12: u"V/EU",
+         13: u"Vrms",
+         14: u"V²/Hz",
+         15: u"%",
+         16: u"Points",
+         17: u"Records",
+         18: u"Ohms",
+         19: u"Hertz/octave",
+         20: u"Pulse/Rev",
+         21: u"Decades",
+         22: u"Minutes",
+         23: u"V²s/Hz",
+         24: u"Octave",
+         25: u"Seconds/Decade",
+         26: u"Seconds/Octave",
+         27: u"Hz/Point",
+         28: u"Points/Sweep",
+         29: u"Points/Decade",
+         30: u"Points/Octave",
+         31: u"V/Vrms",
+         32: u"V²",
+         33: u"EU referenced to chan 1",
+         34: u"EU referenced to chan 2",
+         35: u"EU value",
          }
 
 EMEAS = {0: "Linear resolution",
@@ -246,3 +246,25 @@
 ETRGLVLUNT = EXAXIS
 
 ECPTLGHUNT = EXAXIS
+
+EYCOORD = { 1: "Real",
+            2: "Imaginary",
+            3: "Linear magnitude",
+            4: "Log magnitude",
+            5: "dB",
+            6: "Nyquist",
+            7: "Not used",
+            8: "Phase",
+            9: "Nichols",
+            10: "dBm",
+            }
+
+EDISPSMP = { 0: "Not sampled", # #displayed elements = total elements
+             1: "Half sampled", # #displayed elements = total elements/2
+             2: "Sampled", # #displayed elements < total elements
+            }
+ESCAL = { 0: "X and Y auto scale",
+          1: "X fixed, Y auto scale",
+          2: "X auto scale, Y fixed",
+          3: "X and Y fixed",
+          }