Skip to content

Fixes problems with build #781

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.

Sign up for GitHub

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

Open
Shin-nn wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −9
Open

Fixes problems with build #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .github/workflows/build-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ name: Build Nightly
jobs:
build:
runs-on: ubuntu-latest
env:
HAS_UPLOAD_SECRETS: ${{ secrets.UPDATE_SERVER_HOST != '' && secrets.UPDATE_SERVER_API_KEY != '' }}
steps:
- name: Checkout repo
uses: actions/checkout@v3
Expand Down Expand Up @@ -54,6 +56,7 @@ jobs:
cp .pio/build/controller/partitions.bin upload/controller/partitions.bin
cp .pio/build/controller/bootloader.bin upload/controller/bootloader.bin
- uses: ./.github/actions/upload-firmware
if: env.HAS_UPLOAD_SECRETS == 'true'
env:
UPDATE_SERVER_HOST: ${{ secrets.UPDATE_SERVER_HOST }}
UPDATE_SERVER_API_KEY: ${{ secrets.UPDATE_SERVER_API_KEY }}
Expand All @@ -79,6 +82,7 @@ jobs:
cp .pio/build/display/partitions.bin upload/display/partitions.bin
cp .pio/build/display/bootloader.bin upload/display/bootloader.bin
- uses: ./.github/actions/upload-firmware
if: env.HAS_UPLOAD_SECRETS == 'true'
env:
UPDATE_SERVER_HOST: ${{ secrets.UPDATE_SERVER_HOST }}
UPDATE_SERVER_API_KEY: ${{ secrets.UPDATE_SERVER_API_KEY }}
Expand All @@ -98,6 +102,7 @@ jobs:
cp .pio/build/display-headless/partitions.bin upload/headless/partitions.bin
cp .pio/build/display-headless/bootloader.bin upload/headless/bootloader.bin
- uses: ./.github/actions/upload-firmware
if: env.HAS_UPLOAD_SECRETS == 'true'
env:
UPDATE_SERVER_HOST: ${{ secrets.UPDATE_SERVER_HOST }}
UPDATE_SERVER_API_KEY: ${{ secrets.UPDATE_SERVER_API_KEY }}
Expand Down
23 changes: 14 additions & 9 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ name: Build
jobs:
build:
runs-on: ubuntu-latest
env:
HAS_UPLOAD_SECRETS: ${{ secrets.UPDATE_SERVER_HOST != '' && secrets.UPDATE_SERVER_API_KEY != '' }}
steps:
- name: Checkout repo
uses: actions/checkout@v3
Expand Down Expand Up @@ -44,13 +46,14 @@ jobs:
- name: Build controller
run: |
pio run -e controller
mv .pio/build/controller/firmware.bin out/board-firmware.bin
mv .pio/build/controller/partitions.bin out/board-partitions.bin
mv .pio/build/controller/bootloader.bin out/board-bootloader.bin
cp .pio/build/controller/firmware.bin out/board-firmware.bin
cp .pio/build/controller/partitions.bin out/board-partitions.bin
cp .pio/build/controller/bootloader.bin out/board-bootloader.bin
cp .pio/build/controller/firmware.bin upload/controller/firmware.bin
cp .pio/build/controller/partitions.bin upload/controller/partitions.bin
cp .pio/build/controller/bootloader.bin upload/controller/bootloader.bin
- uses: ./.github/actions/upload-firmware
if: env.HAS_UPLOAD_SECRETS == 'true'
env:
UPDATE_SERVER_HOST: ${{ secrets.UPDATE_SERVER_HOST }}
UPDATE_SERVER_API_KEY: ${{ secrets.UPDATE_SERVER_API_KEY }}
Expand All @@ -68,13 +71,14 @@ jobs:
- name: Build display
run: |
pio run -e display
mv .pio/build/display/firmware.bin out/display-firmware.bin
mv .pio/build/display/partitions.bin out/display-partitions.bin
mv .pio/build/display/bootloader.bin out/display-bootloader.bin
cp .pio/build/display/firmware.bin out/display-firmware.bin
cp .pio/build/display/partitions.bin out/display-partitions.bin
cp .pio/build/display/bootloader.bin out/display-bootloader.bin
cp .pio/build/display/firmware.bin upload/display/firmware.bin
cp .pio/build/display/partitions.bin upload/display/partitions.bin
cp .pio/build/display/bootloader.bin upload/display/bootloader.bin
- uses: ./.github/actions/upload-firmware
if: env.HAS_UPLOAD_SECRETS == 'true'
env:
UPDATE_SERVER_HOST: ${{ secrets.UPDATE_SERVER_HOST }}
UPDATE_SERVER_API_KEY: ${{ secrets.UPDATE_SERVER_API_KEY }}
Expand All @@ -86,13 +90,14 @@ jobs:
- name: Build headless
run: |
pio run -e display-headless
mv .pio/build/display-headless/firmware.bin out/display-headless-firmware.bin
mv .pio/build/display-headless/partitions.bin out/display-headless-partitions.bin
mv .pio/build/display-headless/bootloader.bin out/display-headless-bootloader.bin
cp .pio/build/display-headless/firmware.bin out/display-headless-firmware.bin
cp .pio/build/display-headless/partitions.bin out/display-headless-partitions.bin
cp .pio/build/display-headless/bootloader.bin out/display-headless-bootloader.bin
cp .pio/build/display-headless/firmware.bin upload/headless/firmware.bin
cp .pio/build/display-headless/partitions.bin upload/headless/partitions.bin
cp .pio/build/display-headless/bootloader.bin upload/headless/bootloader.bin
- uses: ./.github/actions/upload-firmware
if: env.HAS_UPLOAD_SECRETS == 'true'
env:
UPDATE_SERVER_HOST: ${{ secrets.UPDATE_SERVER_HOST }}
UPDATE_SERVER_API_KEY: ${{ secrets.UPDATE_SERVER_API_KEY }}
Expand Down
2 changes: 2 additions & 0 deletions sim/platform/arduino/Print.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
#include <stdlib.h>
#include <string.h>

#include <stdarg.h>

#include "Print.h"
extern "C" {
#include "time.h"
Expand Down
2 changes: 2 additions & 0 deletions src/display/core/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#define UTILS_H
#include <Arduino.h>
#include <memory>
#include <stdexcept>


template <typename T, typename... Args> std::unique_ptr<T> make_unique(Args &&...args) {
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
Expand Down
2 changes: 2 additions & 0 deletions src/display/plugins/BLEScalePlugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include "remote_scales.h"
#include "remote_scales_plugin_registry.h"

#include <memory>

void on_ble_measurement(float value);

constexpr unsigned long UPDATE_INTERVAL_MS = 1000;
Expand Down