micrOSDevToolKit 3.3.4__tar.gz → 3.4.0__tar.gz

{microsdevtoolkit-3.3.4/micrOSDevToolKit.egg-info → microsdevtoolkit-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.3.4
+Version: 3.4.0
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -111,11 +111,11 @@ Access rest api over browser: `http://<nodename>.local`
 🚀🎈Lightweight and high performance core system that leaves you space 😎
 
 ## ◉ Shortcuts:
-1. 📲 micrOS Client Application [link](https://github.com/BxNxM/micrOS/#micros-client-application)
+1. 📲 micrOS Client Application [link](https://github.com/BxNxM/micrOS/#micros-client-application) - obsolete, use micrOS built-in webui instead.
 2. micrOS Installer [link](https://github.com/BxNxM/micrOS/#installing-micros-with-devtoolkit-esp32-and-more)
 3. ▶️ micrOS Tutorials [link](https://github.com/BxNxM/micrOS/#micros-video-tutorials)
 4. micrOS System and features [link](https://github.com/BxNxM/micrOS/#micros-framework-features)
-5. 🎮 Built-in app modules: [link](https://htmlpreview.github.io/?https://github.com/BxNxM/micrOS/blob/master/micrOS/client/sfuncman/sfuncman.html)
+5. 🎮 Application Catalog: [link](https://htmlpreview.github.io/?https://github.com/BxNxM/micrOS/blob/master/micrOS/client/sfuncman/sfuncman.html)
 5. Pin mapping - GPIO [link](https://github.com/BxNxM/micrOS/#device-pinouts-for-wiring)
 6. ⚙️ micrOS Node configuration [link](https://github.com/BxNxM/micrOS/#micros-node-configuration-parameters-with-description)
 7. 🧑‍💻 micrOS create custom Load Modules: [link](./micrOS/MODULE_GUIDE.md)

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/README.md

@@ -73,11 +73,11 @@ Access rest api over browser: `http://<nodename>.local`
 🚀🎈Lightweight and high performance core system that leaves you space 😎
 
 ## ◉ Shortcuts:
-1. 📲 micrOS Client Application [link](https://github.com/BxNxM/micrOS/#micros-client-application)
+1. 📲 micrOS Client Application [link](https://github.com/BxNxM/micrOS/#micros-client-application) - obsolete, use micrOS built-in webui instead.
 2. micrOS Installer [link](https://github.com/BxNxM/micrOS/#installing-micros-with-devtoolkit-esp32-and-more)
 3. ▶️ micrOS Tutorials [link](https://github.com/BxNxM/micrOS/#micros-video-tutorials)
 4. micrOS System and features [link](https://github.com/BxNxM/micrOS/#micros-framework-features)
-5. 🎮 Built-in app modules: [link](https://htmlpreview.github.io/?https://github.com/BxNxM/micrOS/blob/master/micrOS/client/sfuncman/sfuncman.html)
+5. 🎮 Application Catalog: [link](https://htmlpreview.github.io/?https://github.com/BxNxM/micrOS/blob/master/micrOS/client/sfuncman/sfuncman.html)
 5. Pin mapping - GPIO [link](https://github.com/BxNxM/micrOS/#device-pinouts-for-wiring)
 6. ⚙️ micrOS Node configuration [link](https://github.com/BxNxM/micrOS/#micros-node-configuration-parameters-with-description)
 7. 🧑‍💻 micrOS create custom Load Modules: [link](./micrOS/MODULE_GUIDE.md)

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -45,7 +45,7 @@
             4
         ],
         "Shell.py": [
-            9.37,
+            9.39,
             2
         ],
         "Notify.py": [
@@ -57,12 +57,12 @@
             24
         ],
         "Logger.py": [
-            8.86,
+            8.89,
             4
         ],
         "Common.py": [
-            9.86,
-            32
+            9.85,
+            30
         ],
         "InterConnect.py": [
             9.7,
@@ -86,7 +86,7 @@
         ],
         "microIO.py": [
             9.37,
-            38
+            37
         ],
         "micrOS.py": [
             9.09,
@@ -121,7 +121,7 @@
             0
         ],
         "modules/LM_pacman.py": [
-            7.68,
+            7.63,
             0
         ],
         "modules/LM_web.py": [
@@ -137,11 +137,11 @@
             0
         ],
         "modules/LM_system.py": [
-            8.87,
+            8.93,
             3
         ],
         "modules/LM_robustness.py": [
-            8.47,
+            8.67,
             0
         ],
         "modules/LM_qmi8658.py": [
@@ -217,11 +217,11 @@
             0
         ],
         "modules/LM_dht22.py": [
-            7.94,
+            7.88,
             0
         ],
         "modules/LM_esp32.py": [
-            6.79,
+            7.24,
             0
         ],
         "modules/LM_veml7700.py": [
@@ -229,11 +229,11 @@
             0
         ],
         "modules/LM_rencoder.py": [
-            8.65,
+            8.59,
             0
         ],
         "modules/LM_dht11.py": [
-            7.94,
+            7.88,
             0
         ],
         "modules/LM_cluster.py": [
@@ -256,10 +256,6 @@
             8.95,
             1
         ],
-        "modules/LM_distance.py": [
-            8.86,
-            0
-        ],
         "modules/LM_light_sensor.py": [
             9.12,
             0
@@ -278,7 +274,7 @@
         ],
         "modules/LM_dimmer.py": [
             8.33,
-            1
+            0
         ],
         "modules/LM_gameOfLife.py": [
             9.29,
@@ -303,12 +299,16 @@
     },
     "summary": {
         "core": [
-            5479,
+            5478,
             27
         ],
         "load": [
-            7593,
-            48
+            7485,
+            47
+        ],
+        "web": [
+            184614,
+            18
         ],
         "core_dep": [
             true,
@@ -320,6 +320,6 @@
         ],
         "core_score": 9.28,
         "load_score": 8.41,
-        "version": "3.3.1-0"
+        "version": "3.4.0-0"
     }
 }

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/Common.py

@@ -2,7 +2,7 @@
 micrOS Load Module programming Official API-s
     Designed by Marcell Ban aka BxNxM
 """
-from Server import Server, WebCli
+from Server import WebCli
 from Debug import syslog as debug_syslog, console_write
 from Logger import logger, log_get
 from Files import OSPath, path_join
@@ -142,19 +142,7 @@ def web_mounts(*args, **kwargs):
         return {}
 
 
-def socket_stream(func):
-    """
-    [LM] Decorator for Socket message stream - adds msgobj to the decorated function arg list.
-    Use msgobj as print function: msgobj("hello")
-    (Server singleton class - reply all bug/feature)
-    """
-    def wrapper(*args, **kwargs):
-        return func(*args, **kwargs, msgobj=Server.reply_all)
-    return wrapper
-
-
-@socket_stream
-def data_logger(f_name, data=None, limit=12, msgobj=None):
+def data_logger(f_name, data=None, limit=12):
     """
     [LM] micrOS Common Data logger solution
     - if data None => read mode
@@ -162,14 +150,11 @@ def data_logger(f_name, data=None, limit=12, msgobj=None):
     :param f_name: log name (without extension, automatic: .dat, default folder: /data)
     :param data: data to append
     :param limit: line limit (max.: 12 with short lines: limited disk speed!)
-    :param msgobj: socket stream object (set automatically!)
     """
     f_name = f_name if f_name.endswith('.dat') else f'{f_name}.dat'
     # GET LOGGED DATA
     if data is None:
-        # return log as msg stream
-        log_get(f_name, msgobj=msgobj)
-        return True
+        return log_get(f_name)
     # ADD DATA TO LOG
     return logger(data, f_name, limit)
 

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/Logger.py

@@ -75,40 +75,40 @@ def logger(data, f_name:str, limit:int):
     return True
 
 
-def log_get(f_name:str, msgobj=None):
+def log_get(f_name:str):
     """
     Generic file getter for .log files
-    - log content critical [ERR] counter
+    - return file content
     """
     f_path = path_join(_dir_select(f_name), f_name)
-    err_cnt = 0
     try:
-        if msgobj is not None:
-            msgobj(f_path)
         with open(f_path, 'r') as f:
-            eline = f.readline().strip()
-            while eline:
-                # GET error from log line (tag: [ERR])
-                err_cnt += 1 if "[ERR]" in eline else 0
-                # GIVE BACK .log file contents
-                if msgobj is not None:
-                    msgobj(f"\t{eline}")
-                eline = f.readline().strip()
+            return f.read()
     except:
-        pass
-    return err_cnt
+        return ''
 
 
-def syslog(data=None, msgobj=None):
+def syslog(data=None, dump=False):
     """
     System log setter/getter
     :param data: None - read logs, str - write logs
-    :param msgobj: function to stream .log files
+    :param dump: include log file path/text entries in read response
     """
     if data is None:
         # READ LOGS
-        err_cnt = sum(log_get(f, msgobj) for f in ilist_fs(OSPath.LOGS, type_filter='f') if f.endswith(".sys.log"))
-        return err_cnt
+        err_cnt = 0
+        logs = {}
+        for f_name in (f for f in ilist_fs(OSPath.LOGS, type_filter='f') if f.endswith(".sys.log")):
+            text = log_get(f_name)
+            err_cnt += sum(1 for line in text.splitlines() if "[ERR]" in line)
+            if dump:
+                logs[path_join(OSPath.LOGS, f_name)] = text
+        health = err_cnt == 0
+        output = {'health': health,
+                  'verdict': f"{'OK' if health else 'NOK'} alarm: {err_cnt}"}
+        if dump:
+            output.update(logs)
+        return output
     # WRITE LOGS - [target].sys.log automatic log level detection
     _match = match(r"^\[([^\[\]]+)\]", data)
     log_lvl = _match.group(1).lower() if _match else 'user'
@@ -116,17 +116,18 @@ def syslog(data=None, msgobj=None):
     return logger(data, f_name, limit=4)
 
 
-def log_clean(msgobj=None):
+def log_clean():
     """
     Clean logs folder
     """
     logs_dir = OSPath.LOGS
     to_del = [file for file in ilist_fs(logs_dir, type_filter='f') if file.endswith('.log')]
+    deleted = []
     for _del in to_del:
         _del = path_join(logs_dir, _del)
-        if msgobj is not None:
-            msgobj(f" Delete: {_del}")
+        deleted.append(f" Delete: {_del}")
         remove(_del)
+    return '\n'.join(deleted)
 
 # Init log folder at module load
 _init_logger()

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/Server.py

@@ -428,8 +428,7 @@ class Server:
     @staticmethod
     def reply_all(msg):
         """
-        Reply All - stream data to all connection...
-        Only used for LM msg stream over Common.socket_stream wrapper
+        Reply All - send notification data to all socket connections.
         """
         for _, cli in Client.ACTIVE_CLIS.items():
             if cli.connected:

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/Shell.py

@@ -28,7 +28,7 @@ IMAGE_MODE = 'rel' if 'micrOS' in uname()[-1] else 'dev'
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '3.3.1-0'
+    MICROS_VERSION = '3.4.0-0'
 
     def __init__(self):
         """
@@ -160,31 +160,36 @@ class Shell:
         # HELP MSG
         if is_local_cmd and msg_list[0] == "help":
             await self.a_send("[MICROS]")
-            await self.a_send("   hello     - hello msg - for device identification")
+            await self.a_send("   hello     - device hello msg ID")
             await self.a_send("   modules   - show active Load Modules")
-            await self.a_send("   version   - returns micrOS version")
+            await self.a_send("   version   - show micrOS version")
             await self.a_send("   exit      - exit shell session")
             await self.a_send("   reboot    - system soft reboot (vm), hard reboot (hw): reboot -h")
             await self.a_send("   webrepl   - start webrepl, for file transfers use with --update")
             await self.a_send("[CONF] Configuration mode")
             await self.a_send("  conf       - Enter conf mode")
-            await self.a_send("    dump       - Dump all data, filter: dump <str>")
+            await self.a_send("    dump       - Dump all data, filter: dump [str]")
             await self.a_send("    key        - Get value")
             await self.a_send("    key value  - Set value")
             await self.a_send("  noconf     - Exit conf mode")
             await self.a_send("[TASK] Task operations")
             await self.a_send("  task list         - list tasks by tags")
-            await self.a_send("  task kill <tag>   - stop task")
-            await self.a_send("  task show <tag>   - show task output")
+            await self.a_send("  task kill [tag]   - stop task")
+            await self.a_send("  task show [tag]   - show task output")
             await self.a_send("[EXEC] Command mode, syntax(...): <module> <function> <params> <postfix>")
             await self.a_send("  Postfix hints:")
-            await self.a_send("    ... &<x>            - start one-shot task")
-            await self.a_send("    ... &&<x>           - start periodic task, where <x>: delay ms [x min: 20ms]")
+            await self.a_send("    ... &[x]            - start one-shot task")
+            await self.a_send("    ... &&[x]           - start periodic task, where [x]: delay ms [x min: 20ms]")
             await self.a_send("    ... >json           - request json formatted output")
             await self.a_send("    ... >>hostname      - remote command execution (intercon)")
-            await self.a_send("  help lm           - list ALL available LoadModules")
-            if "lm" in str(msg_list):
-                return await Shell._show_lm_funcs(msg_obj=self.a_send)
+            await self.a_send("help [all/-] [match]  - list Active/ALL modules with optional filtering")
+            # Help length: help [all/-] [match]
+            if len(msg_list) >= 2:
+                _loaded = msg_list[1].lower() != "all"
+                _match = msg_list[-1].lower() != "all"
+                if _match:
+                    return await Shell._show_lm_funcs(msg_obj=self.a_send, active_only=_loaded, match=msg_list[-1])
+                return await Shell._show_lm_funcs(msg_obj=self.a_send, active_only=_loaded)
             return await Shell._show_lm_funcs(msg_obj=self.a_send, active_only=True)
 
         # [2] EXECUTE:
@@ -254,13 +259,19 @@ class Shell:
     #                   COMMAND MODE & LMS HANDLER                  #
     #################################################################
     @staticmethod
-    async def _show_lm_funcs(msg_obj, active_only=False):
+    async def _show_lm_funcs(msg_obj, active_only:bool=False, match:str=None):
         """
         Dump LM modules with functions - in case of [py] files
         Dump LM module with help function call - in case of [mpy] files
+        :param msg_obj: message stream object for reply
+        :param active_only: show only loaded/active load modules
+        :param match: filter by substring
         """
         async def _help(mods):
             nonlocal mpath
+            if isinstance(match, str):
+                # Override mods with filtered mods by match
+                mods = [m for m in mods if match in m]
             for lm_path in mods:
                 lm_name = lm_path.replace('LM_', '').split('.')[0]
                 try:

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/Tasks.py

@@ -601,14 +601,14 @@ def _exec_lm_core(cmd_list, jsonify):
             if lm_mod not in modules:
                 exec(f"import {lm_mod}")
             try:
-                # [2] EXECUTE FUNCTION FROM MODULE - over msgobj (socket or stdout)
+                # [2] EXECUTE FUNCTION FROM MODULE
                 lm_output = eval(f"{lm_mod}.{lm_func}({lm_params})")
             except Exception as e:
                 # Handle not proper module load (simulator), note: module in sys.modules BUT not available
                 if lm_mod in str(e):
                     # [2.1] LOAD MODULE - FORCED
                     exec(f"import {lm_mod}")
-                    # [2.2] EXECUTE FUNCTION FROM MODULE - over msgobj (socket or stdout)
+                    # [2.2] EXECUTE FUNCTION FROM MODULE
                     lm_output = eval(f"{lm_mod}.{lm_func}({lm_params})")
                 else:
                     raise e
@@ -659,7 +659,7 @@ def exec_lm_pipe(taskstr):
         # Handle config default empty value (do nothing)
         if taskstr.startswith('n/a'):
             return True
-        # Execute individual commands - msgobj->"/dev/null"
+        # Execute individual commands.
         for cmd in (cmd.strip().split() for cmd in taskstr.split(';') if len(cmd) > 0):
             if cmd[0].startswith("#"):
                 console_write(f"[SKIP] exec_lm_pipe: {' '.join(cmd)}")

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/modules/IO_esp32.py

@@ -68,8 +68,6 @@ touch_0 = const(13)    # D13 - touch sensor TODO
 
 
 # SENSORS
-hcsrtrig = const(32)   # D32 - distance HCSR04 trigger pin
-hcsrecho = const(35)   # D35 - distance HCSR04 echo pin
 dhtpin = const(32)     # D32 - dht_pin 11 and 22
 co2 = const(35)        # D35 - [ADC] CO2
 temp6000 = const(36)   # VP  - [ADC] light sensor TEMP6000

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/modules/IO_esp32s2.py

@@ -61,8 +61,6 @@ js_press = const(34)     # oled_ui center/ok button
 
 
 # SENSORS
-hcsrtrig = const(34)    # distance HCSR04 trigger pin
-hcsrecho = const(36)    # distance HCSR04 echo pin
 dhtpin = const(17)      # dht_pin 11 and 22
 co2 = const(13)         # [ADC] CO2
 temp6000 = const(10)    # [ADC] light sensor TEMP6000

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/modules/IO_esp32s3.py

@@ -103,8 +103,6 @@ js_press = const(20)     # oled_ui center/ok button
 touch_0 = const(0)     # - touch sensor TODO
 
 # SENSORS
-hcsrtrig = const(1)   # - distance HCSR04 trigger pin
-hcsrecho = const(2)   # - distance HCSR04 echo pin
 dhtpin = const(20)     # - dht_pin 11 and 22
 co2 = const(14)        # - [ADC] CO2
 temp6000 = const(13)   # - [ADC] light sensor TEMP6000

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/modules/IO_m5stamp.py

@@ -79,8 +79,6 @@ irq4 = const(12)        # - event irq pin
 touch_0 = const(1)     # - touch sensor TODO
 
 # SENSORS
-hcsrtrig = const(1)   # - distance HCSR04 trigger pin
-hcsrecho = const(3)   # - distance HCSR04 echo pin
 dhtpin = const(43)     # - dht_pin 11 and 22
 ds18 = const(0)       # - DS18B20 - temp. sensor
 mic = const(3)         # - [ADC] microphone

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/modules/IO_tinypico.py

@@ -92,8 +92,6 @@ touch_0 = const(32)     # D32 - builtin touch sensor	TODO
 
 
 # SENSORS
-hcsrtrig = const(25)   # D25 - distance HCSR04 trigger pin
-hcsrecho = const(26)   # D26 - distance HCSR04 echo pin
 dhtpin = const(32)     # D32 - dht_pin 11 and 22
 co2 = const(33)        # D33 - CO2 / BATTERY CONFLICT
 temp6000 = const(32)   # D32  - light sensor TEMP6000

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/modules/LM_dht11.py

@@ -53,8 +53,7 @@ def logger():
     """
     Return temp, hum logged data
     """
-    data_logger(_LOG_NAME)
-    return ''
+    return data_logger(_LOG_NAME)
 
 
 #######################

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/modules/LM_dht22.py

@@ -54,8 +54,7 @@ def logger():
     """
     Return temp, hum logged data
     """
-    data_logger(_LOG_NAME)
-    return ''
+    return data_logger(_LOG_NAME)
 
 
 #######################

{microsdevtoolkit-3.3.4/toolkit/workspace/precompiled → microsdevtoolkit-3.4.0/micrOS/source}/modules/LM_esp32.py

@@ -1,5 +1,6 @@
 import esp32
 from Common import syslog
+from Types import resolve
 
 #########################
 # Application functions #
@@ -66,4 +67,6 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return 'hall', 'temp', 'touch', 'battery', 'NOTE: battery only available on tinypico'
+    return resolve(('hall',
+                    'GRAPH temp',
+                    'touch', 'battery', 'NOTE: battery only available on tinypico'), widgets=widgets)

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/modules/LM_pacman.py

@@ -1,5 +1,4 @@
 from sys import modules
-from Common import socket_stream
 from Files import list_fs, ilist_fs, remove_file, remove_dir, OSPath, path_join, is_protected
 from Auth import sudo
 
@@ -201,18 +200,19 @@ def inspect(package:str=None)->list|str:
 
 ##########################     MISC    ###########################
 
-@socket_stream
-def micros_checksum(msgobj=None):
+def micros_checksum():
     from hashlib import sha1
     from binascii import hexlify
     from Config import cfgget
 
+    out = []
     for f_name in ilist_fs(path=OSPath.MODULES, type_filter='f', select='LM'):
-        with open(f_name, 'rb') as f:
+        with open(path_join(OSPath.MODULES, f_name), 'rb') as f:
             cs = hexlify(sha1(f.read()).digest()).decode('utf-8')
-        msgobj(f"{cs} {f_name}")
+        out.append(f"{cs} {f_name}")
     # GC collect?
-    return f"micrOS version: {cfgget('version')}"
+    out.append(f"micrOS version: {cfgget('version')}")
+    return '\n'.join(out)
 
 
 def unload(module=None):
@@ -231,8 +231,7 @@ def unload(module=None):
         return "Skip, module must start with LM_ or IO_"
 
 
-@socket_stream
-def cachedump(delete=None, ext="cache", msgobj=None):
+def cachedump(delete=None, ext="cache"):
     """
     Cache system persistent data storage files (.cache)
     :param delete: cache name to delete
@@ -245,11 +244,8 @@ def cachedump(delete=None, ext="cache", msgobj=None):
         for cache in (c for c in ilist_fs(data_dir, type_filter='f') if c.endswith('.cache')):
             _path = path_join(data_dir, cache)
             with open(_path, 'r') as f:
-                if msgobj is None:
-                    msg_buf.append(f'{_path}: {f.read()}')
-                else:
-                    msgobj(f'{_path}: {f.read()}')
-        return msg_buf if len(msg_buf) > 0 else ''
+                msg_buf.append(f'{_path}: {f.read()}')
+        return '\n'.join(msg_buf)
     # Remove given cache file
     try:
         delete_cache = path_join(data_dir, f"{delete}.cache")
@@ -301,8 +297,7 @@ def help(widgets=False):
 #              Legacy features              #
 #############################################
 
-@socket_stream
-def listmods(msgobj=None):
+def listmods():
     """
     Load module package manager
     - list all load modules
@@ -310,11 +305,8 @@ def listmods(msgobj=None):
     # Dump available LMs
     msg_buf = []
     for k in (res.replace('LM_', '') for res in ilist_fs(path=OSPath.MODULES, type_filter='f', select='LM')):
-        if msgobj is None:
-            msg_buf.append(f'   {k}')
-        else:
-            msgobj(f'   {k}')
-    return msg_buf if len(msg_buf) > 0 else ''
+        msg_buf.append(f'   {k}')
+    return '\n'.join(msg_buf)
 
 
 @sudo

{microsdevtoolkit-3.3.4 → microsdevtoolkit-3.4.0}/micrOS/source/modules/LM_rencoder.py

@@ -1,6 +1,6 @@
 from machine import Pin
 import micropython
-from Common import socket_stream, syslog
+from Common import syslog
 from microIO import bind_pin, pinmap_search
 from Types import resolve
 
@@ -84,19 +84,13 @@ def load(min_val=0, max_val=20):
     return 'Init RotaryEncoder with IRQs.'
 
 
-@socket_stream
-def read_state(msgobj=None):
+def read_state():
     """
     Read rotary encoder status / relative position
     """
     load()
-    if msgobj is not None:
-        if Data.EVENT:
-            msgobj(f"[stream] RotaryState: {Data.VAL}")
-            Data.EVENT = False
-    else:
-        return f"RotaryState: {Data.VAL}"
-    return ""
+    Data.EVENT = False
+    return f"RotaryState: {Data.VAL}"
 
 
 def reset_state():