Merge Carglglz/develop for upydevice 0.3.5 release

Merge develop branch for upydevice 0.3.5 release

Author: Carglglz

changelog.md

@@ -4,7 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 
-## [0.3.5] Unreleased Github Repo [develop]
+## [0.3.6] Unreleased Github Repo [develop]
+## [0.3.5] - 2022-03-15
+### Fix
+- reassign ip to hostname if hostname is not None for disconnect method
 ## [0.3.4] - 2022-03-04
 ### Fix
 - `WebSocketDevice` double unwanted `super().__init__` bug.

setup.py

@@ -9,7 +9,7 @@ def readme():
 
 
 setup(name='upydevice',
-      version='0.3.4',
+      version='0.3.5',
       description='Python library to interface with wireless/serial MicroPython devices',
       long_description=readme(),
       long_description_content_type='text/markdown',

upydevice/__init__.py

@@ -148,4 +148,4 @@
 
 from .upydevice import *
 name = 'upydevice'
-__version__ = '0.3.4'
+__version__ = '0.3.5'

upydevice/decorators.py

@@ -175,7 +175,7 @@ def wrapper_cmd(*args, **kwargs):
             else:
                 pass
             if debug:
-                dev_dict['dev'].cmd(cmd)
+                dev_dict['dev'].cmd(cmd, long_string=True)
             else:
                 dev_dict['dev'].cmd(cmd, silent=True)
             if rtn:
@@ -246,7 +246,7 @@ def wrapper_cmd(*args, **kwargs):
     return decorator_cmd_str
 
 
-def upy_cmd_c_r_nb(debug=False, rtn=True, out=False):
+def upy_cmd_c_r_nb(debug=False, rtn=True, out=False, block=False):
     def decorator_cmd_str(func):
         @functools.wraps(func)
         def wrapper_cmd(*args, **kwargs):
@@ -267,7 +267,7 @@ def wrapper_cmd(*args, **kwargs):
             if debug:
                 dev_dict['dev'].cmd_nb(cmd, long_string=True)
             else:
-                dev_dict['dev'].cmd_nb(cmd, silent=True,)
+                dev_dict['dev'].cmd_nb(cmd, silent=True, block_dev=block)
             if rtn:
                 dev_dict['dev'].get_opt()
                 return dev_dict['dev'].output

upydevice/phantom.py

@@ -701,7 +701,7 @@ def read_data(self):
         return self.dev_dict
 
     # SOCKETS METHODS
-    @upy_cmd_c_r_nb(debug=True)
+    @upy_cmd_c_r(debug=True)
     def connect_SOC(self, host, port):
         return self.dev_dict
 
@@ -710,8 +710,8 @@ def disconnect_SOC(self):
         return self.dev_dict
 
     def start_server(self):
-        self.connect_SOC(self.soc.host, self.port)
-        self.soc.start_SOC()
+        # self.connect_SOC(self.soc.host, self.port)
+        self.soc.start_SOC(recv_sock=self.connect_SOC)
 
     def stop_server(self):
         self.disconnect_SOC()
@@ -804,7 +804,7 @@ def continuous_stream(self, on_message, timeout=100, init=True,
                 sampling_callback=self.sample_send_call, timeout=timeout, on_init=on_init)
 
         if log:
-                name_file = self.lognow(self.sens_mode)
+            name_file = self.lognow(self.sens_mode)
         if test:
             t0 = time.time()
             buffer = True
@@ -888,16 +888,16 @@ def data_print_chunk_static_json(self, x):
             pass
 
     def continuous_chunk_stream(self, timeout=100, init=True,
-                               log=False, buffer=False, on_init=None,
-                               test=False, static=False):
+                                log=False, buffer=False, on_init=None,
+                                test=False, static=False):
         if init:
             self.fq = 1/(timeout/1000)
             self.header['fq(hz)'] = self.fq
             self.start_send(
                 sampling_callback=self.chunk_send_call, timeout=timeout, on_init=on_init)
 
         if log:
-                name_file = self.lognow(self.sens_mode)
+            name_file = self.lognow(self.sens_mode)
         if test:
             t0 = time.time()
             buffer = True
@@ -941,8 +941,8 @@ def continuous_chunk_stream(self, timeout=100, init=True,
                     break
 
     def continuous_chunk_stream_json(self, timeout=100, init=True,
-                                    log=False, buffer=False, on_init=None,
-                                    test=False, static=False):
+                                     log=False, buffer=False, on_init=None,
+                                     test=False, static=False):
         if init:
             self.fq = 1/(timeout/1000)
             self.header['fq(hz)'] = self.fq
@@ -951,7 +951,7 @@ def continuous_chunk_stream_json(self, timeout=100, init=True,
                 on_init=on_init)
 
         if log:
-                name_file = self.lognow(self.sens_mode)
+            name_file = self.lognow(self.sens_mode)
         if test:
             t0 = time.time()
             buffer = True
@@ -1362,7 +1362,8 @@ def __init__(self, device, name, init_soc=False, port=8005, p_format='f',
         self.chunk_buffer_json_size = self.get_json_chunk_size()
 
     def get_json_chunk_size(self):
-        json_size = ((self.max_dig+2)*self.chunk_buffer_size*self.n_vars)+(7*self.n_vars)
+        json_size = ((self.max_dig+2)*self.chunk_buffer_size
+                     * self.n_vars)+(7*self.n_vars)
         return json_size
 
     @upy_cmd_c_r()
@@ -1495,7 +1496,7 @@ def find_localip(self):
         ip_soc.close()
         return local_ip
 
-    def start_SOC(self):
+    def start_SOC(self, recv_sock=None):
         self.serv_soc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.serv_soc.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         self.serv_soc.bind((self.host, self.port))
@@ -1504,6 +1505,8 @@ def start_SOC(self):
             self.log.info('Server listening...')
         else:
             print('Server listening...')
+        if recv_sock:
+            recv_sock(self.host, self.port)
         self.conn, self.addr_client = self.serv_soc.accept()
         if self.log is not None:
             self.log.info(('Connection received from: {}:{}'.format(*self.addr_client)))

upydevice/websocketdevice.py

@@ -256,7 +256,8 @@ def close_wconn(self):
         if self.ws:
             self.ws.close()
         self.connected = False
-        self.ip = self.hostname_mdns
+        if self.hostname_mdns:
+            self.ip = self.hostname_mdns
         self.repl_CONN = self.connected
         time.sleep(0.1)