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: diff --git a/.github/workflows/update_protobufs.yml b/.github/workflows/update_protobufs.yml index 23eae2c12..8debfcd10 100644 --- a/.github/workflows/update_protobufs.yml +++ b/.github/workflows/update_protobufs.yml @@ -11,9 +11,8 @@ jobs: with: submodules: true - - name: Update Submodule + - name: Update submodule run: | - git pull --recurse-submodules git submodule update --remote proto - name: Download nanopb @@ -26,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 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 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" */ 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