Merge pull request #259 from meshtastic/next-batch

Next batch

admin.options

@@ -2,3 +2,6 @@
 
 *AdminMessage.set_canned_message_module_messages max_size:201
 *AdminMessage.get_canned_message_module_messages_response max_size:201
+
+*AdminMessage.set_ringtone_message max_size:231
+*AdminMessage.get_ringtone_response max_size:231

admin.proto

@@ -105,6 +105,11 @@ message AdminMessage {
      * TODO: REPLACE
      */
     AUDIO_CONFIG = 7;
+
+    /*
+     * TODO: REPLACE
+     */
+    REMOTEHARDWARE_CONFIG = 8;
   }
 
   /*
@@ -173,6 +178,16 @@ message AdminMessage {
       */
     DeviceMetadata get_device_metadata_response = 13;
 
+    /*
+     * Get the Ringtone in the response to this message.
+     */
+    bool get_ringtone_request = 14;
+
+    /*
+     * Get the Ringtone in the response to this message.
+     */
+    string get_ringtone_response = 15;
+
     /*
      * Set the owner for this node
      */
@@ -202,6 +217,11 @@ message AdminMessage {
      */
     string set_canned_message_module_messages = 36;
 
+    /*
+     * Set the ringtone for ExternalNotification.
+     */
+    string set_ringtone_message = 37;
+
     /*
      * Begins an edit transaction for config, module config, owner, and channel settings changes
      * This will delay the standard *implicit* save to the file system and subsequent reboot behavior until committed (commit_edit_settings)

config.proto

@@ -466,6 +466,37 @@ message Config {
      * Override auto-detect in screen
      */
     OledType oled = 7;
+
+    enum DisplayMode {
+      /*
+       * Default. The old style for the 128x64 OLED screen
+       */
+      DEFAULT = 0;
+      
+      /*
+       * Rearrange display elements to cater for bicolor OLED displays
+       */
+      TWOCOLOR = 1;
+      
+      /*
+       * Same as TwoColor, but with inverted top bar. Not so good for Epaper displays
+       */
+      INVERTED = 2;
+
+      /*
+       * TFT Full Color Displays (not implemented yet)
+       */
+      COLOR = 3;
+    }
+    /*
+     * Display Mode
+     */
+    DisplayMode displaymode = 8;
+
+    /*
+     * Print first line in pseudo-bold? FALSE is original style, TRUE is bold
+     */
+    bool heading_bold = 9;
   }
 
   /*

localonly.proto

@@ -100,6 +100,11 @@ message LocalModuleConfig {
    */
   ModuleConfig.AudioConfig audio = 9;
 
+  /*
+   * The part of the config that is specific to the Remote Hardware module
+   */
+  ModuleConfig.RemoteHardwareConfig remote_hardware = 10;
+
   /*
    * 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

module_config.proto

@@ -56,6 +56,17 @@ message ModuleConfig {
     bool json_enabled = 6;
   }
 
+  /*
+   * RemoteHardwareModule Config
+   */
+  message RemoteHardwareConfig {
+
+    /*
+     * Whether the Module is enabled
+     */
+    bool enabled = 1;
+  }
+
   /*
    * Audio Config for codec2 voice
    */
@@ -516,5 +527,10 @@ message ModuleConfig {
      */
     AudioConfig audio = 8;
 
+    /*
+     * TODO: REPLACE
+     */
+    RemoteHardwareConfig remote_hardware = 9;
+
   }
 }

rtttl.options

@@ -0,0 +1 @@
+*RTTTLConfig.ringtone max_size:230

rtttl.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "com.geeksville.mesh";
+option java_outer_classname = "RTTTLConfigProtos";
+option optimize_for = LITE_RUNTIME;
+option go_package = "github.com/meshtastic/go/generated";
+option csharp_namespace = "Meshtastic.Protobufs";
+
+/*
+ * Canned message module configuration.
+ */
+message RTTTLConfig {
+
+  /*
+   * Ringtone for PWM Buzzer in RTTTL Format.
+   */
+  string ringtone = 1;
+}