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

WIP: extra sensors #11

Draft
wants to merge 38 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
bbed209
first commit sensors
ArendJan Sep 8, 2023
2fbaf10
convert to cpp
ArendJan Sep 8, 2023
75c075e
cpp cleanup
ArendJan Sep 8, 2023
573fc54
Add first sensor
ArendJan Sep 12, 2023
d452db9
Fix sensors with py code
ArendJan Sep 12, 2023
62f8c63
fix pointersss
ArendJan Sep 12, 2023
5cb7f5e
move to src folder
ArendJan Sep 12, 2023
0d0f1f7
start veml
ArendJan Sep 12, 2023
3be3f19
Add veml
ArendJan Sep 12, 2023
456d2c5
Add i2c port
ArendJan Sep 12, 2023
a09ec08
Done veml
ArendJan Sep 12, 2023
b71b021
Add VL53L0
ArendJan Sep 12, 2023
79648ea
Add mpu9250
ArendJan Sep 13, 2023
3a1cf8d
add hx711
ArendJan Sep 13, 2023
2839ea9
fix hx711
Sep 13, 2023
d61926a
add gps
ArendJan Sep 13, 2023
0914a12
gps done!
Sep 13, 2023
519580f
start ping
Sep 13, 2023
bda6dae
fix ping
Sep 13, 2023
2ffc6e0
VL check
ArendJan Sep 18, 2023
346eb30
Add tof sensor timeout check
ArendJan Sep 21, 2023
2c460b5
Fix digitalread not always sending a message from setup
ArendJan Oct 9, 2023
bf238f5
Add building of uf2 to pipeline
ArendJan Oct 9, 2023
5bebfba
Test push
ArendJan Oct 9, 2023
3c44fba
Update components
ArendJan Oct 9, 2023
e410587
Remove extra build
ArendJan Oct 9, 2023
93728e5
dont rm build folder
ArendJan Oct 9, 2023
2bd41d8
change app_name
ArendJan Oct 9, 2023
ebc9ae0
Fix app_name
ArendJan Oct 9, 2023
030a5ae
Release test
ArendJan Oct 9, 2023
15eaad4
Remove edit from other branch
ArendJan Oct 9, 2023
ec544e2
Remove edit from other branch
ArendJan Oct 9, 2023
6817d3e
Merge branch 'create-and-publish-uf2' of https://github.com/arendjan/…
ArendJan Oct 9, 2023
8485e82
Merge pull request #12 from ArendJan/25-mirteget_pin_value-never-retu…
mklomp Oct 10, 2023
c2b3bda
Merge pull request #13 from ArendJan/create-and-publish-uf2
mklomp Oct 10, 2023
1c58d8b
Merge branch 'master' of https://github.com/arendjan/Telemetrix4RpiPi…
ArendJan Oct 11, 2023
0e36e2a
Fix wrong pull-request
ArendJan Oct 11, 2023
b1155a3
Merge branch 'master' of https://github.com/arendjan/Telemetrix4RpiPi…
ArendJan Oct 11, 2023
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
63 changes: 63 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Deploy new version

# Only deploy when a new tag is pushed
on: [push, pull_request]

# Must match the project() name in CMakeLists.txt
env:
APP_NAME: Telemetrix4RpiPico

# Allow this workflow to write back to the repository
permissions:
contents: write

# Build binary and send to releases
jobs:
build-deploy:
runs-on: ubuntu-latest
name: Build and deploy
steps:

- name: Check out this repository
uses: actions/checkout@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1

- name: Cache register
uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}

- name: Build Docker image
uses: docker/build-push-action@v5
with:
context: ./
file: ./Dockerfile
builder: ${{ steps.buildx.outputs.name }}
load: true
tags: pico-builder-container:latest
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache

- name: Build
run: docker run -v ./:/project/src/ pico-builder-container

- name: Copy uf2 file
run: cp ./build2/Telemetrix4RpiPico.uf2 ./

- name: Put environment variable into the env context
run: echo "app_name=$APP_NAME" >> $GITHUB_ENV
- name: Archive production artifacts
uses: actions/upload-artifact@v3
with:
name: dist
path: |
Telemetrix4RpiPico.uf2

- name: Push to release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: Telemetrix4RpiPico.uf2
10 changes: 7 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ include(pico_sdk_import.cmake)
project(Telemetrix4RpiPico)
pico_sdk_init()
add_executable(Telemetrix4RpiPico
Telemetrix4RpiPico.c
src/Telemetrix4RpiPico.cpp
src/VL53L0.cpp
src/i2c_helpers.cpp
src/HX711.cpp
)

pico_generate_pio_header(Telemetrix4RpiPico ${CMAKE_CURRENT_LIST_DIR}/Telemetrix4RpiPico.pio)
target_include_directories(Telemetrix4RpiPico PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include/)
# target_compile_options(Telemetrix4RpiPico PRIVATE -Wall -Wextra -Wpedantic -Werror)
pico_generate_pio_header(Telemetrix4RpiPico ${CMAKE_CURRENT_LIST_DIR}/src/Telemetrix4RpiPico.pio)
pico_enable_stdio_usb(Telemetrix4RpiPico 1)
pico_enable_stdio_uart(Telemetrix4RpiPico 1)
pico_add_extra_outputs(Telemetrix4RpiPico)
Expand Down
33 changes: 33 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Fetch ubuntu image
FROM ubuntu:22.04

# Install prerequisites
RUN \
apt update && \
apt install -y git python3 && \
apt install -y cmake gcc-arm-none-eabi libnewlib-arm-none-eabi build-essential

# Install Pico SDK
RUN \
mkdir -p /project/src/ && \
cd /project/ && \
git clone https://github.com/raspberrypi/pico-sdk.git --branch master && \
cd pico-sdk/ && \
git submodule update --init && \
cd /

# Set the Pico SDK environment variable
ENV PICO_SDK_PATH=/project/pico-sdk/

# Copy in our source files
COPY build.sh /root/
RUN chmod +x /root/build.sh
# Build project
# RUN \
# mkdir -p /project/src/build && \
# cd /project/src/build && \
# cmake .. && \
# make

# Command that will be invoked when the container starts
ENTRYPOINT ["/root/build.sh"]
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ PC. A complete [User's Guide](https://mryslab.github.io/telemetrix-rpi-pico/) is
install and use both the server and client.

To install the server, follow these [installation instructions](https://mryslab.github.io/telemetrix-rpi-pico/install_pico_server/).

Test push
Loading
Loading