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

Add paxcounter protobuf and config #414

Merged
merged 1 commit into from
Dec 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion meshtastic/admin.options
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*AdminMessage.set_ringtone_message max_size:231
*AdminMessage.get_ringtone_response max_size:231


*HamParameters.call_sign max_size:8
*HamParameters.short_name max_size:6
*NodeRemoteHardwarePinsResponse.node_remote_hardware_pins max_count:16
5 changes: 5 additions & 0 deletions meshtastic/admin.proto
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ message AdminMessage {
* TODO: REPLACE
*/
DETECTIONSENSOR_CONFIG = 11;

/*
* TODO: REPLACE
*/
PAXCOUNTER_CONFIG = 12;
}

/*
Expand Down
5 changes: 5 additions & 0 deletions meshtastic/localonly.proto
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ message LocalModuleConfig {
*/
ModuleConfig.DetectionSensorConfig detection_sensor = 13;

/*
* Paxcounter Config
*/
ModuleConfig.PaxcounterConfig paxcounter = 14;

/*
* A version integer used to invalidate old save files when we make
* incompatible changes This integer is set at build time and is private to
Expand Down
22 changes: 22 additions & 0 deletions meshtastic/module_config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,23 @@ message ModuleConfig {
uint32 i2s_sck = 7;
}

/*
* Config for the Paxcounter Module
*/
message PaxcounterConfig {
/*
* Enable the Paxcounter Module
*/
bool enabled = 1;

/*
* Interval in seconds of how often we should try to send our
* metrics to the mesh
*/

uint32 paxcounter_update_interval = 2;
}

/*
* Serial Config
*/
Expand Down Expand Up @@ -713,6 +730,11 @@ message ModuleConfig {
* TODO: REPLACE
*/
DetectionSensorConfig detection_sensor = 12;

/*
* TODO: REPLACE
*/
PaxcounterConfig paxcounter = 13;
}
}

Expand Down
29 changes: 29 additions & 0 deletions meshtastic/paxcount.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
syntax = "proto3";

package meshtastic;

option csharp_namespace = "Meshtastic.Protobufs";
option go_package = "github.com/meshtastic/go/generated";
option java_outer_classname = "PaxcountProtos";
option java_package = "com.geeksville.mesh";
option swift_prefix = "";

/*
* TODO: REPLACE
*/
message Paxcount {
/*
* seen Wifi devices
*/
uint32 wifi = 1;

/*
* Seen BLE devices
*/
uint32 ble = 2;

/*
* Uptime in seconds
*/
uint32 uptime = 3;
}
6 changes: 6 additions & 0 deletions meshtastic/portnums.proto
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ enum PortNum {
*/
IP_TUNNEL_APP = 33;

/*
* Paxcounter lib included in the firmware
* ENCODING: protobuf
*/
PAXCOUNTER_APP = 34;

/*
* Provides a hardware serial interface to send and receive from the Meshtastic network.
* Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic
Expand Down