Merge 9d222c9a55 into 6c7cff7de2

Merge pull request #7777 from meshtastic/create-pull-request/bump-version
Bump release version
2025-09-03 10:13:44 +00:00 · 2025-08-28 21:14:23 +10:00 · 2025-08-28 06:04:37 -05:00 · 2025-08-20 10:10:19 -05:00 · 2025-08-20 06:01:21 -05:00 · 2025-08-20 06:00:24 -05:00
4 changed files with 16 additions and 9 deletions
--- a/bin/org.meshtastic.meshtasticd.metainfo.xml
+++ b/bin/org.meshtastic.meshtasticd.metainfo.xml
@ -87,6 +87,9 @@
  </screenshots>

  <releases>
+    <release version="2.7.7" date="2025-08-28">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.7</url>
+    </release>
    <release version="2.7.6" date="2025-08-12">
      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.6</url>
    </release>
--- a/debian/changelog
+++ b/debian/changelog
@ -1,4 +1,4 @@
-meshtasticd (2.7.6.0) UNRELEASED; urgency=medium
+meshtasticd (2.7.7.0) UNRELEASED; urgency=medium

  [ Austin Lane ]
  * Initial packaging
@ -39,5 +39,6 @@ meshtasticd (2.7.6.0) UNRELEASED; urgency=medium

  [  ]
  * GitHub Actions Automatic version bump
+  * GitHub Actions Automatic version bump

- --  <github-actions[bot]@users.noreply.github.com>  Tue, 12 Aug 2025 23:48:48 +0000
+ -- Ubuntu <github-actions[bot]@users.noreply.github.com>  Thu, 28 Aug 2025 10:33:25 +0000
--- a/src/main.cpp
+++ b/src/main.cpp
@ -805,15 +805,18 @@ void setup()
    if (config.display.oled != meshtastic_Config_DisplayConfig_OledType_OLED_AUTO)
        screen_model = config.display.oled;

-#if defined(USE_SH1107)
-    screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // set dimension of 128x128
-    screen_geometry = GEOMETRY_128_128;
-#endif
-
 #if defined(USE_SH1107_128_64)
    screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // keep dimension of 128x64
+    screen_geometry = GEOMETRY_128_64;
 #endif

+    // if we have one of the fixed overrides in the settings, adjust display type accordingly.
+    if (screen_model == meshtastic_Config_DisplayConfig_OledType_OLED_SH1107) {
+        screen_geometry = GEOMETRY_128_64;
+    } else if (screen_model == meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_128) {
+        screen_geometry = GEOMETRY_128_128;
+    }
+
 #if !MESHTASTIC_EXCLUDE_I2C
 #if !defined(ARCH_STM32WL)
    if (acc_info.type != ScanI2C::DeviceType::NONE) {
@ -859,7 +862,7 @@ void setup()
 #elif !defined(ARCH_ESP32) // ARCH_RP2040
    SPI.begin();
 #else
-        // ESP32
+    // ESP32
 #if defined(HW_SPI1_DEVICE)
    SPI1.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
    LOG_DEBUG("SPI1.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)", LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
--- a/version.properties
+++ b/version.properties
@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 7
-build = 6
+build = 7
Author	SHA1	Message	Date
Ben Meadors	fbe3447d2f	Merge `9d222c9a55` into `6c7cff7de2`	2025-08-28 21:14:23 +10:00
Ben Meadors	6c7cff7de2	Merge pull request #7777 from meshtastic/create-pull-request/bump-version Some checks failed CI / docker-deb-amd64-tft (push) Waiting to run Details CI / docker-alp-amd64 (push) Waiting to run Details CI / docker-alp-amd64-tft (push) Waiting to run Details CI / docker-deb-arm64 (push) Waiting to run Details CI / docker-deb-armv7 (push) Waiting to run Details CI / gather-artifacts (esp32) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c3) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c6) (push) Blocked by required conditions Details CI / gather-artifacts (esp32s3) (push) Blocked by required conditions Details CI / gather-artifacts (nrf52840) (push) Blocked by required conditions Details CI / gather-artifacts (rp2040) (push) Blocked by required conditions Details CI / gather-artifacts (rp2350) (push) Blocked by required conditions Details CI / gather-artifacts (stm32) (push) Blocked by required conditions Details CI / release-artifacts (push) Blocked by required conditions Details CI / release-firmware (esp32) (push) Blocked by required conditions Details CI / release-firmware (esp32c3) (push) Blocked by required conditions Details CI / release-firmware (esp32c6) (push) Blocked by required conditions Details CI / release-firmware (esp32s3) (push) Blocked by required conditions Details CI / release-firmware (nrf52840) (push) Blocked by required conditions Details CI / release-firmware (rp2040) (push) Blocked by required conditions Details CI / release-firmware (rp2350) (push) Blocked by required conditions Details CI / release-firmware (stm32) (push) Blocked by required conditions Details CI / publish-firmware (push) Blocked by required conditions Details Daily Packaging / docker-multiarch (push) Has been cancelled Details Daily Packaging / package-ppa (jammy) (push) Has been cancelled Details Daily Packaging / package-ppa (noble) (push) Has been cancelled Details Daily Packaging / package-ppa (plucky) (push) Has been cancelled Details Daily Packaging / package-ppa (questing) (push) Has been cancelled Details Daily Packaging / package-obs (push) Has been cancelled Details Daily Packaging / hook-copr (push) Has been cancelled Details Bump release version	2025-08-28 06:04:37 -05:00
Ben Meadors	9d222c9a55	Merge branch 'master' into 128-redux	2025-08-20 10:10:19 -05:00
Ben Meadors	2dd4ca8c52	Line	2025-08-20 06:01:21 -05:00
Ben Meadors	2a50ae05dd	Account for 128x128 SH1107 displays	2025-08-20 06:00:24 -05:00