From 7d7eacb0e4d8b813e751edb98359615fb64573b3 Mon Sep 17 00:00:00 2001
From: Sacha Weatherstone <sachaw100@hotmail.com>
Date: Wed, 10 Feb 2021 10:39:50 +1100
Subject: [PATCH 1/3] Fix formatting

---
 mesh.proto | 56 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/mesh.proto b/mesh.proto
index 832ddf6..3bf56dc 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -157,10 +157,14 @@ enum ErrorReason {
 
   TIMEOUT = 3;
 
-  /* No suitable interface could be found for delivering this packet */
+  /*
+   * No suitable interface could be found for delivering this packet
+   */
   NO_INTERFACE = 4;
 
-  /* We reached the max retransmission count (typically for naive flood routing) */
+  /*
+   * We reached the max retransmission count (typically for naive flood routing)
+   */
   MAX_RETRANSMIT = 5;
 }
 
@@ -780,9 +784,9 @@ message RadioConfig {
      */
     bool debug_log_enabled = 101;
 
-    /**
-    How our location is shared with other nodes (or the local phone)
-    */
+    /*
+     * How our location is shared with other nodes (or the local phone)
+     */
     LocationSharing location_share = 32;
 
     /*
@@ -821,11 +825,11 @@ message RadioConfig {
      */
     repeated uint32 ignore_incoming = 103;
     
-    /**
-    Preferences for the SerialPlugin
-    
-    FIXME - Move this out of UserPreferences and into a section for plugin configuration.
-    */
+    /*
+     * Preferences for the SerialPlugin
+     *
+     * FIXME - Move this out of UserPreferences and into a section for plugin configuration.
+     */
     bool serialplugin_enabled = 120;
     bool serialplugin_echo = 121;
     uint32 serialplugin_rxd = 122;
@@ -833,11 +837,11 @@ message RadioConfig {
     uint32 serialplugin_timeout = 124;
     uint32 serialplugin_mode = 125;
 
-    /**
-    Preferences for the ExternalNotificationPlugin
-    
-    FIXME - Move this out of UserPreferences and into a section for plugin configuration.
-    */
+    /*
+     * Preferences for the ExternalNotificationPlugin
+     *
+     * FIXME - Move this out of UserPreferences and into a section for plugin configuration.
+     */
     bool ext_notification_plugin_enabled = 126;
     uint32 ext_notification_plugin_output_ms = 127;
     uint32 ext_notification_plugin_output = 128;
@@ -845,20 +849,20 @@ message RadioConfig {
     bool ext_notification_plugin_alert_message = 130;
     bool ext_notification_plugin_alert_bell = 131;
 
-    /**
-    Preferences for the RangeTestPlugin
-    
-    FIXME - Move this out of UserPreferences and into a section for plugin configuration.
-    */
+    /*
+     * Preferences for the RangeTestPlugin
+     *
+     * FIXME - Move this out of UserPreferences and into a section for plugin configuration.
+     */
     bool range_test_plugin_enabled = 132;
     uint32 range_test_plugin_sender = 133;
     bool range_test_plugin_save = 134;
 
-    /**
-    Preferences for the StoreForwardPlugin
-    
-    FIXME - Move this out of UserPreferences and into a section for plugin configuration.
-    */
+    /*
+     * Preferences for the StoreForwardPlugin
+     *
+     * FIXME - Move this out of UserPreferences and into a section for plugin configuration.
+     */
     bool store_forward_plugin_enabled = 136;
     uint32 store_forward_plugin_records = 137;
   }
@@ -943,7 +947,7 @@ message NodeInfo {
   uint32 next_hop = 5;
 }
 
-/** Error codes for critical errors
+/* Error codes for critical errors
  * 
  * The device might report these fault codes on the screen.  If you encounter a fault code, please
  * post on the meshtastic.discourse.group and we'll try to help.

From 5112ecc3e15217332253f595355ea822f710bd50 Mon Sep 17 00:00:00 2001
From: Sacha Weatherstone <sachaw100@hotmail.com>
Date: Wed, 10 Feb 2021 10:43:25 +1100
Subject: [PATCH 2/3] Add vscode-proto3 extension recommendation

---
 .vscode/extensions.json | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .vscode/extensions.json

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..109ee73
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+  "recommendations": ["zxh404.vscode-proto3"]
+}

From 9306464417522aa8b25672b324a3bd5e9dec3395 Mon Sep 17 00:00:00 2001
From: Charles Crossan <crossan007@gmail.com>
Date: Sun, 21 Feb 2021 12:04:48 -0500
Subject: [PATCH 3/3] add environmental measurements

---
 environmental_measurement.proto | 9 +++++++++
 portnums.proto                  | 7 +++++++
 2 files changed, 16 insertions(+)
 create mode 100644 environmental_measurement.proto

diff --git a/environmental_measurement.proto b/environmental_measurement.proto
new file mode 100644
index 0000000..c07524e
--- /dev/null
+++ b/environmental_measurement.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+message EnvironmentalMeasurement {
+
+  float temperature = 1; 
+  float relative_humidity = 2;
+  float barometric_pressure = 3;
+
+}
\ No newline at end of file
diff --git a/portnums.proto b/portnums.proto
index 81b0a39..0438d9a 100644
--- a/portnums.proto
+++ b/portnums.proto
@@ -101,6 +101,13 @@ enum PortNum {
      */
     RANGE_TEST_APP = 66;
 
+    /*
+     * Provides a format to send and receive environmental data from the Meshtastic network.
+     *
+     * Maintained by Charles Crossan (crossan007) : crossan007@gmail.com
+     */
+     ENVIRONMENTAL_MEASUREMENT_APP = 67;
+
     /*
      * Private applications should use portnums >= 256.
      * To simplify initial development and testing you can use "PRIVATE_APP"