Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Devel #18

Merged
merged 14 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .github/workflows/devel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Devel

on:
pull_request:
branches:
- devel
paths-ignore:
- '**/README.md'

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
max-parallel: 1
matrix:
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v3
with:
path: |
~/.cache/pip
~/.platformio/.cache
key: ${{ runner.os }}-pio
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U platformio
pio pkg update
- name: PlatformIO Build Test
run: |
pio run -e freenove-tank
19 changes: 12 additions & 7 deletions .github/workflows/platformio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,23 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
max-parallel: 1
matrix:
python-version: [3.7]
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
- uses: actions/checkout@v4
- uses: actions/cache@v3
with:
python-version: ${{ matrix.python-version }}
path: |
~/.cache/pip
~/.platformio/.cache
key: ${{ runner.os }}-pio
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand All @@ -34,4 +40,3 @@ jobs:
- name: PlatformIO Build Test
run: |
pio run

33 changes: 33 additions & 0 deletions .github/workflows/schedule.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Scheduled

on:
schedule:
¦ - cron: '30 10 * * 4'

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
max-parallel: 1
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v3
with:
path: |
~/.cache/pip
~/.platformio/.cache
key: ${{ runner.os }}-pio
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U platformio
pio pkg update
- name: PlatformIO Build Test
run: |
pio run
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ hpsaturn/EspNowCam@^0.1.6
Or via command line:

```python
pio pkg install --library "hpsaturn/ESPNowCam@^0.1.6"
pio pkg install --library "hpsaturn/ESPNowCam@^0.1.7"
```

**Arduino IDE**:
Expand Down
2 changes: 1 addition & 1 deletion examples/freenove-basic-sender/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ board_build.partitions = ../../config/partitions.csv
extends = esp32common
board_build.arduino.memory_type = dio_opi ;
lib_deps =
hpsaturn/EspNowCam@^0.1.0
hpsaturn/EspNowCam@^0.1.6
2 changes: 1 addition & 1 deletion examples/freenove-hvga-sender/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ board_build.partitions = ../../config/partitions.csv
extends = esp32common
board_build.arduino.memory_type = dio_opi ;
lib_deps =
hpsaturn/EspNowCam@^0.1.0
hpsaturn/EspNowCam@^0.1.6
2 changes: 1 addition & 1 deletion examples/m5core2-basic-receiver/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ build_flags =
extends = env
board = esp32dev
lib_deps =
hpsaturn/EspNowCam@^0.1.0
hpsaturn/EspNowCam@^0.1.6
m5stack/M5Unified@^0.1.6

2 changes: 1 addition & 1 deletion examples/makerfabs-basic-receiver/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ board_build.partitions = ../../config/partitions.csv
[env:makerfabs-basic-receiver]
extends = esp32common
lib_deps =
hpsaturn/EspNowCam@^0.1.0
hpsaturn/EspNowCam@^0.1.6
lovyan03/LovyanGFX@^1.1.5

2 changes: 1 addition & 1 deletion examples/makerfabs-nojpg-receiver/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ board_build.partitions = ../../config/partitions.csv
[env:makerfabs-basic-receiver]
extends = esp32common
lib_deps =
hpsaturn/EspNowCam@^0.1.0
hpsaturn/EspNowCam@^0.1.6
lovyan03/LovyanGFX@^1.1.5

2 changes: 1 addition & 1 deletion examples/tft-3.5-basic-receiver/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ board_build.partitions = ../../config/partitions.csv
[env:tft-hvga-basic-receiver]
extends = esp32common
lib_deps =
hpsaturn/EspNowCam@^0.1.2
hpsaturn/EspNowCam@^0.1.6
lovyan03/LovyanGFX@^1.1.5

3 changes: 2 additions & 1 deletion examples/xiao-espnow-sender/xiao-espnow-sender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void processFrame() {
void setup() {
Serial.begin(115200);

delay(5000);
delay(5000); // only for debugging

if(psramFound()){
size_t psram_size = esp_spiram_get_size() / 1048576;
Expand All @@ -38,6 +38,7 @@ void setup() {
radio.init();
if (!Camera.begin()) {
Serial.println("Camera Init Fail");
delay(1000);
ESP.restart();
}
delay(500);
Expand Down
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "EspNowCam",
"version": "0.1.6",
"version": "0.1.7",
"homepage":"https://github.com/hpsaturn/esp32s3-cam",
"keywords":
[
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=EspNowCam
version=0.1.6
version=0.1.7
author=@hpsaturn
maintainer=Antonio Vanegas <[email protected]>
sentence=ESPNowCam, a straightforward video streamer for popular ESP32Cam models, leveraging the ESPNow protocol. No need for IPs, routers, or credentials—keeping it simple! :D
Expand Down
1 change: 1 addition & 0 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ board_build.partitions = ./config/partitions.csv
[env:xiao-espnow-sender]
extends = esp32common
board_build.arduino.memory_type = dio_opi ;
board_build.flash_size = 8MB
build_src_filter = -<*> -<*common*> +<xiao-espnow-sender/>
build_flags =
${env.build_flags}
Expand Down
6 changes: 5 additions & 1 deletion prebuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@

import os
import os.path
import shutil

example_lib_dir = "examples/espcamlib"
dst = "examples/espcamlib/src"
src = "../../src"
lib = "src"

os.makedirs(example_lib_dir, 0o755, True)

if not os.path.exists(dst) and os.name != 'nt':
os.symlink(src, dst)
print("Symbolic link created successfully")

elif not os.path.exists(dst) and os.name == 'nt':
shutil.copytree(lib, dst)
print("Source lib for examples created successfully")
4 changes: 2 additions & 2 deletions src/ESPNowCam.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ extern "C" {
typedef void (*RecvCb)(uint32_t lenght);
}

#define CSL_VERSION "0.1.6"
#define CSL_REVISION 071
#define CSL_VERSION "0.1.7"
#define CSL_REVISION 072

class ESPNowCam {
private:
Expand Down
1 change: 0 additions & 1 deletion src/drivers/CamXiao.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ static camera_config_t camera_config = {
.fb_count = 2,
.fb_location = CAMERA_FB_IN_PSRAM,
.grab_mode = CAMERA_GRAB_WHEN_EMPTY,
.sccb_i2c_port = 0
};

bool CamXiao::begin() {
Expand Down
Loading