Skip to content

Commit

Permalink
update esp32
Browse files Browse the repository at this point in the history
  • Loading branch information
tuanpmt committed Apr 25, 2017
1 parent ffd4ef5 commit a0d747d
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ after_success:
- ./push.sh
env:
global:
- secure: "qGEkUEfPrf7k5DWTsKkxXGQ5qfPeSoGeeYl/JoMUTWkJpuU9KnX/cCOMSuM7JiVo2AGotu11S5vZ4xWSSlFaIcQpoXahkJKM1LYS5XIv3ItFO1e5iF+hGmYHOmt2akv0OIJtkAy9TZfM0FqXg7vD6ylcTh2QpEEyTNw8JN1B2Srv/qzj5Icu3RTh6GBa8xCkI2MTOEsXcVfOGMCwDj7n7dSE0VYnVOwrI+ld3yk+EQYuf3rYZTnVdSTz5Nk5j2/1bUkVNkXyD3c2Foi1rzlrDjQo4UoTNr2NsIdD+qzg0Pa54z7Fo0aRj+HADHUiG/QO7VAr45Pqhv0i7LoBcaQ/o4GA14YoZ7ac9yXN+51/EAH1/8sTk3iaxyr3bVL0NxcMLuK4ZTEBwolLvpowtZN8ufY4Mc2TlU+JDvE4Om7q9RxVq6S9xy/M6ph/d7AeGBjoti8259BElvgjq9yXQsBmbpqlz3rIa23hLpqDT9OdwCzw7R7YIuUzfzKYVoToUxY0OMr9Wy+1TVhYrcGzBG31G4UTSXMIGVzzBIZ1vywGXYGBjgT6fKlsGmuPw6bTS+jDEIP0odej26cFDdjDr9mRZVfsZrpGF37LFiTLHSpQjP9ho8t1HnyTMS1UUvMsw/P+WLvVLGZWQyUiad8ZmYrPha4N5L5KNeGM1r6m1E8lfgE="
- secure: "kMCqO+VbNTVMh83ed72unx9+RFdntDXxZF6OeTiGNoUH1IdVGfWw89A7MmZ0fY/IKE+n3/gTrsiNgvZ7Muwlt0fvDUO6lgz5ZvmU6X/Rlua3y4hJpMeQHRl+imNMW78sRElqOnieT4skHBnH6DvKwXmbZ01soZT/HJPnYZgdIx5W748TGu6foFQ47PKhYOHQIBC0mN+Xevz6JbVHFjIotuDTNAo1BGShPIlAUs0wEZP+3y3pQ5wu9B18bwdKbLAOIyeu4hGz+ryK3EbmjfYxkPyXTK5t/mNyIwfB9FiQTrVDO7eeYvKvERAdbQPIL4fJffBLyBYeMwhz3hSAvHTrzeSDjZo4yuaIcrkHeb7477WmH1e6hRJazaL6cVNFRsBdOzMxomdMdih+pxl1k4TrbNSM9y+0YnawJf6p01wlQpehcXlLzIKX1q+XObYkP7+T5ku2Azm7wn0XCnKteF4eHvKbBKoJoret3ENtfrk7oh9sq10UWEldfahdC8HcdVpToEGdoJJme6c6sQlZAsas6zC//6flGLsKmdUWd4aY8aM680EwOCPZj2Exrr+CQ9ncv6Tjuk69PwF/ZJ9F8BdIuEt1oWpVNS8iwyDuqTlvbUetVU5Dbae+g65Uqjo8O5QCpzcoMgRoNWECEjvLu70IZKHKXYR6xxr1ZSPA2TqfvRA="
2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
openstem.vn
esp32.vn
18 changes: 9 additions & 9 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# arduino for esp8266 documentation build configuration file, created by
# ESP32 documentation build configuration file, created by
# sphinx-quickstart on Tue Jan 31 15:57:47 2017.
#
# This file is execfile()d with the current directory set to its
Expand Down Expand Up @@ -42,7 +42,7 @@
'sphinxcontrib.youtube',
'sphinxcontrib.googleanalytics']

googleanalytics_id = 'UA-60470603-9'
googleanalytics_id = 'UA-60470603-x'

html_theme_options = {
'collapse_navigation': False,
Expand All @@ -63,7 +63,7 @@
master_doc = 'index'

# General information about the project.
project = u'Open STEM'
project = u'ESP32'
copyright = u'2017, TuanPM'
author = u'TuanPM'

Expand Down Expand Up @@ -100,7 +100,7 @@
('unix', 'unix'),
('pyboard', 'the pyboard'),
('wipy', 'the WiPy'),
('esp8266', 'the ESP8266'),
('esp32doc', 'the ESP32'),
))
micropy_port = os.getenv('MICROPY_PORT') or 'pyboard'
tags.add('port_' + micropy_port)
Expand Down Expand Up @@ -154,7 +154,7 @@
# -- Options for HTMLHelp output ------------------------------------------

# Output file base name for HTML help builder.
htmlhelp_basename = 'arduinoforesp8266doc'
htmlhelp_basename = 'esp32doc'


# -- Options for LaTeX output ---------------------------------------------
Expand All @@ -181,7 +181,7 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'arduinoforesp8266.tex', u'arduino for esp8266 Documentation',
(master_doc, 'esp32doc.tex', u'ESP32 Documentation',
u'TuanPM', 'manual'),
]

Expand All @@ -191,7 +191,7 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'arduinoforesp8266', u'arduino for esp8266 Documentation',
(master_doc, 'esp32doc', u'ESP32 Documentation',
[author], 1)
]

Expand All @@ -202,8 +202,8 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
(master_doc, 'arduinoforesp8266', u'arduino for esp8266 Documentation',
author, 'arduinoforesp8266', 'One line description of project.',
(master_doc, 'esp32doc', u'ESP32 Documentation',
author, 'esp32doc', 'One line description of project.',
'Miscellaneous'),
]

Expand Down
4 changes: 2 additions & 2 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ Cài đặt công cụ cần thiết

Viết bài
========
* Fork dự án về tài khoản cá nhân: https://github.com/openstemvn/openstem.vn
* Fork dự án về tài khoản cá nhân: https://github.com/esp32vn/esp32.vn
* Xem qua về định dạng `reStructuredText <http://www.sphinx-doc.org/en/stable/rest.html>`_
* Mẫu bài cơ bản bao gồm các thành phần demo, chuẩn bị, đấu nối, cài đặt thư viện, lập trình, lưu ý, giống:

* Sử dụng thư viện `Fritzing <https://github.com/iotmakervn/iot-wifi-uno-hw/blob/master/assets/iot-wifi-uno.fzpz>`_ cho việc đấu nối
* Nếu cần `Pinout <https://github.com/iotmakervn/iot-wifi-uno-hw/raw/master/assets/Iot-wifi-uno-hw-pinout.png>`_

* Commit và push lên repository trên github (tài khoản cá nhân)
* Gởi pull-request đến https://github.com/openstemvn/openstem.vn
* Gởi pull-request đến https://github.com/esp32vn/esp32.vn

Một số lưu ý khác
=================
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Openstem
=========================
ESP32
=====

4 changes: 2 additions & 2 deletions push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Push HTML files to gh-pages automatically.

# Fill this out with the correct org/repo
ORG=openstemvn
REPO=openstem.vn
ORG=esp32vn
REPO=esp32.vn
# This probably should match an email for one of your users.
[email protected]

Expand Down

0 comments on commit a0d747d

Please sign in to comment.