Skip to content

Commit

Permalink
Merge pull request #111 from rtlopez/master
Browse files Browse the repository at this point in the history
refresh develop
  • Loading branch information
rtlopez authored Jan 30, 2024
2 parents 9e37911 + c77dc04 commit 683c99f
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 15 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/platformio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ jobs:
test:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Cache pip
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install Dependencies
Expand All @@ -40,9 +40,9 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
target: ['esp32', 'esp32c3', 'esp8266', 'rp2040']
target: ['esp32', 'esp32c3', 'esp8266']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Extract Version
run: |
echo "build_name=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
Expand All @@ -62,19 +62,19 @@ jobs:
echo DEVEL: ${{ env.build_file_devel }}
echo RELEASE: ${{ env.build_file_release }}
- name: Cache pip
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install Dependencies
Expand All @@ -91,7 +91,7 @@ jobs:
PLATFORMIO_BUILD_FLAGS: -DESPFC_REVISION=${{ env.build_sha }}

- name: Build Release Target
if: "startsWith(github.ref, 'refs/tags/')"
if: ${{ startsWith(github.ref, 'refs/tags/') }}
run: |
platformio run -e ${{ matrix.target }}
env:
Expand All @@ -104,29 +104,29 @@ jobs:
- name: Create Development Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
with:
name: ${{ env.build_file_devel }}.bin
path: .pio/build/${{ matrix.target }}/firmware.bin

- name: Create Development Artifact Merged
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ !startsWith(github.ref, 'refs/tags/') && startsWith(matrix.target, 'esp32') }}
with:
name: "${{ env.build_file_devel }}_0x00.bin"
path: .pio/build/${{ matrix.target }}/firmware_merged.bin


- name: Create Release Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ startsWith(github.ref, 'refs/tags/') }}
with:
name: ${{ env.build_file_release }}.bin
path: .pio/build/${{ matrix.target }}/firmware.bin

- name: Create Release Artifact Merged
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ startsWith(github.ref, 'refs/tags/') && startsWith(matrix.target, 'esp32') }}
with:
name: ${{ env.build_file_release }}_0x00.bin
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ The mini, DIY, ~$5 cost, ESP8266/ESP32 based, high performance flight controller

## Features
* Frames (Quad X)
* Betaflight contiguration tool compatible (v10.8 or v10.9)
* Betaflight configuration tool compatible (v10.8 or v10.9)
* Receiver protocol (8 channel PPM)
* SBUS and CRSF Serial Rx protocols on ESP32 and RP2040
* ESC protocols (PWM, Oneshot125, Brushed, Dshot150, Dshot300, Dshot600)
Expand Down
Binary file added docs/esp-fc-esp32-i2c.fzz
Binary file not shown.
Binary file not shown.
Binary file added docs/esp-fc-esp8266-i2c.fzz
Binary file not shown.
Binary file removed docs/espfc_wemos_d1_mini.fzz
Binary file not shown.
Binary file modified docs/images/esp-fc-esp32_i2c_wiring.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/esp-fc-esp32_spi_wiring.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions docs/wiring.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ ESP32 mcu allows to remap pins, so the wiring is not final and can remap intputs

![ESP-FC ESP32 SPI Wiring](./images/esp-fc-esp32_spi_wiring.png)

**SPI pins**

| PIN | Name | Module Names |
|----:|------|-----------------|
| 18 | SCK | SCK / SCL |
| 19 | MISO | SDA / SDI |
| 23 | MOSI | SAO / SDO / ADO |

### ESP32 I2C MPU-6050 gyro

![ESP-FC ESP32 I2C Wiring](./images/esp-fc-esp32_i2c_wiring.png)
Expand Down

0 comments on commit 683c99f

Please sign in to comment.