merge conflicts

.gitignore

@@ -1 +1,2 @@
-esp32*
+# ignore the ESP32 MicroPython binary
+esp32*.bin

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 RoboKoding
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -0,0 +1,12 @@
+# sumorobot-firmware
+The software that is running on the SumoRobots
+
+# Instructions
+* Downlad the [SumoRobot firmware](https://github.com/eik-robo/sumoesp/tree/master/soft)
+* Replace the hal.py with the one in this repository
+* Add your WiFi networks to the hal.py WIFIS dict
+* Install [MicroPython](http://micropython.org/download#esp32) on your ESP32
+* Upload the SumoRobot firmware on your ESP32 with [ampy](https://github.com/adafruit/ampy)
+
+# Credits
+* [K-SPACE MTÜ](https://k-space.ee/)