pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-02 18:59:56 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into trying-again

Browse Source
This commit is contained in:
Ben Meadors 2022-11-05 09:33:39 -05:00
commit 3476b35fca
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main_matrix.yml vendored
View File

@ -2,14 +2,14 @@ name: CI
on: on:
# # Triggers the workflow on push but only for the master branch # # Triggers the workflow on push but only for the master branch
push: push:
branches: [master] branches: [master, develop]
paths-ignore: paths-ignore:
- "**.md" - "**.md"
- "version.properties" - "version.properties"
# Note: This is different from "pull_request". Need to specify ref when doing checkouts. # Note: This is different from "pull_request". Need to specify ref when doing checkouts.
pull_request_target: pull_request_target:
branches: [master] branches: [master, develop]
paths-ignore: paths-ignore:
- "**.md" - "**.md"
#- "**.yml" #- "**.yml"

1
src/mesh/generated/config.pb.c
View File

@ -43,3 +43,4 @@ PB_BIND(Config_BluetoothConfig, Config_BluetoothConfig, AUTO)

4
src/mesh/generated/localonly.pb.h
View File

@ -150,8 +150,8 @@ extern const pb_msgdesc_t LocalModuleConfig_msg;
#define LocalModuleConfig_fields &LocalModuleConfig_msg #define LocalModuleConfig_fields &LocalModuleConfig_msg
/* Maximum encoded size of messages (where known) */ /* Maximum encoded size of messages (where known) */
#define LocalConfig_size 363 #define LocalConfig_size 359
#define LocalModuleConfig_size 294 #define LocalModuleConfig_size 270
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */