micrOSDevToolKit 2.17.2__py3-none-any.whl → 2.19.0__py3-none-any.whl

micrOS/source/modules/LM_tcs3472.py

@@ -6,26 +6,54 @@ Copyright (c) 2021 tti0
 Licensed under the MIT License
 """
 
-from machine import I2C, Pin
+from struct import unpack
+from time import sleep
+from machine import I2C, Pin, PWM
 from microIO import bind_pin, pinmap_search
-import struct
+from Types import resolve
 
+from LM_neopixel import load as neo_load, color as neo_color, toggle as neo_toggle    # local neopixel light indicator
+from LM_cluster import run as cluster_run                                             # DEMO: neomatrix cluster
+
+CURRENT_ANIMATION_INDEX = 0                                                           # DEMO: neomatrix cluster animation
 
 class TCS3472:
     INSTANCE = None
 
-    def __init__(self, bus, address=0x29):
-        self._bus = bus
+    def __init__(self, address=0x29, led_pin=None):
+        self._bus = I2C(sda=Pin(bind_pin('i2c_sda')), scl=Pin(bind_pin('i2c_scl')))
         self._i2c_address = address
         self._bus.writeto(self._i2c_address, b'\x80\x03')
         self._bus.writeto(self._i2c_address, b'\x81\x2b')
+        self.led = PWM(Pin(bind_pin('led', led_pin), Pin.OUT), freq=20480)
+        self.led_brightness = 20
         TCS3472.INSTANCE = self
 
-    def scaled(self):
-        crgb = self.raw()
-        if crgb[0] > 0:
-            return tuple(float(x) / crgb[0] for x in crgb[1:])
-        return 0, 0, 0
+    def scaled(self, saturation=1.5):
+        """
+        Normalize by strongest color, then adjust saturation.
+        saturation = 1.0 -> normal
+        saturation > 1.0 -> more vibrant
+        saturation < 1.0 -> more pastel
+        """
+        _, r, g, b = self.raw()
+        m = max(r, g, b)
+        if m == 0:
+            return 0.0, 0.0, 0.0
+
+        # Normalize by strongest channel
+        r, g, b = r / m, g / m, b / m
+
+        # Grayscale = average of channels
+        gray = (r + g + b) / 3
+
+        # Interpolate between gray and color
+        r = gray + (r - gray) * saturation
+        g = gray + (g - gray) * saturation
+        b = gray + (b - gray) * saturation
+
+        # Clamp to 0..1
+        return max(0, min(1, r)), max(0, min(1, g)), max(0, min(1, b))
 
     def rgb(self):
         return tuple(int(x * 255) for x in self.scaled())
@@ -42,32 +70,118 @@ class TCS3472:
 
     def raw(self):
         self._bus.writeto(self._i2c_address, b'\xb4')
-        return struct.unpack("<HHHH", self._bus.readfrom(self._i2c_address, 8))
+        return unpack("<HHHH", self._bus.readfrom(self._i2c_address, 8))
 
 
 ############################ Exposed functions ############################
 
-def load():
+def load(led_pin=20):
     """
     Load the TCS3472 Color sensor instance.
     """
     if TCS3472.INSTANCE is None:
-        bus = I2C(sda=Pin(bind_pin('i2c_sda')), scl=Pin(bind_pin('i2c_scl')))
-        TCS3472.INSTANCE = TCS3472(bus)
+        TCS3472(led_pin=led_pin)
+        neo_load(ledcnt=1)
+        led(False)
     return TCS3472.INSTANCE
 
 
 def pinmap():
-    return pinmap_search(['i2c_scl', 'i2c_sda'])
+    """
+    Show used pin mapping for this module.
+    """
+    return pinmap_search(['i2c_scl', 'i2c_sda', 'led'])
 
 
 def measure():
+    """
+    MEASURE sensor
+    """
+    sensor = load()
+    measurement = {"rgb": sensor.rgb(), "light": sensor.light(), "brightness": sensor.brightness()}
+    return measurement
+
+
+def led(state:bool=None, br:int=None):
+    """
+    SENSOR LED toggle
+    :param state: None-automatic, True-ON, False-OFF
+    :param br: brightness 0-100
+    """
+    def _set_duty(_br):
+        _br = sensor.led_brightness if _br is None else _br
+        sensor.led.duty(int(_br * 10))
+        if _br != 0:
+            sensor.led_brightness = _br
+
     sensor = load()
-    return {"rgb": sensor.rgb(), "light": sensor.light(), "brightness": sensor.brightness()}
+    if state is None:
+        # INVERT STATE
+        led_current_state = sensor.led.duty() > 0
+        if led_current_state:
+            _set_duty(br)
+            _set_duty(0)
+            neo_toggle(False)
+        else:
+            _set_duty(br)
+            neo_toggle(True)
+    else:
+        # SET STATE: ON/OFF
+        if state:
+            _set_duty(br)
+            neo_toggle(True)
+        else:
+            _set_duty(br)
+            _set_duty(0)
+            neo_toggle(False)
+    return f"LED on, {sensor.led_brightness}%" if sensor.led.duty()>0 else f"LED off"
+
+
+def indicator(br=5):
+    """
+    Color indicator Neopixel LED update
+    :param br: brightness 0-100
+    """
+    r, g, b = measure()['rgb']
+    br = float(br / 100)
+    _r, _g, _b = int(r*br), int(g*br), int(b*br)
+    neo_color(_r, _g, _b, smooth=False)
+    return r, g, b
+
+
+def neomatrix_update():
+    """
+    DEMO - Send color codes for all neomatrix devices over espnow cluster
+    """
+    r, g, b = indicator()
+    command = f"neomatrix color_fill {r} {g} {b}"
+    cluster_run(command)
+    return {"cmd": command, "cluster": "task show con.espnow.*"}
+
+
+def neomatrix_animation():
+    """
+    DEMO - Set random animation on neomatrix espnow cluster
+    """
+    global CURRENT_ANIMATION_INDEX
+    animations = ('spiral', 'snake', 'noise')
+
+    next_animation = CURRENT_ANIMATION_INDEX + 1
+    CURRENT_ANIMATION_INDEX = 0 if next_animation >= len(animations) else next_animation
+    command = f"neomatrix {animations[CURRENT_ANIMATION_INDEX]}"
+    cluster_run(command)
+    return {"cmd": command, "cluster": "task show con.espnow.*"}
 
 
-def help(widgest=False):
+def help(widgets=False):
     """
     TCS3472 Color sensor
     """
-    return 'load', 'measure'
+    return resolve(('load led_pin=20',
+                    'TEXTBOX measure',
+                    'BUTTON led state=<True,False>',
+                    'SLIDER led state=True br=<0-100-5>',
+                    'indicator br=<0-100>',
+                    'BUTTON neomatrix_update',
+                    'BUTTON neomatrix_animation',
+                    'pinmap'), widgets=widgets)

micrOS/source/modules/LM_telegram.py

@@ -12,6 +12,7 @@ def _timestamp():
 
 
 class Telegram(Notify):
+    INSTANCE = None
     # Telegram bot token and chat ID
     # https://core.telegram.org/bots/api
     _TOKEN = None  # Telegram token
@@ -23,6 +24,7 @@ class Telegram(Notify):
     def __init__(self):
         # Subscribe to the notification system - provide send_msg method (over self)
         super().add_subscriber(self)
+        Telegram.INSTANCE = self
 
     @staticmethod
     def __id_cache(mode):
@@ -236,7 +238,7 @@ class Telegram(Notify):
         return verdict
 
     @staticmethod
-    async def bot_repl(tag, period=3):
+    async def server_bot(tag, period=3):
         """
         BOT - ReceiveEvalPrintLoop
         :param tag: task tag (access)
@@ -290,17 +292,16 @@ class Telegram(Notify):
 #########################################
 #          micrOS Notifications         #
 #########################################
-TELEGRAM_OBJ = None
 
 def __init():
-    global TELEGRAM_OBJ
-    if TELEGRAM_OBJ is None:
+    if Telegram.INSTANCE is None:
         # ENABLE TELEGRAM IF NW IS STA - CONNECTED TO THE WEB
         _sta_available = True if ifconfig()[0] == "STA" else False
         if _sta_available:
-            TELEGRAM_OBJ = Telegram()
+            Telegram()
         else:
             syslog("No STA: cannot init telegram")
+    return Telegram.INSTANCE
 
 # Auto INIT Telegram at load time (legacy)
 __init()
@@ -311,10 +312,9 @@ def load():
     - /ping
     - /cmd module function (params)
     """
-    __init()
-    if TELEGRAM_OBJ is None:
+    if __init() is None:
         return "Network unavailable."
-    verdict = TELEGRAM_OBJ.set_commands()
+    verdict = Telegram.set_commands()
     return "Missing telegram bot token" if verdict is None else verdict
 
 
@@ -324,9 +324,9 @@ def send(text):
     :param text: text to send
     return verdict
     """
-    if TELEGRAM_OBJ is None:
+    if Telegram.INSTANCE is None:
         return "Network unavailable."
-    verdict = TELEGRAM_OBJ.send_msg(text)
+    verdict = Telegram.send_msg(text)
     return "Missing telegram bot token" if verdict is None else verdict
 
 def notify(text):
@@ -336,9 +336,9 @@ def notify(text):
         telegram notification enable=True
         telegram notification enable=False
     """
-    if TELEGRAM_OBJ is None:
+    if Telegram.INSTANCE is None:
         return "Network unavailable."
-    return TELEGRAM_OBJ.notify(text)
+    return Telegram.INSTANCE.notify(text)
 
 
 def receive():
@@ -347,9 +347,9 @@ def receive():
     - if all value None, then no incoming messages
     One successful msg receive is necessary to get chat_id for msg send as well!
     """
-    if TELEGRAM_OBJ is None:
+    if Telegram.INSTANCE is None:
         return "Network unavailable."
-    verdict = TELEGRAM_OBJ.get_msg()
+    verdict = Telegram.get_msg()
     return "Missing telegram bot token" if verdict is None else verdict
 
 
@@ -359,11 +359,11 @@ def receiver_loop(period=3):
     - Only executes module (function) if the module is already loaded
     :param period: polling period in sec, default: 3
     """
-    if TELEGRAM_OBJ is None:
+    if Telegram.INSTANCE is None:
         return "Network unavailable."
-    tag = 'telegram.bot_repl'
-    state = micro_task(tag=tag, task=TELEGRAM_OBJ.bot_repl(tag=tag, period=period))
-    return "Starting" if state else "Already running"
+    tag = 'telegram.server_bot'
+    state = micro_task(tag=tag, task=Telegram.server_bot(tag=tag, period=period))
+    return {tag: "Starting"} if state else {tag: "Already running"}
 
 
 def help(widgets=False):

{microsdevtoolkit-2.17.2.dist-info → microsdevtoolkit-2.19.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 2.17.2
+Version: 2.19.0
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -496,11 +496,11 @@ Version **3.0.0-0** `micrOS-Autonomous`
     - (1) Async SSL/TLS integration (micropython 1.22+ required)                [DONE]
         - urequest module async redesign for rest clients                       [OK]
             - LM_telegram (Notify) + server (listener - chatbot)                [OK]
-    - (2) ESP-NOW (peer-to-peer communication) integration into InterCon        [PoC:OK][TODO]
+    - (2) ESP-NOW (peer-to-peer communication) integration into InterCon        [DONE]
     - (3) New intercon syntax - command level integration:                      [DONE]
     	- rgb toggle >>RingLight.local
     	- similar as (obsolete): intercon sendcmd host="RingLight.local" cmd="rgb toggle"
-    - (4) Create multi level project structure (curret is flat fs)              [WIP] FS
+    - (4) Create multi level project structure (curret is flat fs)              [DONE]
 		- New micrOS FS structure:
 			- Automatic dir creation at bootup: '/logs', '/web', '/data', '/config', '/modules'
 			- Automatic sub-dir handling /source and /precompiled

{microsdevtoolkit-2.17.2.dist-info → microsdevtoolkit-2.19.0.dist-info}/RECORD

@@ -25,37 +25,35 @@ micrOS/micropython/esp32c3-20240222-v1.22.2.bin,sha256=GktHoOmEndjNy-5d4Jetx2tW1
 micrOS/micropython/esp32c6-GENERIC-20250415-v1.25.0.bin,sha256=a1womN0H96anNycVgIYT9bMkSi6HHs437ZtantOuSHg,1995392
 micrOS/micropython/esp32cam-v1.21.0_camera.bin,sha256=0j5OTjWERTfyt_RpPIC8fWA829UcCQE7MEMmYHzBOKs,1433072
 micrOS/micropython/esp32s2-20240602-v1.23.0.bin,sha256=t2ExDdbS4FZ7o0SZTur34UTQdlaim8LymDnpqtM23Yk,1422304
-micrOS/micropython/esp32s2-LOLIN_MINI-20220618-v1.19.1.bin,sha256=bXR9KjDPeHZZ6DnLMXNiEq1oLt1oogyH3Dt2xqk_wUA,1230192
 micrOS/micropython/esp32s2-LOLIN_MINI-20240602-v1.23.0.bin,sha256=OJi-_TLCDZt_tEALtb9RoQ0S10H0nLQCGJmfxH_TSIg,1422256
 micrOS/micropython/esp32s3-4MBflash-20241129-v1.24.1.bin,sha256=PXVpriBIBil_96-6z4gqpDrdB5EyuIEBVTW9y33tWyk,1659056
 micrOS/micropython/esp32s3-8MBflash-20241129-v1.24.1.bin,sha256=Att5Tefiky4cDYBhBgFJx7imcrbLDSqhT7l9_yAE1Do,1659056
-micrOS/micropython/esp32s3_spiram_oct-20231005-v1.21.0.bin,sha256=S-sv_QeL_Tylg1t9nR-5gjxt0-xMpFY-_O8ot-L8jlE,1561184
 micrOS/micropython/esp32s3_spiram_oct-20241129-v1.24.1.bin,sha256=VbOF_F0YeqttkQd2ePTW66Jd34RU8u9ccFfcv8kxO_U,1662672
 micrOS/micropython/rpi-pico-w-20241129-v1.24.1.uf2,sha256=v4aYIbWaE94_f6DDzBWS-a9L1BzlcdkZwld9R7bOVA4,1727488
 micrOS/micropython/tinypico-20241129-v1.24.1.bin,sha256=Kf3cr766a5SK99CZy8bwdWjwvAZxls3tBYvaHBsw7ac,1527200
-micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json,sha256=C7NUIDrkLDo7FXoG7zQQyZAyIyn6f0eUqPDEWJW1qnU,6338
+micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json,sha256=ER7jct3FU3fdwW1PX92TKEKLPs-fuI1C3JT4NIoCn0U,6340
 micrOS/source/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 micrOS/source/Common.py,sha256=uvfLeei3Koi3MWraIk1LU4ArO7C5krcHm9mSN3tOTDM,16793
-micrOS/source/Config.py,sha256=094MYe1UUbRy5qRiC-HBR9GvVOXY7-2fqF9UvEtfIGo,9187
+micrOS/source/Config.py,sha256=Ci2VjlK2RW1rvKr1xR4A6HeqktZYAkrU12hFVqngXB0,9178
 micrOS/source/Debug.py,sha256=in2tx6Dw8EqeKYTrJpLxSevpoIrJjxlH17JLrTui1o8,3287
-micrOS/source/Espnow.py,sha256=G3IG0jNIFpzBbDZPtxevO2vwOsm4YuWV8fl4sVcn1Bg,12883
+micrOS/source/Espnow.py,sha256=QZN1ihPUbwtfScKRBOEmFxnAyH9x8YezwQUjY0-GOxs,13321
 micrOS/source/Files.py,sha256=SsA4kDWiB8gcunmu9mVVVGmTzxSvkpBqQV-J-U5rzt4,5428
 micrOS/source/Hooks.py,sha256=XdHCo2avht0wUj5xT1oM4tPGZM4uZ2DYmaCOFHYIpjM,4190
-micrOS/source/InterConnect.py,sha256=ZEYNzHmKaVYkkAfesxXSFVFPyBrmaY_JFDAmF4FxXyw,7839
+micrOS/source/InterConnect.py,sha256=5_Q_t0clyNtr4mh1J--8Mjutn-JJXuXGaCVclctf15Y,11175
 micrOS/source/Interrupts.py,sha256=kLDsByjoGeEiDk_0yV7iAvsZlKs9uFqPcAKkdNNR6HU,7543
 micrOS/source/Logger.py,sha256=QSABn-dFDBDQFxgQzu1vpWnqHFg7UjJ-6utMmpEWqes,3979
 micrOS/source/Network.py,sha256=bFG_OE1baHQFJgpcNC_KAKTGPQlgN7pisV07CI30k1g,10165
 micrOS/source/Notify.py,sha256=5_Sqy2FeBVG6HznC48Rgg812AglGjO8pkDYGSpp5qSg,2637
 micrOS/source/Scheduler.py,sha256=EhOdDQqN4V1G0TD2jU5cmjUjY_g-sU8NwFoUfniBKF0,9628
-micrOS/source/Server.py,sha256=gNT3pcNsw8NVwldEe3c6uXlyMdawNS6F1bKUoy-OpLQ,16862
-micrOS/source/Shell.py,sha256=bGsDJ2teXwxUGnFgL5-5BiqvvUlurRU4coINHNc1hxs,13309
-micrOS/source/Tasks.py,sha256=9ITabnBkiI9W6g_wechD0fdRZvynTFyaFzUk3qNnmM4,23996
+micrOS/source/Server.py,sha256=WSDW2BaCkTxkDruKZXW98jhtQXHKaCz7Em1oPYQL4Kk,16869
+micrOS/source/Shell.py,sha256=bIvfRKjivTtQn8SLWGhDacaKoXtX-x27UZdhFi-VZtk,13309
+micrOS/source/Tasks.py,sha256=feh4Upyx_DMkSnUvYi7ntgvbv7XHU6ZB6iv9z-_qfqk,24112
 micrOS/source/Time.py,sha256=8EHp86CAkbGIErGgN-VGAsslUBFIooRGkHB1hUYwwOE,6408
 micrOS/source/Types.py,sha256=Ft_gHokGNa9aQRGSwE3NYIvYZuolT3zfkD5JzhycQ1s,3499
 micrOS/source/Web.py,sha256=EeZzKcZMTDVls5Qu-kT8dnX2Mt8L6M4eLiCBhDBJa40,11059
 micrOS/source/main.py,sha256=cVlhoWwU9dSKEol0HWPihFAPzrUUvzSGwZNNMrpyfSY,440
 micrOS/source/micrOS.py,sha256=QM1lgUnv2qrklj5-qgU6MM_6YsTKq4VGk71Od3Dzx1M,2872
-micrOS/source/micrOSloader.py,sha256=wFS1i90q5po-fKpnEpwL_O4KQV9QujgwAR1QvXpjNvA,4627
+micrOS/source/micrOSloader.py,sha256=9o6VIWPAgnQVb3uQDHENW9aO21gkM4jgR4O1t6uoPHI,4624
 micrOS/source/microIO.py,sha256=h7i78Rl_DKG5vwpCgk1dsY-Z9ikvmOQLMiusYP_yRMI,7096
 micrOS/source/reset.py,sha256=i7wsPkOXE7Mm0xOiw1CjqCvCdNjBvYswn9CRDvE2VbE,248
 micrOS/source/urequests.py,sha256=SrzOgo8UF9YncjfeItM9-xqUr5xEoUt1kOcPxisn6uw,9456
@@ -92,7 +90,7 @@ micrOS/source/modules/LM_dimmer.py,sha256=jmcwuyyNSCeDRNx4GieNld82eaT_K-c6zybcA7
 micrOS/source/modules/LM_distance.py,sha256=iVqQchaUOvK8Ilzr7qMi-ESvS_U8RsBwdqNHY_4qZ-c,4394
 micrOS/source/modules/LM_ds18.py,sha256=mLaH97j8d4lUXcjS8hNtwU8hL5Ybt-Q1WuoiWPnk5Ho,1807
 micrOS/source/modules/LM_esp32.py,sha256=AAMceuWTWMDu_1EJH-617dmp5ClPaAzFKgDOHWEiX0I,1862
-micrOS/source/modules/LM_espnow.py,sha256=WD3gnXMWjIYZGcwQM62T0xd9yMb9wzEfS0ZYlkqESjA,761
+micrOS/source/modules/LM_espnow.py,sha256=8WVKGinXL380aj6-qB2euhpwxN2y9pQcXMH-CrW7FJ0,1085
 micrOS/source/modules/LM_gameOfLife.py,sha256=Mvr_S5zsJ6x_pMCGrkdgl5QdejNQjAF9mBYLN5-OA38,7685
 micrOS/source/modules/LM_genIO.py,sha256=rTiFByly8ImjHBgc2RceGczGp1rzti7Juz_Vvg5hrtc,5013
 micrOS/source/modules/LM_haptic.py,sha256=W0WiuOCxIu9RB-pWu8r8fvHmvuseet1UI7RSc9WO8zo,2862
@@ -102,13 +100,13 @@ micrOS/source/modules/LM_keychain.py,sha256=-GN-Xzoour2vjg5MyZtmbcxo8LdSn6dYrk1w
 micrOS/source/modules/LM_ld2410.py,sha256=dWBsIkI0ryomn0zDrmz5YxaGcoH5TqjAsi2qwGd8UZM,6524
 micrOS/source/modules/LM_light_sensor.py,sha256=ptOcfjLDtL930s9J9uPO9YOnIZBGvh5Fa4F01dmFFzI,4527
 micrOS/source/modules/LM_mqtt_client.py,sha256=KeHMplcRgPQf4H-RDSOQ4ODlUKm1tzDDBOQVf832UEw,8511
-micrOS/source/modules/LM_neoeffects.py,sha256=nKwoNHUvUOM3gmNFXlNSR3uFIF0k9NLlxwfw2VxfdNo,9848
-micrOS/source/modules/LM_neomatrix.py,sha256=UIZsYoNW77WagaMVUJS4hUYrt8bGuimrZWqICwaD4qg,14334
+micrOS/source/modules/LM_neoeffects.py,sha256=zzsHEfZE7-c6cLVlRM9tPhbUDqBYytdHlvm41fv1nG0,9858
+micrOS/source/modules/LM_neomatrix.py,sha256=jCNpV-HDOpNHe7k00fr4TfDVYkM45wCmB4ZfvKAm_NA,14332
 micrOS/source/modules/LM_neopixel.py,sha256=HwyATyAvXSJ1paUn9u-I3etu4A9cCNXwo8cPbKr93iw,13289
 micrOS/source/modules/LM_oled.py,sha256=ZwLndxWuY1Ii5d06YEf9Z_jxmTyoOYRL-BO3VhJ0b14,9903
 micrOS/source/modules/LM_oled_sh1106.py,sha256=av2_ftFHvfAIxcPYHbrOMQNZgM1Go6MQzBu5cIeVK4w,11723
-micrOS/source/modules/LM_oled_ui.py,sha256=1UGyXupMc8xU9zvE2AVnLRcDZEin8T1cFblsBCZ29xA,22232
-micrOS/source/modules/LM_oledui.py,sha256=zLj-RZ-bcWoMqcmK-pxyfSs7IU-xrXW_GLPzCMvjOXY,35395
+micrOS/source/modules/LM_oled_ui.py,sha256=Dux4h8zUwSPa8zfo_lwmhH31Xmyb76d04AFoSTlwa98,22276
+micrOS/source/modules/LM_oledui.py,sha256=z9MaOEaHBF3MOWi0KdfIYH_mTVPqQb8L8Pa_1_4fMq8,35439
 micrOS/source/modules/LM_pacman.py,sha256=YWshcR0itd3CAZSfvpOkyH9Ux9H0dBKonI4fzK77qls,9750
 micrOS/source/modules/LM_pet_feeder.py,sha256=ILrozpnq2_ckkVDUROysMWRksKjflsKpIHvgHdvn-JA,2572
 micrOS/source/modules/LM_presence.py,sha256=8cagHD12HF4E6qgSn6zkf6yyY6aiBiIcEvRrfVuPyzE,8796
@@ -126,8 +124,8 @@ micrOS/source/modules/LM_sound_event.py,sha256=9BZnrT8Jc2HL-28yVZE5sdeTa8Biq1qkQ
 micrOS/source/modules/LM_stepper.py,sha256=CkI4QBe2KJ7E5DKL7Z23oAMPDUFlUt7btAvqrn4H6Kg,4278
 micrOS/source/modules/LM_switch.py,sha256=1go-jfbh0zisi3Cw680n9PmcoC-dwh_N4c5fMRceJBc,7868
 micrOS/source/modules/LM_system.py,sha256=-URoeSdNZkv4veJlxlsj7JrEHbMKFfXlImwZpGUnm-4,6579
-micrOS/source/modules/LM_tcs3472.py,sha256=rl_-4IE6f5BYTN52xY93yZJMI_PZwq9AVK2fzi_t7c0,1829
-micrOS/source/modules/LM_telegram.py,sha256=EdceSUvPN8hWB4oRnr73GMGFVe5_10OLak8jo_tJMcQ,15199
+micrOS/source/modules/LM_tcs3472.py,sha256=Kvkpxigv-9zgfy2_jUqKJzZgMBZxOXqQf4QBU9McndY,5459
+micrOS/source/modules/LM_telegram.py,sha256=U3Ww4oSE06Fd7jPGibXGaBVpP8kmIORzoTKQsRSdlPc,15239
 micrOS/source/modules/LM_tinyrgb.py,sha256=kChL607HPTl3Z2hYN2XnzXXfZ6omdP78PQutHdbdfCo,3031
 micrOS/source/modules/LM_trackball.py,sha256=N2hhy3wuk55-ja4dmENpfthBolIEj28d2pzcjel5OKg,9716
 micrOS/source/modules/LM_veml7700.py,sha256=3eb6-HuMA_tYBA0cJHUsZzOBriHacIpVSrK-1iB3_pY,5762
@@ -139,21 +137,21 @@ micrOS/source/web/udashboard.js,sha256=42mPR_NU3jOqUgLi7yZv2L7bN6uGqw9LpScDrGGF5
 micrOS/source/web/ustyle.css,sha256=P-s8ENwAcWoZi5bocrK3_kVzEjaRFKtFvEF6JRh4MBY,1429
 micrOS/source/web/uwidgets.js,sha256=BGeUSbNHn6PClgIgIE6QszwQVJ6j7lzgCBwvIX8cYgo,6631
 micrOS/source/web/uwidgets_pro.js,sha256=gbkk3SVttEVvDCwde-pJhAh4k7GuCFPdcWNq32pcKPE,3639
-microsdevtoolkit-2.17.2.data/scripts/devToolKit.py,sha256=4GutIOErF1ny0HSNWQZzEneZdUWhSdqKPBjpRFTr5do,11192
-microsdevtoolkit-2.17.2.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+microsdevtoolkit-2.19.0.data/scripts/devToolKit.py,sha256=4GutIOErF1ny0HSNWQZzEneZdUWhSdqKPBjpRFTr5do,11192
+microsdevtoolkit-2.19.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
 toolkit/DevEnvCompile.py,sha256=wNBf0T7w07SYC3eLFow3JtZApHQK-92Fu7CvJHqWuSM,13189
 toolkit/DevEnvOTA.py,sha256=8IfAcvV0L_H91FAiZDRBmC06cWOXXCpoSDO-JWE6CG4,26889
 toolkit/DevEnvUSB.py,sha256=TorXJt5qJ1Wk8Qi5Ncn3ortu432GHVCSQFXhSuA0OSU,37197
-toolkit/Gateway.py,sha256=AzZydQMVOBNGyWUtEm5Rja0m47F1AU10YSQll7_2QkQ,25335
+toolkit/Gateway.py,sha256=wz81ZteRtKuNsXmX3Zi9Uo4g5fuCxbErAhas0HrkJqU,25353
 toolkit/LM_to_compile.dat,sha256=EcJSCR3xugskiLAJY1BWEBfa0A4EhP5qHDXNRQZQ30E,619
 toolkit/MicrOSDevEnv.py,sha256=Puh0u2oQhPptj-XTvvi8N9Wm3UzDBys1ZHQvzCXjmB4,14583
 toolkit/WebRepl.py,sha256=805SJGoflJztyFR4DFxP80KVvNEeJfqZxlYeA3uD680,2696
 toolkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkit/img_stream.html,sha256=ZGyrUgpi-JhMl4euS-TTjwwGrg66a2pGUQCopWiveds,5135
 toolkit/index.html,sha256=agTgT1d4FH8l2h47Hfb4Lv061BW9shsCAgq1abO5hlI,10998
-toolkit/micrOSdashboard.py,sha256=Hw7Fz6chn6z29Kx04InV9K_8iTz-HHRvYGqKVDe0xac,54425
+toolkit/micrOSdashboard.py,sha256=5cd7-m3VlTMBX4jkw-kzVHS-Rzj7MnYNKKLm4w9hgOM,54335
 toolkit/micrOSlint.py,sha256=39TpsZs815L3XCI3opweOGiIJHYdvEizFbd9TlHiuck,26126
-toolkit/socketClient.py,sha256=cVXTO_EVYOwxHJhHuTG2Nrx6q9RDZoPyPocSFBU9MyM,18608
+toolkit/socketClient.py,sha256=sQ1I04WPSmk8KwvJTgjPCWdMHKE5sKLSwMsUrOUxCao,19980
 toolkit/dashboard_apps/BackupRestore.py,sha256=udhuFpCawO0mwyiN4vFMfV8wONqHnUjYvL0udJzkq44,5897
 toolkit/dashboard_apps/CCTDemo.py,sha256=oV7k6sxepOxEa7tBNcuK5IHgKnv01sIQRPvUljic8NI,1125
 toolkit/dashboard_apps/CCTTest.py,sha256=saU4L8gOst31bno44vlwaeSzqrIBppW2DrZf2KV7_4o,3641
@@ -170,7 +168,7 @@ toolkit/dashboard_apps/RGBTest.py,sha256=QIky1Ts87h52VS9vHs3rYoEYvwFX02BlJxzK-uE
 toolkit/dashboard_apps/RoboArm.py,sha256=fqsBFTLEKXLyuZtZhbsNMNLCVtJw3gHWE-37EzjRttw,1814
 toolkit/dashboard_apps/SED_test.py,sha256=hQG8F2isZvCEsb0EvUdvcowLtJ86vrhLMOvpe9EPcJM,2703
 toolkit/dashboard_apps/SensorsTest.py,sha256=h6Sqz9HzjUawKuvxBPMltgWAycIXUUqlLANZqlF030M,1472
-toolkit/dashboard_apps/SystemTest.py,sha256=rrHZWToda0zVgWP3g-OpnnCuxr-5TgaaAjwLmoAzBhI,26054
+toolkit/dashboard_apps/SystemTest.py,sha256=3eJ41g-AwSuR8RXFWCsb98vdsZpJvCBh-mv9uIe5WsQ,26282
 toolkit/dashboard_apps/Template_app.py,sha256=1OLO-xA6qNKyDCj-J7nHkA3Eis4ZKnHfhMcaSqHNX4A,758
 toolkit/dashboard_apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkit/dashboard_apps/_app_base.py,sha256=u2-Clkaosftr0bgr2kiClcQ1lkJT8GoUD9UUOOKVVmk,1039
@@ -293,27 +291,27 @@ toolkit/user_data/webhooks/template.macro,sha256=XikSl3FsD6W9pUx3sqavM5tWIMBquFx
 toolkit/user_data/webhooks/template.py,sha256=UhyXmETAEr-VQutY9ME4gAb-4qi7qVfZ0NjSU1inn-E,342
 toolkit/workspace/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkit/workspace/precompiled/Common.mpy,sha256=GojFfQ_pMKH04m6WmdvLm43FEJelVhrzgolgx5ACNpU,4183
-toolkit/workspace/precompiled/Config.mpy,sha256=Y50bjJnmk-uI-_rkIKvPuR5zfbrHVodsSt5G7LG4eH0,3279
+toolkit/workspace/precompiled/Config.mpy,sha256=tj0x_vwNo59wqBbkoFJ_-7reXQWwwQtG3-Sg_CMeNlo,3272
 toolkit/workspace/precompiled/Debug.mpy,sha256=BJqoH4QdOmeybdUxUlhNu6ApHo4KTraJ5F_winmwOm0,1039
-toolkit/workspace/precompiled/Espnow.mpy,sha256=mGTP_GI9uts2oqH_xw1WhcExtra3TsZrDzsopgsWUDo,4368
+toolkit/workspace/precompiled/Espnow.mpy,sha256=1Dnmn5Uyk7HfdKp45Wu9apy3FgwchbRambwlVhZlnok,4529
 toolkit/workspace/precompiled/Files.mpy,sha256=_qwNi5p_d1PXPRoF5SWiFuxmY3qt8OtT8FOhW5JusF0,1798
 toolkit/workspace/precompiled/Hooks.mpy,sha256=Jb-3JliF0O4RitSfsVm8zxSFT3VGcYmPked9W6X1jNw,1769
-toolkit/workspace/precompiled/InterConnect.mpy,sha256=KMlKFZHhF-7SlRe_GcFnydQQuSduDEGJtgHYhhOvLFI,2358
+toolkit/workspace/precompiled/InterConnect.mpy,sha256=6VtkNcotoCGLKN6iDSubnaQpEvWEXjp6s_Sz_DGjibU,3376
 toolkit/workspace/precompiled/Interrupts.mpy,sha256=0p3Bpx1C7wXWHz9jLM-eqFD0X9wuT6eKzaOdmzpkVBE,2128
 toolkit/workspace/precompiled/Logger.mpy,sha256=lgAiS5nQqIskNBtEqDoH3GwohOH0mflr8JoYV6b5x4g,1324
 toolkit/workspace/precompiled/Network.mpy,sha256=foBjsIZ1SafRplCw8v5GgDU_WjPTaRz1W9D6VYyaBSc,3553
 toolkit/workspace/precompiled/Notify.mpy,sha256=i8LNNynvNxi-tA5QT0pQJ8NJ_DNxJNW4NTZRD6gGS7M,970
 toolkit/workspace/precompiled/Scheduler.mpy,sha256=S-ZS1N420Xew74F_90O4FvFvrvmRTMiCh-C8szrdhfI,2198
-toolkit/workspace/precompiled/Server.mpy,sha256=Q6kIxjxhbkJ1nvxiPQD_6KvQYNfOhM3NTWbLMAIZaWA,4896
-toolkit/workspace/precompiled/Shell.mpy,sha256=OHOR-0z3OB4eQaVnF6QoUTxzWLZDmKG2eLdkTAdb_cQ,4821
-toolkit/workspace/precompiled/Tasks.mpy,sha256=1iBQXjiJm-s8OfqL2hAehhG_EqSfmubVRAgrJw_rNhc,6660
+toolkit/workspace/precompiled/Server.mpy,sha256=dS2IY9NAjvy2v7-fQHeY44n080GlL3ZV8ENtN1A3KPw,4896
+toolkit/workspace/precompiled/Shell.mpy,sha256=W-VN8XcaoPhV_hAW8RIXqy4kp3FKlANktqPDYNeyZcY,4821
+toolkit/workspace/precompiled/Tasks.mpy,sha256=FWwD_8bc_rg90xZhs3DgvCkOs4rM2ocYq63oWB-I5j4,6680
 toolkit/workspace/precompiled/Time.mpy,sha256=3thC6iKW4UJdjNP-Jo1Ol0Zn-e4oy2H1wiIz7SH182E,2865
 toolkit/workspace/precompiled/Types.mpy,sha256=5QGhswa0jWAU1Ywpyl_92miQg4qDHReXLqq3iHBwUCs,1397
 toolkit/workspace/precompiled/Web.mpy,sha256=X3-nqKYY_RSLsAspTFY_O7H5vkUR0OwECFbSyxqSUUc,4030
 toolkit/workspace/precompiled/_mpy.version,sha256=Kik-fvRGfWAmpEjKdJLq7nPOqYR_jVgB0aiXZ8LMvMA,6
 toolkit/workspace/precompiled/main.py,sha256=cVlhoWwU9dSKEol0HWPihFAPzrUUvzSGwZNNMrpyfSY,440
 toolkit/workspace/precompiled/micrOS.mpy,sha256=zNzWg5S_-sHW_kxX9FOPlMboGMCNe_kzc1WWdN1_PEg,1208
-toolkit/workspace/precompiled/micrOSloader.mpy,sha256=jnrYRrHlo7YnBS2BTbF6-7lMJzyD3XoxhHLYel5ngd8,1578
+toolkit/workspace/precompiled/micrOSloader.mpy,sha256=-4nL5AeXCf1-lKP6sXbj4F_QayQjCo2PpA0AHdZYQEg,1574
 toolkit/workspace/precompiled/microIO.mpy,sha256=pyfx0fA6VPniMKvmOID9Uzkq0loakhntT59hbtinsH4,1722
 toolkit/workspace/precompiled/reset.mpy,sha256=D-ZwUk-oR8OAg5ERWJXErdPAGbx_3M13hK4IBawhIg0,217
 toolkit/workspace/precompiled/urequests.mpy,sha256=tG4ttpfHPkyNk5vvbXDHKZm8zYPNEw1NYE0Ltnrjca8,2516
@@ -345,7 +343,7 @@ toolkit/workspace/precompiled/modules/LM_dimmer.mpy,sha256=QruqWLMD-cNM8FcKR_MTr
 toolkit/workspace/precompiled/modules/LM_distance.mpy,sha256=QSgZbsqCZH4vhT7caj-QyIBHuzyZxFvaQmrOqOg7zDE,1514
 toolkit/workspace/precompiled/modules/LM_ds18.mpy,sha256=WtM_FBMcwvxjqB1EsAgfkUAWBYV7AEGKIoaXOEmifB0,652
 toolkit/workspace/precompiled/modules/LM_esp32.py,sha256=AAMceuWTWMDu_1EJH-617dmp5ClPaAzFKgDOHWEiX0I,1862
-toolkit/workspace/precompiled/modules/LM_espnow.py,sha256=WD3gnXMWjIYZGcwQM62T0xd9yMb9wzEfS0ZYlkqESjA,761
+toolkit/workspace/precompiled/modules/LM_espnow.py,sha256=8WVKGinXL380aj6-qB2euhpwxN2y9pQcXMH-CrW7FJ0,1085
 toolkit/workspace/precompiled/modules/LM_gameOfLife.mpy,sha256=z-JxoeQ76mTOXY6c_NnKclRJ4Mny0O-b9s2XBPJfXUE,2059
 toolkit/workspace/precompiled/modules/LM_genIO.mpy,sha256=M7aYNyNB1SqmLnt9y_Q0MfSMIfewyT3Uc_MSFJpjd3Q,1730
 toolkit/workspace/precompiled/modules/LM_haptic.mpy,sha256=pNUF7OJJhq-kyiDI9ceuJp3YbB1P8Gj95DvLlZSz1aw,1284
@@ -355,13 +353,13 @@ toolkit/workspace/precompiled/modules/LM_keychain.mpy,sha256=hISvQVuEgTRLu_G5APg
 toolkit/workspace/precompiled/modules/LM_ld2410.mpy,sha256=Yost6gCTx55nQoyggmHHHoDmFDWpEK14MCsP6o70m_8,2589
 toolkit/workspace/precompiled/modules/LM_light_sensor.mpy,sha256=JoNgFgSe52J2c12br6tv2Sg6VL7hdM1OACP02tEE53I,1527
 toolkit/workspace/precompiled/modules/LM_mqtt_client.mpy,sha256=IB7Faja_N2aB9welEPvakyF7lDe1Q6HB1Thi2PVYzwE,2826
-toolkit/workspace/precompiled/modules/LM_neoeffects.mpy,sha256=_xNdGdT_cpIYl5zz9VyZe1p6fj-4Y01Ku8TLpJjl9XA,3079
-toolkit/workspace/precompiled/modules/LM_neomatrix.mpy,sha256=lp7TxCInP9E2VwZMSmIudMk0ZxYgX2LAIdC53hWMAY8,5073
+toolkit/workspace/precompiled/modules/LM_neoeffects.mpy,sha256=R3Ssmr3Ag-cJP5IKBsSDTSXQmxMIeo4JzvTEvcug5FU,3089
+toolkit/workspace/precompiled/modules/LM_neomatrix.mpy,sha256=exJxcMKVP4xUi1ct7yj5LWFAfeIWmU12JnexmGloHM0,5071
 toolkit/workspace/precompiled/modules/LM_neopixel.mpy,sha256=7qM4z9gLGDCYxMQ4VmnGcuG3Ck5BC05AVzmG1sADXyA,3698
 toolkit/workspace/precompiled/modules/LM_oled.mpy,sha256=82OqTsCgooB4y6BdMMBaDyfHYoHkq1W_UMteOmy0ePw,3162
 toolkit/workspace/precompiled/modules/LM_oled_sh1106.mpy,sha256=tOsOk5zOT9f5sw027wQyUEXRanx8IcSyuUN6tgfd73w,3769
-toolkit/workspace/precompiled/modules/LM_oled_ui.mpy,sha256=KEbp8UCDKMJbYy4h0U8ITLWH2l9UgRgrtJHxqMDXleE,7034
-toolkit/workspace/precompiled/modules/LM_oledui.mpy,sha256=F7UEuoYYhwae7_7CYiAKv_Lk5nYLupUVhzNNJMLAhsU,11549
+toolkit/workspace/precompiled/modules/LM_oled_ui.mpy,sha256=JRd-1h_rk8_-r7BuXW18d7abJHgr8zv56Kjd4dJ-Ass,7044
+toolkit/workspace/precompiled/modules/LM_oledui.mpy,sha256=vHu7BqEPV4xPAEzRZuLbUcdXaB2esL44gdekf6oWvN8,11543
 toolkit/workspace/precompiled/modules/LM_pacman.mpy,sha256=m7S4Gi3fAihwxpfzCaSkTDPyIzmqp4hf6KroBo5ucPw,3946
 toolkit/workspace/precompiled/modules/LM_pet_feeder.py,sha256=ILrozpnq2_ckkVDUROysMWRksKjflsKpIHvgHdvn-JA,2572
 toolkit/workspace/precompiled/modules/LM_presence.mpy,sha256=1ZRzBCmDqwAYhVp4Ww_bcPj2bp5LLsP8l7jNBtOSpUk,2744
@@ -379,8 +377,8 @@ toolkit/workspace/precompiled/modules/LM_sound_event.mpy,sha256=HhHnSYPTzd4hHjUK
 toolkit/workspace/precompiled/modules/LM_stepper.mpy,sha256=7FJuw86m5AnjPoiD089l90MvXFcpH7sJL8prhrcyjB0,1474
 toolkit/workspace/precompiled/modules/LM_switch.mpy,sha256=zQCsYkulOQ-vRmlAFjGGThOo2X9FQh6P9-En8t31zy0,2302
 toolkit/workspace/precompiled/modules/LM_system.mpy,sha256=DIL5FxfWKAn7gjMK5Wcn7t9IyNLQWhI8qREV-8e6R_o,2824
-toolkit/workspace/precompiled/modules/LM_tcs3472.py,sha256=rl_-4IE6f5BYTN52xY93yZJMI_PZwq9AVK2fzi_t7c0,1829
-toolkit/workspace/precompiled/modules/LM_telegram.mpy,sha256=yufAtrSVCfUXGCRhliLeT8YWjzkZLmPoUctH_gkUs6o,5148
+toolkit/workspace/precompiled/modules/LM_tcs3472.py,sha256=Kvkpxigv-9zgfy2_jUqKJzZgMBZxOXqQf4QBU9McndY,5459
+toolkit/workspace/precompiled/modules/LM_telegram.mpy,sha256=T_R9bNbF-RMjQz6S_bhX4YP0Hn_u2SPQ9k0y1eEXFA0,5172
 toolkit/workspace/precompiled/modules/LM_tinyrgb.mpy,sha256=ggoQ1nT8GJzA96GZovfuzWderEpOwO_aklDGm2O3WcU,1024
 toolkit/workspace/precompiled/modules/LM_trackball.mpy,sha256=gRdSB3DX1wIFsDqMxLfvBEKy9Xr-otGqx97NvkwHYFI,3479
 toolkit/workspace/precompiled/modules/LM_veml7700.mpy,sha256=X_2O0XnGtEZgSrXHpZc7uOEAdpMZug7tm4RJ-n-mqbM,1961
@@ -392,7 +390,7 @@ toolkit/workspace/precompiled/web/udashboard.js,sha256=42mPR_NU3jOqUgLi7yZv2L7bN
 toolkit/workspace/precompiled/web/ustyle.css,sha256=P-s8ENwAcWoZi5bocrK3_kVzEjaRFKtFvEF6JRh4MBY,1429
 toolkit/workspace/precompiled/web/uwidgets.js,sha256=BGeUSbNHn6PClgIgIE6QszwQVJ6j7lzgCBwvIX8cYgo,6631
 toolkit/workspace/precompiled/web/uwidgets_pro.js,sha256=gbkk3SVttEVvDCwde-pJhAh4k7GuCFPdcWNq32pcKPE,3639
-microsdevtoolkit-2.17.2.dist-info/METADATA,sha256=F9depELdXOy3V_MZ4DHfJuQHLf5AYIZ3su8QFyKdnNg,55554
-microsdevtoolkit-2.17.2.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-microsdevtoolkit-2.17.2.dist-info/top_level.txt,sha256=rOGOIXqLBdGZAoDTiLdZ9B_leFB7bMv7YabLwuIc2bc,25
-microsdevtoolkit-2.17.2.dist-info/RECORD,,
+microsdevtoolkit-2.19.0.dist-info/METADATA,sha256=uM4hFX9QHXatnrIwWEYvCCYLZluk_GHL5Ms_kH0xf7w,55544
+microsdevtoolkit-2.19.0.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+microsdevtoolkit-2.19.0.dist-info/top_level.txt,sha256=rOGOIXqLBdGZAoDTiLdZ9B_leFB7bMv7YabLwuIc2bc,25
+microsdevtoolkit-2.19.0.dist-info/RECORD,,

toolkit/Gateway.py

@@ -211,7 +211,7 @@ class ListDevices(Resource):
 
     def sort_devices(self):
         device_struct = socketClient.ConnectionData.list_devices()
-        online_devices = socketClient.ConnectionData.nodes_status()
+        online_devices = socketClient.ConnectionData.nodes_status(feature_stat=False)
         filtered_devices = {"online": {}, "offline": {}}
         for uid, data in device_struct.items():
             if data[0] in online_devices:

toolkit/dashboard_apps/SystemTest.py

@@ -412,6 +412,10 @@ def check_intercon(host=None):
         except Exception as e:
             print(f"WARNING: cannot parse output as dir: {e}")
             data_dict = {'tag': None, 'verdict': f'{data}: {str(e)}'}
+        # Handle new syntax: {"taskID": "verdict"}
+        if data[0] and data_dict.get("tag") is None:
+            _ttag = list(data_dict.keys())[0]
+            data_dict = {'tag': _ttag, 'verdict': f'{list(data_dict.values())[0]}: task show {_ttag}'}
         return data[0], data_dict
 
     def _get_intercon_output(tag):
@@ -426,51 +430,51 @@ def check_intercon(host=None):
                 break
         return _state, _output
 
-    def run_intercon_hello(tout):
+    def run_intercon_hello(tout=8):
         nonlocal host
         cmd_list = [f'hello >>{host}']
-        _output = CLIENT.execute(cmd_list, tout=8)
-        _new_intercon = True
-        if "hello:" in _output[1]:  # TODO: remove...
-            # LEGACY WAY: FALLBACK
-            cmd_list = ['intercon sendcmd "{}" "hello" >json'.format(host)]
-            _output = CLIENT.execute(cmd_list, tout=tout)
-            _new_intercon = False
-        return _new_intercon, _output
+        _output = CLIENT.execute(cmd_list, tout=tout)
+        return _output
 
     info_msg = '[ST] Check device-device connectivity'
     print(info_msg)
     host = 'test.local' if host is None else host
-    new_intercon, output = run_intercon_hello(tout=8)
+    output = run_intercon_hello(tout=8)
     output = _convert_return_to_dict(output)
+
     device_was_found = False
     if output[0] is False or output[1] is None:
         output = 'Device was not found: {}:{}'.format(host, output)
         return False, output
-    elif output[1] == '[]':
+    if output[1] == '[]':
         # Valid input, device was not found
         output = 'Device was not found: {}:{}'.format(host, output)
         state = True, f'{info_msg}:\n\t\t{output}'
     elif len(output[1]) > 1 and "hello" in output[1]['verdict']:
         response_state, response = _get_intercon_output(output[1]['tag'])
         # Valid input on online device
-        output = "Device was found: {}:{} version: {}".format(host, f"{output}: {response}", "NEW" if new_intercon else "LEGACY")
-        state = True & response_state, f'{info_msg}:\n\t\t{output}'
+        output = "Device was found: {}:{}".format(host, f"{output}: {response}")
+        state = response_state, f'{info_msg}:\n\t\t{output}'
         device_was_found = True
     else:
-        state = False, output
+        state = False, f" InterCon Failed: {output}"
 
     if device_was_found:
         # DO Negative testing as well
         host = "notavailable.local"
-        _, output_neg = run_intercon_hello(tout=20)
+        output_neg = run_intercon_hello(tout=20)
+        if output_neg[0] and output_neg[1] == '':
+            # NO HOST TIMEOUT ...
+            output_neg = f'Device was not found (dhcp timeout): {host}:{output_neg}: {output_neg[1]}'
+            return True & state[0], f"{state[1]}\n\t\tNegative test: {output_neg}"
+        # Valid return on negative testing
         output_neg = _convert_return_to_dict(output_neg)
-        state_neg = False, output_neg
+        state_neg = False, f"Negative test failed: {output_neg}"
         if len(output_neg[1]) > 1 and "hello" in output_neg[1]['verdict']:
             response_state, response = _get_intercon_output(output_neg[1]['tag'])
             output_neg = f'Device was not found: {host}":{output_neg}: {response}'
-            state_neg = True & response_state, output_neg
-        return state[0] & state_neg[0], "{}\n\t\tNegative test: {}".format(state[1], state_neg[1])
+            state_neg = response_state, output_neg
+        return state[0] & state_neg[0], f"{state[1]}\n\t\tNegative test: {state_neg[1]}"
     return state