Merge pull request #247 from meshtastic/develop

Develop to Master

config.proto

@@ -664,6 +664,13 @@ message Config {
      */
     uint32 channel_num = 11;
 
+    /*
+     * If true, duty cycle limits will be exceeded and thus you're possibly not following 
+     * the local regulations if you're not a HAM.
+     * Has no effect if the duty cycle of the used region is 100%. 
+    */
+    bool override_duty_cycle = 12; 
+
     /*
      * For testing it is useful sometimes to force a node to never listen to
      * particular other nodes (simulating radio out of range). All nodenums listed

mesh.proto

@@ -504,6 +504,11 @@ message Routing {
      */
     NO_RESPONSE = 8;
 
+    /*
+     * Cannot send currently because duty cycle regulations will be violated.
+     */
+    DUTY_CYCLE_LIMIT = 9; 
+
     /*
      * The application layer service on the remote node received your request, but considered your request somehow invalid
      */

module_config.options

@@ -4,3 +4,9 @@
 *MQTTConfig.address max_size:32
 *MQTTConfig.username max_size:64
 *MQTTConfig.password max_size:64
+
+*AudioConfig.ptt_pin int_size:8
+*AudioConfig.i2s_ws int_size:8
+*AudioConfig.i2s_sd int_size:8
+*AudioConfig.i2s_din int_size:8
+*AudioConfig.i2s_sck int_size:8

module_config.proto

@@ -80,25 +80,35 @@ message ModuleConfig {
      */
     bool codec2_enabled = 1;
 
-    /*
-     * ADC where Microphone is connected
-     */
-    uint32 mic_chan = 2;
-
-    /*
-     * DAC where Speaker is connected
-     */
-    uint32 amp_pin = 3;
-
     /*
      * PTT Pin
      */
-    uint32 ptt_pin = 4;
+    uint32 ptt_pin = 2;
 
     /*
      * The audio sample rate to use for codec2
      */
-    Audio_Baud bitrate = 5;
+    Audio_Baud bitrate = 3;
+
+    /*
+     * I2S Word Select
+     */
+    uint32 i2s_ws = 4;
+
+    /*
+     * I2S Data IN
+     */
+    uint32 i2s_sd = 5;
+
+    /*
+     * I2S Data OUT
+     */
+    uint32 i2s_din = 6;
+
+    /*
+     * I2S Clock
+     */
+    uint32 i2s_sck = 7;
   }
 
   /*

portnums.proto

@@ -133,6 +133,12 @@ enum PortNum {
    */
   SIMULATOR_APP = 69;
 
+  /*
+   * Provides a traceroute functionality to show the route a packet towards
+   * a certain destination would take on the mesh.
+   */
+  TRACEROUTE_APP = 70;
+
   /*
    * Private applications should use portnums >= 256.
    * To simplify initial development and testing you can use "PRIVATE_APP"