Nz region sf16 preset

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "protobufs"]
 	path = protobufs
-	url = https://github.com/meshtastic/protobufs.git
+	url = https://github.com/NomDeTom/MeshtasticProtobufs.git
+	branch = nz-sf
 [submodule "meshtestic"]
 	path = meshtestic
 	url = https://github.com/meshtastic/meshTestic

src/graphics/draw/MenuHandler.cpp

@@ -239,6 +239,7 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
         {"RU", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_RU},
         {"IN", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_IN},
         {"NZ_865", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_NZ_865},
+        {"NZ_915", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_NZ_915},
         {"TH", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_TH},
         {"LORA_24", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_LORA_24},
         {"UA_433", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_UA_433},

src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h

@@ -54,6 +54,7 @@ enum MenuAction {
     SET_REGION_RU,
     SET_REGION_IN,
     SET_REGION_NZ_865,
+    SET_REGION_NZ_915,
     SET_REGION_TH,
     SET_REGION_LORA_24,
     SET_REGION_UA_433,

src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp

@@ -823,6 +823,10 @@ void InkHUD::MenuApplet::execute(MenuItem item)
         applyLoRaRegion(meshtastic_Config_LoRaConfig_RegionCode_NZ_865);
         break;
 
+    case SET_REGION_NZ_915:
+        applyLoRaRegion(meshtastic_Config_LoRaConfig_RegionCode_NZ_915);
+        break;
+
     case SET_REGION_TH:
         applyLoRaRegion(meshtastic_Config_LoRaConfig_RegionCode_TH);
         break;
@@ -1732,6 +1736,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
         items.push_back(MenuItem("RU", MenuAction::SET_REGION_RU, MenuPage::EXIT));
         items.push_back(MenuItem("IN", MenuAction::SET_REGION_IN, MenuPage::EXIT));
         items.push_back(MenuItem("NZ 865", MenuAction::SET_REGION_NZ_865, MenuPage::EXIT));
+        items.push_back(MenuItem("NZ 915", MenuAction::SET_REGION_NZ_915, MenuPage::EXIT));
         items.push_back(MenuItem("TH", MenuAction::SET_REGION_TH, MenuPage::EXIT));
         items.push_back(MenuItem("LoRa 2.4", MenuAction::SET_REGION_LORA_24, MenuPage::EXIT));
         items.push_back(MenuItem("UA 433", MenuAction::SET_REGION_UA_433, MenuPage::EXIT));

src/mesh/RadioInterface.cpp

@@ -135,6 +135,12 @@ const RegionInfo regions[] = {
      */
     RDEF(ANZ, 915.0f, 928.0f, 100, 30, false, false, PROFILE_STD, PRESET(LONG_FAST), 0),
 
+    /*
+        Same band as ANZ, for New Zealand nodes wanting ShortFast as their default preset
+        instead of LongFast. https://iotalliance.org.nz/wp-content/uploads/sites/4/2019/05/IoT-Spectrum-in-NZ-Briefing-Paper.pdf
+     */
+    RDEF(NZ_915, 915.0f, 928.0f, 100, 30, false, false, PROFILE_STD, PRESET(SHORT_FAST), 0),
+
     /*
         433.05 - 434.79 MHz, 25mW EIRP max, No duty cycle restrictions
         AU Low Interference Potential https://www.acma.gov.au/licences/low-interference-potential-devices-lipd-class-licence

src/mesh/generated/meshtastic/config.pb.h

@@ -313,7 +313,10 @@ typedef enum _meshtastic_Config_LoRaConfig_RegionCode {
     /* ITU Region 2 Amateur Radio 1.25m '125cm' band (220-225 MHz)
  Note: Some countries do not allocate 220-222 MHz (Ex: USA/Canada).
  Check local law! */
-    meshtastic_Config_LoRaConfig_RegionCode_ITU2_125CM = 37
+    meshtastic_Config_LoRaConfig_RegionCode_ITU2_125CM = 37,
+    /* New Zealand 915MHz-928MHz
+ Same band as ANZ, for use with the Short Fast modem preset */
+    meshtastic_Config_LoRaConfig_RegionCode_NZ_915 = 38
 } meshtastic_Config_LoRaConfig_RegionCode;
 
 /* Standard predefined channel settings
@@ -767,8 +770,8 @@ extern "C" {
 #define _meshtastic_Config_DisplayConfig_CompassOrientation_ARRAYSIZE ((meshtastic_Config_DisplayConfig_CompassOrientation)(meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270_INVERTED+1))
 
 #define _meshtastic_Config_LoRaConfig_RegionCode_MIN meshtastic_Config_LoRaConfig_RegionCode_UNSET
-#define _meshtastic_Config_LoRaConfig_RegionCode_MAX meshtastic_Config_LoRaConfig_RegionCode_ITU2_125CM
-#define _meshtastic_Config_LoRaConfig_RegionCode_ARRAYSIZE ((meshtastic_Config_LoRaConfig_RegionCode)(meshtastic_Config_LoRaConfig_RegionCode_ITU2_125CM+1))
+#define _meshtastic_Config_LoRaConfig_RegionCode_MAX meshtastic_Config_LoRaConfig_RegionCode_NZ_915
+#define _meshtastic_Config_LoRaConfig_RegionCode_ARRAYSIZE ((meshtastic_Config_LoRaConfig_RegionCode)(meshtastic_Config_LoRaConfig_RegionCode_NZ_915+1))
 
 #define _meshtastic_Config_LoRaConfig_ModemPreset_MIN meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST
 #define _meshtastic_Config_LoRaConfig_ModemPreset_MAX meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_TURBO

src/mesh/generated/meshtastic/interdevice.pb.cpp

@@ -6,10 +6,32 @@
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
-PB_BIND(meshtastic_SensorData, meshtastic_SensorData, AUTO)
+PB_BIND(meshtastic_FileTransfer, meshtastic_FileTransfer, 4)
+
+
+PB_BIND(meshtastic_DirectoryListing, meshtastic_DirectoryListing, 4)
+
+
+PB_BIND(meshtastic_I2CTransaction, meshtastic_I2CTransaction, 2)
+
+
+PB_BIND(meshtastic_SdCardInfo, meshtastic_SdCardInfo, AUTO)
+
+
+PB_BIND(meshtastic_I2CResult, meshtastic_I2CResult, 2)
+
+
+PB_BIND(meshtastic_InterdeviceMessage, meshtastic_InterdeviceMessage, 4)
+
+
+
+
+
+
+
+
 
 
-PB_BIND(meshtastic_InterdeviceMessage, meshtastic_InterdeviceMessage, 2)