Slimmed loader, updated examples, fixed wifi, updated README.

Signed-off-by: ubi de feo <me@ubidefeo.com>

Author: ubidefeo

README.md

@@ -8,6 +8,15 @@ This package adds functionalities for
 
 ## Installation
 
+### Using Lab for MicroPython / MicroPython Package Installer
+
+If you are using [Arduino Lab for MicroPython](https://labs.arduino.cc/en/labs/micropython) to work on your MicroPython projects, you can use the button "Install Package". This will launch [MicroPython Package Installer](https://labs.arduino.cc/en/labs/micropython-package-installer) or take you to the web page to download and install it.
+Once installed, running it once will make sure the application file 
+
+![Install package](assets/package_installer_button.png)
+
+This tool simplifies installing packages from both the official MicroPython index and Arduino's curated package index on any MicroPython board.
+
 ### Using `mpremote`
 
 We must specify the target especially if the framework is already installed and a default app is present, since `mpremote mip` will use the current path to look for or create the `lib` folder.

arduino_tools/app.py

@@ -12,8 +12,10 @@ def __init__(self, app_name):
     if not validate_app(app_name):
       raise ValueError('Invalid app')
     self.properties = get_app_properties(app_name)
+    self.friendly_name = self.properties['friendly_name']
     if os.getcwd() != self.get_path():
       enter_app(app_name)
+    
 
   def get_property(self, property):
     return self.properties.get(property)

arduino_tools/loader.py

@@ -23,14 +23,23 @@ def enter_default_app():
     return None
 
   if fs_item_exists(APPS_ROOT + BOOT_CONFIG_FILE):
+    boot_entries = []
     with open(APPS_ROOT + BOOT_CONFIG_FILE, 'r') as a_cfg:
-      default_p = a_cfg.readline().strip()
-      reboot_to = a_cfg.readline().strip()
+      boot_entries = a_cfg.readlines()
+    
+    if len(boot_entries) > 1:
+      default_p = boot_entries.pop(0)
+    elif len(boot_entries) == 1:
+      default_p = boot_entries[0]
+    else:
+      default_p = ''
+    default_p = default_p.strip()
     if default_p == '':
       return None
-    if reboot_to != '':
+    if len(boot_entries) > 0:
       with open(APPS_ROOT + BOOT_CONFIG_FILE, 'w') as a_cfg:
-        a_cfg.write(reboot_to)
+        for entry in boot_entries:
+          a_cfg.write(entry)
     return enter_app(default_p)
   return None
 

arduino_tools/wifi_utils.py

@@ -124,11 +124,10 @@ def find_scanned_matches():
     # print('encoded name: ', (n['name']).encode())
     # print('mac: ', (n['mac']).encode())
 
-    filtered = [item for item in _local_networks_cache['networks'] if item[0] == (n['name']).encode() or binascii.hexlify(item[1]) == n['mac'].encode()]
+    # filtered = [item for item in _local_networks_cache['networks'] if item[0] == (n['name']).encode() or binascii.hexlify(item[1]) == n['mac'].encode()]
+    filtered = [item for item in _local_networks_cache['networks'] if binascii.hexlify(item[1]) == n['mac'].encode()]
     if len(filtered) > 0:
       scanned_known_networks.append(n)
-      
-      
   return scanned_known_networks
 
 def auto_connect(progress_callback = None):

assets/package_installer_button.png

@@ -10,10 +10,16 @@ In this case the condition to restore `app_launcher` as the default application
 This is an example `JSON` file to be reachable at an App's `origin_url` address.
 The method `update_app(path = None)`, if `path` is not provided, will query that `URL` and verify that new versions of the App are available.
 
-### Example usage (requires network connection)
+### Example usage (requires an active network connection)
 
 ```python
 from arduino_tools.app import App
 my_app = App('valid_app_name')
 my_app.update()
 ```
+
+## app_demo
+
+This is a sample App that displays the structure of an application.
+It includes a local `lib` folder, which highlights the fact that libraries local to the application don't need to be installed system-wide, also allowing other versions of packages to be installed on an App basis.
+The loader add the local App's `lib` folder at the beginning of `system.path`.

examples/README.md

@@ -3,11 +3,16 @@
 
 from sample_lib import sample_lib_function
 # The following two lines will take care of initializing the app
+# as well making sure that once run the current working directory
+# is set to the app's folder.
+# This comes in handy when testing an App but the board is set to run
+# a different default app.
 from arduino_tools.app import *
 my_app = App('demo')
 
 # Write your code below (no #) and have fun :)
 print(f'Hello, I am an app and my name is {my_app.friendly_name}')
+
 # Call a function from the sample_lib module
 # To demonstrate that the app's lib/ folder is in sys.path
 sample_lib_function()