Merge branch 'master' into issue#199

README.md

@@ -23,7 +23,7 @@ This software is 100% open source and developed by a group of hobbyist experimen
 We currently support three models of radios.
 
 - TTGO T-Beam
-
+  - [T-Beam V0.7 w/ NEO-6M](https://www.aliexpress.com/item/4000574335430.html)
   - [T-Beam V1.0 w/ NEO-6M - special Meshtastic version](https://www.aliexpress.com/item/4001178678568.html) (Includes built-in OLED display and they have **preinstalled** the meshtastic software)
   - [T-Beam V1.0 w/ NEO-M8N](https://www.aliexpress.com/item/33047631119.html) (slightly better GPS)
   - 3D printable cases
@@ -43,6 +43,7 @@ We currently support three models of radios.
 - US/JP/AU/NZ/CA - 915MHz
 - CN - 470MHz
 - EU - 868MHz, 433MHz
+- full list of LoRa frequencies per region is available [here](https://www.thethingsnetwork.org/docs/lorawan/frequencies-by-country.html)
 
 Getting a version that includes a screen is optional, but highly recommended.
 

platformio.ini

@@ -99,17 +99,16 @@ board = ttgo-t-beam
 lib_deps =
   ${env.lib_deps}
   https://github.com/meshtastic/AXP202X_Library.git
-
 build_flags = 
   ${esp32_base.build_flags} -D TBEAM_V10
 
 ; The original TBEAM board without the AXP power chip and a few other changes
 ; Note: I've heard reports this didn't work.  Disabled until someone with a 0.7 can test and debug.
-;[env:tbeam0.7]
+[env:tbeam0.7]
-;extends = esp32_base
+extends = esp32_base
-;board = ttgo-t-beam
+board = ttgo-t-beam
-;build_flags = 
+build_flags = 
-;  ${esp32_base.build_flags} -D TBEAM_V07
+  ${esp32_base.build_flags} -D TBEAM_V07
 
 [env:heltec]
 ;build_type = debug ; to make it possible to step through our jtag debugger 

src/configuration.h

@@ -180,8 +180,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // This board has different GPS pins than all other boards
 #undef GPS_RX_PIN
 #undef GPS_TX_PIN
-#define GPS_RX_PIN 15
+#define GPS_RX_PIN 12
-#define GPS_TX_PIN 12
+#define GPS_TX_PIN 15
 
 #elif defined(ARDUINO_HELTEC_WIFI_LORA_32_V2)
 // This string must exactly match the case used in release file names or the android updater won't work

src/screen.cpp

@@ -35,11 +35,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define FONT_HEIGHT 14 // actually 13 for "ariel 10" but want a little extra space
 #define FONT_HEIGHT_16 (ArialMT_Plain_16[1] + 1)
-#ifdef USE_SH1106
+// This means the *visible* area (sh1106 can address 132, but shows 128 for example)
-#define SCREEN_WIDTH 132
-#else
 #define SCREEN_WIDTH 128
-#endif
 #define SCREEN_HEIGHT 64
 #define TRANSITION_FRAMERATE 30 // fps
 #define IDLE_FRAMERATE 1        // in fps

src/screen.h

@@ -92,7 +92,7 @@ class Screen : public PeriodicTask
 
     // Implementation to Adjust Brightness
     void adjustBrightness();
-    int brightness = 150;
+    uint8_t brightness = 150;
 
     /// Starts showing the Bluetooth PIN screen.
     //