From f4d3de086a8edc29b827ba5364dd44e0a31c71d1 Mon Sep 17 00:00:00 2001 From: Vladislav Osmanov <7123463+osmanovv@users.noreply.github.com> Date: Thu, 27 Jan 2022 16:49:55 +0300 Subject: [PATCH 1/6] Fix MISO/MOSI pins for DIY v1.1 --- variants/diy/v1_1/variant.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/variants/diy/v1_1/variant.h b/variants/diy/v1_1/variant.h index 69780219b..d5d6f238c 100644 --- a/variants/diy/v1_1/variant.h +++ b/variants/diy/v1_1/variant.h @@ -25,9 +25,9 @@ #undef RF95_SCK #define RF95_SCK 18 #undef RF95_MISO -#define RF95_MISO 23 +#define RF95_MISO 19 #undef RF95_MOSI -#define RF95_MOSI 19 +#define RF95_MOSI 23 #undef RF95_NSS #define RF95_NSS 5 @@ -54,4 +54,4 @@ // Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch // (which is the default for the sx1262interface code) #define SX126X_E22 -#endif \ No newline at end of file +#endif From a61676504fdf793446876d25a718e5aebb83ad70 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 27 Jan 2022 07:51:51 -0600 Subject: [PATCH 2/6] Attempt to only update proto (#1153) --- .github/workflows/update_protobufs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/update_protobufs.yml b/.github/workflows/update_protobufs.yml index 23eae2c12..d33115959 100644 --- a/.github/workflows/update_protobufs.yml +++ b/.github/workflows/update_protobufs.yml @@ -13,7 +13,6 @@ jobs: - name: Update Submodule run: | - git pull --recurse-submodules git submodule update --remote proto - name: Download nanopb From 1bfa6839e2630dba750e4faabe429509005caa02 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 27 Jan 2022 08:57:49 -0600 Subject: [PATCH 3/6] Use correct path to mesh (#1155) --- .github/workflows/update_protobufs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_protobufs.yml b/.github/workflows/update_protobufs.yml index d33115959..5af061e96 100644 --- a/.github/workflows/update_protobufs.yml +++ b/.github/workflows/update_protobufs.yml @@ -31,5 +31,5 @@ jobs: git config --global user.email 'bot@noreply.github.com' git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} git add proto - git add mesh + git add src/mesh git commit -m "Update protobuf submodule" && git push || echo "No changes to commit" From 14419cbd029a281926c7190f4072e477c301b657 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 27 Jan 2022 11:54:32 -0600 Subject: [PATCH 4/6] Create pr instead of commit --- .github/workflows/update_protobufs.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/update_protobufs.yml b/.github/workflows/update_protobufs.yml index 5af061e96..8debfcd10 100644 --- a/.github/workflows/update_protobufs.yml +++ b/.github/workflows/update_protobufs.yml @@ -11,7 +11,7 @@ jobs: with: submodules: true - - name: Update Submodule + - name: Update submodule run: | git submodule update --remote proto @@ -25,11 +25,9 @@ jobs: run: | ./bin/regen-protos.sh - - name: Commit update - run: | - git config --global user.name 'github-actions' - git config --global user.email 'bot@noreply.github.com' - git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} - git add proto - git add src/mesh - git commit -m "Update protobuf submodule" && git push || echo "No changes to commit" + - name: Create pull request + uses: peter-evans/create-pull-request@v3 + with: + add-paths: | + proto + src/mesh From 2c9902003740c034fada208b8fca1b8a71ab683a Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 27 Jan 2022 11:59:08 -0600 Subject: [PATCH 5/6] Ignore markdown and yml for continuous integration --- .github/workflows/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 98a563b94..3a2c41c17 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,9 +3,14 @@ on: # Triggers the workflow on push or pull request events but only for the master branch push: branches: [ master ] + paths-ignore: + - '**.md' + - '**.yml' pull_request: branches: [ master ] - + paths-ignore: + - '**.md' + - '**.yml' jobs: ci-check: From aea6675e64fcdc6ae063fd9f68c6d005c77cf40d Mon Sep 17 00:00:00 2001 From: mkinney Date: Thu, 27 Jan 2022 18:32:55 +0000 Subject: [PATCH 6/6] [create-pull-request] automated change --- proto | 2 +- .../generated/environmental_measurement.pb.h | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/proto b/proto index 785fb20a0..a9bba331e 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 785fb20a0da03705220fbb8292442c175b902164 +Subproject commit a9bba331e69b16ba7cd9b35d19b11732eff8d1b5 diff --git a/src/mesh/generated/environmental_measurement.pb.h b/src/mesh/generated/environmental_measurement.pb.h index 8adf5774a..aaaedf644 100644 --- a/src/mesh/generated/environmental_measurement.pb.h +++ b/src/mesh/generated/environmental_measurement.pb.h @@ -14,6 +14,9 @@ typedef struct _EnvironmentalMeasurement { float temperature; float relative_humidity; float barometric_pressure; + float gas_resistance; + float voltage; + float current; } EnvironmentalMeasurement; @@ -22,19 +25,25 @@ extern "C" { #endif /* Initializer values for message structs */ -#define EnvironmentalMeasurement_init_default {0, 0, 0} -#define EnvironmentalMeasurement_init_zero {0, 0, 0} +#define EnvironmentalMeasurement_init_default {0, 0, 0, 0, 0, 0} +#define EnvironmentalMeasurement_init_zero {0, 0, 0, 0, 0, 0} /* Field tags (for use in manual encoding/decoding) */ #define EnvironmentalMeasurement_temperature_tag 1 #define EnvironmentalMeasurement_relative_humidity_tag 2 #define EnvironmentalMeasurement_barometric_pressure_tag 3 +#define EnvironmentalMeasurement_gas_resistance_tag 4 +#define EnvironmentalMeasurement_voltage_tag 5 +#define EnvironmentalMeasurement_current_tag 6 /* Struct field encoding specification for nanopb */ #define EnvironmentalMeasurement_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, FLOAT, temperature, 1) \ X(a, STATIC, SINGULAR, FLOAT, relative_humidity, 2) \ -X(a, STATIC, SINGULAR, FLOAT, barometric_pressure, 3) +X(a, STATIC, SINGULAR, FLOAT, barometric_pressure, 3) \ +X(a, STATIC, SINGULAR, FLOAT, gas_resistance, 4) \ +X(a, STATIC, SINGULAR, FLOAT, voltage, 5) \ +X(a, STATIC, SINGULAR, FLOAT, current, 6) #define EnvironmentalMeasurement_CALLBACK NULL #define EnvironmentalMeasurement_DEFAULT NULL @@ -44,7 +53,7 @@ extern const pb_msgdesc_t EnvironmentalMeasurement_msg; #define EnvironmentalMeasurement_fields &EnvironmentalMeasurement_msg /* Maximum encoded size of messages (where known) */ -#define EnvironmentalMeasurement_size 15 +#define EnvironmentalMeasurement_size 30 #ifdef __cplusplus } /* extern "C" */