From 02b51b082ebd6b44442e3f1d7a3bb0b5199d7a02 Mon Sep 17 00:00:00 2001
From: Markus Birth <mbirth@gmail.com>
Date: Thu, 29 Oct 2015 23:58:36 +0100
Subject: [PATCH] Shortened docstrings. Optimised boot.py for soft-reboots.

---
 README.md        |  4 ++++
 boot.py          | 36 +++++++++++++++++++-----------------
 http.py          | 11 ++++++-----
 ptpip.py         | 13 +++++++------
 requirements.txt |  2 +-
 theta.py         |  1 -
 6 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 29c9d0e..4dd516e 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,10 @@ Preparation
 
 Copy the `config.example.py` to `config.py` and adjust the constants to your home wifi network.
 
+If you want to try the script from a desktop computer, install all needed dependencies with:
+
+    micropython -m upip install -r requirements.txt
+
 
 Connecting to the THETA
 -----------------------
diff --git a/boot.py b/boot.py
index d1a7115..12f66e5 100644
--- a/boot.py
+++ b/boot.py
@@ -3,24 +3,26 @@
 
 # Copy config.example.py to config.py and modify to your needs first!
 import config
+import machine
 
-from machine import UART
+#from machine import UART
 from os import dupterm
-uart = UART(0, 115200)
+uart = machine.UART(0, 115200)
 dupterm(uart)
 
-from network import WLAN
-wifi = WLAN()
-wifi.mode(WLAN.STA)
-ssids = wifi.scan()
-found = False
-for net in ssids:
-    print("Checking %s" % net.ssid)
-    if net.ssid == config.HOME_SSID:
-        print("Found %s!" % net.ssid)
-        wifi.connect(config.HOME_SSID, auth=(WLAN.WPA, config.HOME_PASSWORD))
-        found = True
-        break
-if not found:
-    print("No eligible WiFi found.")
-    wifi.mode(WLAN.AP)
+if machine.reset_cause() != machine.SOFT_RESET:
+    from network import WLAN
+    wifi = WLAN()
+    wifi.mode(WLAN.STA)
+    ssids = wifi.scan()
+    found = False
+    for net in ssids:
+        print("Checking %s" % net.ssid)
+        if net.ssid == config.HOME_SSID:
+            print("Found %s!" % net.ssid)
+            wifi.connect(config.HOME_SSID, auth=(WLAN.WPA, config.HOME_PASSWORD))
+            found = True
+            break
+    if not found:
+        print("No eligible WiFi found.")
+        wifi.mode(WLAN.AP)
diff --git a/http.py b/http.py
index ac5bdf2..9d5aa4f 100644
--- a/http.py
+++ b/http.py
@@ -1,10 +1,11 @@
 """
 HTTP helper class
 @author Markus Birth <markus@birth-online.de>
-
-RFC: http://www.w3.org/Protocols/rfc2616/rfc2616.html
-Inspiration: http://www.wellho.net/resources/ex.php4?item=y303/browser.py
 """
+
+# RFC: http://www.w3.org/Protocols/rfc2616/rfc2616.html
+# Inspiration: http://www.wellho.net/resources/ex.php4?item=y303/browser.py
+
 import re
 import socket
 
@@ -34,8 +35,8 @@ class HTTP:
 
     def do_request(self, url, payload=False, type="GET"):
         urlparts = self.parse_url(url)
-        
-        pass
+
+
 
 class ParseResult():
     def __init__(self, scheme, netloc, path, params, query, fragment, username, password, hostname, port):
diff --git a/ptpip.py b/ptpip.py
index e81dfc7..264140f 100644
--- a/ptpip.py
+++ b/ptpip.py
@@ -1,13 +1,14 @@
 """
 PTP/IP class for MicroPython
 @author Markus Birth <markus@birth-online.de>
-
-PTP/IP abstract: http://www.cipa.jp/ptp-ip/index_e.html
-PTP packet structure: http://www.gphoto.org/doc/ptpip.php
-                  and https://github.com/gphoto/libgphoto2/blob/master/camlibs/ptp2/PTPIP.TXT
-PTP example implementation in JavaScript: https://github.com/feklee/ptp.js
-PTP response codes: http://www.javased.com/?source_dir=cameraptp/src/main/java/ste/ptp/Response.java
 """
+
+# PTP/IP abstract: http://www.cipa.jp/ptp-ip/index_e.html
+# PTP packet structure: http://www.gphoto.org/doc/ptpip.php
+#                   and https://github.com/gphoto/libgphoto2/blob/master/camlibs/ptp2/PTPIP.TXT
+# PTP example implementation in JavaScript: https://github.com/feklee/ptp.js
+# PTP response codes: http://www.javased.com/?source_dir=cameraptp/src/main/java/ste/ptp/Response.java
+
 import binascii
 import socket
 import struct
diff --git a/requirements.txt b/requirements.txt
index abd5da8..2833478 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-# Install with: micropython -m upip install -r requirements.txt
+micropython-json
 micropython-os
 micropython-re-pcre
 micropython-socket
diff --git a/theta.py b/theta.py
index d04912e..922c895 100644
--- a/theta.py
+++ b/theta.py
@@ -1,6 +1,5 @@
 """
 RICOH Theta class for MicroPython
-
 @author Markus Birth <markus@birth-online.de>
 """