added and fixed some type hinting stuff

Author: mfg92

csvexport.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 from hantek1008 import Hantek1008, CorrectionDataType, ZeroOffsetShiftCompensationFunctionType
-from typing import Union, Optional, List, Dict, Tuple, Callable, Generator, Any
+from typing import Union, Optional, List, Dict, Any, IO
 import logging as log
 import argparse
 import time
@@ -136,7 +136,7 @@ def main(csv_file_path: str,
             break
         except USBError as usb_error:
             # usb error bug occurred? try to close the device or reset it, sleep a sec and restart
-            log.error(usb_error)
+            log.error(str(usb_error))
             try:
                 device.close()
             except:
@@ -204,7 +204,7 @@ def sample(device: Hantek1008, raw_or_volt: str, selected_channels: List[int], s
         # output_csv_filename = "channel_data.csv"
         if csv_file_path == '-':
             log.info("Exporting data to stdout...")
-            csv_file = sys.stdout
+            csv_file: IO[str] = sys.stdout
         elif csv_file_path.endswith(".xz"):
             log.info(f"Exporting data lzma-compressed to file '{csv_file_path}'...")
             csv_file = lzma.open(csv_file_path, 'at', newline='')

hantek1008.py

@@ -771,9 +771,9 @@ def __calc_correction_factor(self, delta_to_zero: float, channel_id: int, vscale
     @overrides
     def request_samples_burst_mode(self, mode: str = "volt") \
             -> Union[
-               Tuple[List[List[int]], List[List[int]]],
-               Tuple[List[List[float]], List[List[float]]],
-               Tuple[List[Union[List[float], List[int]]], List[Union[List[float], List[int]]]],
+               Tuple[List[List[int]], List[List[int]]],  # mode == raw
+               Tuple[List[List[float]], List[List[float]]],  # mode == volt
+               Tuple[List[Union[List[float], List[int]]], List[Union[List[float], List[int]]]],  # mode == volt+raw
                ]:
         assert mode in ["raw", "volt", "volt+raw"]
         assert self.__zero_offset_shift_compensation_channel is None, \

utils/electro.py

@@ -151,7 +151,8 @@ def measure_offset_fft(samples_a: List[float],
 
 
 def calc_power(voltage_data: List[float],
-               ampere_data: List[float]):
+               ampere_data: List[float])\
+        -> Tuple[float, float, float]:
     assert len(voltage_data) == len(ampere_data) > 0
     # P = 0  # active power/real power      (Wirkleistung)
     # Q = 0  # reactive power               (Blindleistung)