From d7a9a3b816c77b27760b802ff7cd627b337bec50 Mon Sep 17 00:00:00 2001
From: ozarchie <6479143+ozarchie@users.noreply.github.com>
Date: Wed, 27 Feb 2019 12:39:37 +1000
Subject: [PATCH] Readme

---
 Software/README.md | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/Software/README.md b/Software/README.md
index 292b708..0731b21 100644
--- a/Software/README.md
+++ b/Software/README.md
@@ -1,13 +1,42 @@
 THIS CODE IS NOT FULLY TESTED.  
+<<<<<<< HEAD
 ONLY USE IT IF YOU WANT TO HELP IN THE DEBUG PROCESS.
 <h1>Installation</h1>
+=======
+ONLY USE IT IF YOU WANT TO HELP IN THE DEBUG PROCESS.  
+<hr />
+<h1>Installation</h1>
+
+<h2>EQMOD</h2>
+<hr />
+<ol>
+EQMOD does not support WiFi communications natively.  
+  
+It needs a Serial<->WiFi bridge.  
+
+If you want to use EQMOD, you need to build the  
+<li> [EQMOD-WiFi](https://github.com/ozarchie/EQMOD-WiFi), or  
+<li> [EQMOD-BT](https://github.com/ozarchie/EQMOD-Bluetooth)  
+    interface and code.  
+</li>	
+If you are OK with SynScan, see below.  
+
+>>>>>>> 7918c3f75078274a54da8f65a02d29f8a4551671
 <h2>ESP32</h2>
 <hr />
 <ol>
 <h3>Download the github image and configure</h3>
 <li>https://github.com/ozarchie/EQMOD-ETX/tree/master/Software</li>
+<<<<<<< HEAD
+=======
+<li>Make sure you have the espressif ESP32 system and libraries installed.  
+  
+  [Download ESP32](https://github.com/espressif/arduino-esp32/blob/master/docs/arduino-ide/windows.md)</li>
 
-<li>Download and install Synscan (Windows/Android) to drive the scope
+<li>Compile and upload to your hardware  
+>>>>>>> 7918c3f75078274a54da8f65a02d29f8a4551671
+
+<h3>Download and install Synscan (Windows/Android) to drive the scope</h3>
 
 [Download SynScan](http://skywatcher.com/download/software/synscan-app/ "Title")  
 
@@ -15,9 +44,14 @@ Download and install ASCOM driver for Synscan (Windows) to interface to CdC etc
 
 [Download SynScan ASCOM](http://skywatcher.com/download/software/ascom-driver/ "Title")  
 
-</li>		
+</li>
 
+<<<<<<< HEAD
 <li>Search and join WiFi network EQMODWiFi, Password is CShillit0</li>
+=======
+<h3>Run on Windows - ASCOM only supports Windows</h3>
+<li>Search for and join WiFi network EQMODWiFi, Password is CShillit0</li>
+>>>>>>> 7918c3f75078274a54da8f65a02d29f8a4551671
 <li>Start SynScan and press Connect</li>
 <li>Select EQ6</li>