8000 Merge branch 'master' into me-no-dev · ksmith9109/arduino-esp32@e31aaca · GitHub
[go: up one dir, main page]
Skip to content

Commit e31aaca

Browse files
me-no-devme-no-dev
committed
Merge branch 'master' into me-no-dev
2 parents 4917f63 + 4fbee22 commit e31aaca

16 files changed

+83
-36
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11

22
tools/xtensa-esp32-elf
33
tools/dist
4+
tools/esptool
5+
tools/esptool.exe

‎README.md

Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ Most of the framework is implemented. Most noticable is the missing analogWrite.
3030
- Open Terminal and execute the following command (copy->paste and hit enter):
3131

3232
```bash
33-
curl -o get-pip.py https://bootstrap.pypa.io/get-pip.py && \
34-
sudo python get-pip.py && \
35-
sudo pip install pyserial && \
3633
mkdir -p ~/Documents/Arduino/hardware/espressif && \
3734
cd ~/Documents/Arduino/hardware/espressif && \
3835
git clone https://github.com/espressif/arduino-esp32.git esp32 && \
@@ -48,9 +45,6 @@ Most of the framework is implemented. Most noticable is the missing analogWrite.
4845
```bash
4946
sudo usermod -a -G dialout $USER && \
5047
sudo apt-get install git && \
51-
wget https://bootstrap.pypa.io/get-pip.py && \
52-
sudo python get-pip.py && \
53-
sudo pip install pyserial && \
5448
mkdir -p ~/Arduino/hardware/espressif && \
5549
cd ~/Arduino/hardware/espressif && \
5650
git clone https://github.com/espressif/arduino-esp32.git esp32 && \
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,46 @@
22
### Tested on 32 and 64 bit Windows 10 machines
33

44
1. Download and install the latest Arduino IDE ```Windows Installer``` from [arduino.cc](https://www.arduino.cc/en/Main/Software)
5-
2. Download ```Windows x86 MSI installer``` or ```Windows x86-64 MSI installer``` from [python.org](https://www.python.org/downloads/release/python-2712/). When installing:
6-
- Install for all users
7-
- In ```Customize Python 2.7.X``` page, make sure you enable the last option: ```Add python.exe to Path```
8-
![Python](python-install.png)
9-
3. Download and install Git from [git-scm.com](https://git-scm.com/download/win)
10-
4. Start ```Git Bash``` as Administrator and execute the following command
5+
2. Download and install Git from [git-scm.com](https://git-scm.com/download/win)
6+
3. Start ```Git GUI``` and run through the following steps:
7+
- Select ```Clone Existing Repository```
8+
9+
![Step 1](win-gui-1.png)
10+
11+
- Select source and destination
12+
- Source Location: ```https://github.com/espressif/arduino-esp32.git```
13+
- Target Directory: ```C:/Users/[YOUR_USER_NAME]/Documents/Arduino/hardware/espressif/esp32```
14+
- Click ```Clone``` to start cloning the repository
15+
16+
![Step 2](win-gui-2.png)
17+
![Step 3](win-gui-3.png)
18+
19+
- Open ```C:/Users/[YOUR_USER_NAME]/Documents/Arduino/hardware/espressif/esp32/tools``` and double-click ```get.exe```
20+
21+
![Step 4](win-gui-4.png)
22+
- When ```get.exe``` finishes, you should the following files you the directory
23+
24+
![Step 5](win-gui-5.png)
25+
26+
4. Plug your ESP32 board and wait for the drivers to install (or install manually any that might be required)
27+
5. Start Arduino IDE
28+
6. Select your board in ```Tools > Board``` menu
29+
7. Select the COM port that the board is attached to
30+
8. Compile and upload (You might need to hold the boot button while uploading)
1131

12-
```bash
13-
python -m pip install --upgrade pip && \
14-
pip install pyserial && \
15-
pip install requests
16-
```
17-
![Git Bash As Admin](gitbash-admin-start.png)
18-
![Git Bash Admin CMD](gitbash-admin.png)
19-
5. Start ```Git Bash``` normally and execute the following command
32+
![Arduino IDE Example](arduino-ide.png)
2033

21-
```bash
22-
mkdir -p ~/Documents/Arduino/hardware/espressif && \
23-
cd ~/Documents/Arduino/hardware/espressif && \
24-
git clone https://github.com/espressif/arduino-esp32.git esp32 && \
25-
cd esp32/tools/ && \
26-
python get.py
27-
```
28-
![Git Bash User CMD](gitbash-user.png)
29-
6. Plug your ESP32 board and wait for the drivers to install (or install manually any that might be required)
30-
7. Start Arduino IDE
31-
8. Select your board in ```Tools > Board``` menu
32-
9. Select the COM port that the board is attached to
33-
10. Compile and upload (You might need to hold the boot button while uploading)
34+
### How to update to the latest code
3435

35-
![Arduino IDE Example](arduino-ide.png)
36+
1. Start ```Git GUI``` and you should see the repository under ```Open Recent Repository```. Click on it!
37+
38+
![Update Step 1](win-gui-update-1png)
39+
40+
2. From menu ```Remote``` select ```Fetch from``` > ```origin```
41+
42+
![Update Step 2](win-gui-update-2png)
43+
44+
3. Wait for git to pull any changes and close ```Git GUI```
45+
4. Open ```C:/Users/[YOUR_USER_NAME]/Documents/Arduino/hardware/espressif/esp32/tools``` and double-click ```get.exe```
46+
47+
![Step 4](win-gui-4.png)
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
"packager": "esp32",
3535
"name": "xtensa-esp32-elf-gcc",
3636
"version": "1.22.0-61-gab8375a-5.2.0"
37+
},
38+
{
39+
"packager": "esp32",
40+
"name": "esptool",
41+
"version": "fe69994"
3742
}
3843
]
3944
}
@@ -72,6 +77,40 @@
7277
"size": "32734156"
7378
}
7479
]
80+
},
81+
{
82+
"name": "esptool",
83+
"version": "fe69994",
84+
"systems": [
85+
{
86+
"host": "i686-mingw32",
87+
"url": "https://dl.espressif.com/dl/esptool-fe69994-windows.zip",
88+
"archiveFileName": "esptool-fe69994-windows.zip",
89+
"checksum": "SHA-256:b2702efc045f5f61f821c72495301a0f2016e87e33f49fa16e262d0522d2b021",
90+
"size": "3389457"
91+
},
92+
{
93+
"host": "x86_64-apple-darwin",
94+
"url": "https://dl.espressif.com/dl/esptool-fe69994-macos.tar.gz",
95+
"archiveFileName": "esptool-fe69994-macos.tar.gz",
96+
"checksum": "SHA-256:49ab32fbdf4f855925638d4b76ffd292255a47c4445b1069737f7151f66a03aa",
97+
"size": "3886730"
98+
},
99+
{
100+
"host": "x86_64-pc-linux-gnu",
101+
"url": "https://dl.espressif.com/dl/esptool-fe69994-linux64.tar.gz",
102+
"archiveFileName": "esptool-fe69994-linux64.tar.gz",
103+
"checksum": "SHA-256:6ff54604bb3e1af39a7dd4f0e54b02b0f48bcd8a0b9259bc202385fdea573e05",
104+
"size": "3937680"
105+
},
106+
{
107+
"host": "i686-pc-linux-gnu",
108+
"url": "https://dl.espressif.com/dl/esptool-fe69994-linux32.tar.gz",
109+
"archiveFileName": "esptool-fe69994-linux32.tar.gz",
110+
"checksum": "SHA-256:4912aa39b3b78fbe4f959c496e52968b207e66e92cf186ad583812526a455f48",
111+
"size": "3766885"
112+
}
113+
]
75114
}
76115
]
77116
}
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ version=0.0.1
33

44
runtime.tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32-elf
55

6-
tools.esptool.cmd=python "{runtime.platform.path}/tools/esptool.py"
7-
tools.esptool.cmd.windows=python.exe "{runtime.platform.path}/tools/esptool.py"
6+
tools.esptool.cmd="{runtime.platform.path}/tools/esptool"
7+
tools.esptool.cmd.windows="{runtime.platform.path}/tools/esptool.exe"
88

99
compiler.warning_flags=-w
1010
compiler.warning_flags.none=-w