Merge branch 'master' into dev-readthedocs

This commit is contained in:
watson134
2018-10-06 01:38:30 +08:00
4 changed files with 7 additions and 3 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 103 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

+1 -1
View File
@@ -6,7 +6,7 @@
M5Stack
=============================
Welcom to M5Stack Documents!
Welcome to M5Stack Documents!
.. image:: ../_static/m5stack.png
@@ -71,8 +71,6 @@ INCLUDES
DOCUMENTS
---------
- `Schematic <https://github.com/m5stack/esp32-cam-demo/blob/m5cam/M5CAM-ESP32-A1-POWER.pdf>`__
- Example
+ `Arduino Example <https://github.com/m5stack/M5Stack/tree/master/examples>`__
@@ -95,9 +93,15 @@ DOCUMENTS
- `Purchase <https://www.aliexpress.com/store/product/M5Stack-NEW-PSRAM-2-0-FIRE-IoT-Kit-Dual-Core-ESP32-16M-FLash-4M-PSRAM-Development/3226069_32847906756.html?spm=2114.12010615.8148356.10.1c93724d7cJ5rG.html>`_
READ MORE
---------
Diagram of Fire
""""""""""""""""
.. image:: ../../../_static/product_pics/core/fire/simple_sch_just_for_fire.jpg
.. image:: ../../../_static/product_pics/core/fire/interface_fire.jpg