Merge pull request #3 from ssbc/tbeam_07

Tbeam 07 tweaks, serial USB detection for uploading

Author: tschudin

esp32/loramesh-TBeam/Makefile

@@ -17,7 +17,7 @@ ESPTOOL=/Users/tschudin/Library/Arduino15/packages/esp32/tools/esptool_py/4.5.1/
 BOOTAPP0PATH=/Users/tschudin/Library/Arduino15/packages/esp32/hardware/esp32/2.0.9/tools/partitions/boot_app0.bin
 
 # name of the ino file:
-MAIN=loramesh-TBEAM.ino
+MAIN=loramesh-TBeam.ino
 
 ifeq ($(BOARD),heltec)
   FQBN=esp32:esp32:heltec_wifi_lora_32_V2
@@ -33,11 +33,15 @@ endif
 ifndef SERIAL
   ifeq ($(BOARD),heltec) # heltec LORA32
     SERIAL = $(shell ls /dev/tty.usbserial-*)
-  else # T-Beam
-    SERIAL = $(shell ls /dev/tty.wchusbserial*)
+  else # T-Beam	
+    SERIAL= $(shell ls /dev/tty* | grep 'ACM\|USB\|wchusb')
   endif
 endif
 
+ifdef FLAG                 #use for sending an extra #def flag to be appended to files, such as FLAG=TBEAM_07
+  EXTRA_FLAG=,compiler.cpp.extra_flag=-D$(FLAG)
+endif
+
 # ----------------------------------------------------------------------
 
 all:
@@ -49,7 +53,7 @@ compile:
 	rm -f partitions.csv
 	ln -s $(PARTITIONS_CSV) partitions.csv
 	$(BINDIR)/arduino-cli compile -v --fqbn $(FQBN) $(MAIN) \
-		--build-properties build.partitions=partitions.csv,upload.maximum_size=1572864
+		--build-properties build.partitions=partitions.csv,upload.maximum_size=1572864$(EXTRA_FLAG)
 
 upload:
 	$(foreach var,$(SERIAL), $(BINDIR)/arduino-cli upload -v --fqbn $(FQBN) -p $(var) .;)

esp32/loramesh-TBeam/hw_setup.h

@@ -10,6 +10,11 @@
 
 #include "config.h"
 
+#ifdef TBEAM_07
+  #define GPS_TX 12
+  #define GPS_RX 15
+#endif
+
 #if !defined(NO_WIFI)
   WiFiUDP udp;
 #endif
@@ -139,6 +144,10 @@ void hw_setup() // T-BEAM or Heltec LoRa32v2
   }
 #endif // T-Beam
 
+#if defined(TBEAM_07)
+  GPS.begin(9600, SERIAL_8N1, GPS_TX, GPS_RX); 
+#endif
+
 #if defined(HAS_LORA)
   LoRa.setSignalBandwidth(the_lora_config->bw);
   LoRa.setSpreadingFactor(the_lora_config->sf);

esp32/loramesh-TBeam/loramesh-TBeam.h

@@ -212,7 +212,7 @@ void setup()
 #if defined(AXP_DEBUG)
   unsigned long int m = millis();
   lora_log.printf("t=%d.%03d battery=%.04gV\n", m/1000, m%1000,
-                                                axp.getBattVoltage()/1000);
+                                                getBattVoltage());
   next_log_battery = m + LOG_BATTERY_INTERVAL;
 #endif
   lora_log.printf("millis,batt,utc,mac,lat,lon,ele,plen,prssi,psnr,pfe,rssi\n");
@@ -431,7 +431,7 @@ void do_io()
     unsigned long int now = millis();
     lora_log.printf("t=%d.%03d ", now/1000, now%1000);
 # if defined(AXP_DEBUG)
-    lora_log.printf("battery=%.04gV ", axp.getBattVoltage()/1000);
+    lora_log.printf("battery=%.04gV ", getBattVoltage());
 # endif
     lora_log.printf("|dmxt|=%d |blbt|=%d |feeds|=%d |entries|=%d |chunks|=%d |freeHeap|=%dXX\r\n",
                 dmx->dmxt_cnt, dmx->blbt_cnt, repo->rplca_cnt, repo->entry_cnt, repo->chunk_cnt, ESP.getFreeHeap());
@@ -498,7 +498,7 @@ void do_io()
     sprintf(stat_line + strlen(stat_line)-1, "%d", lora_cnt);
 #else
     sprintf(stat_line + strlen(stat_line)-1, "%d, batt:%.04g",
-            lora_cnt, axp.getBattVoltage()/1000);
+            lora_cnt, getBattVoltage());
 #endif
     ble_send_stats((unsigned char*) stat_line, strlen(stat_line));
 #endif

esp32/loramesh-TBeam/mgmt.h

@@ -133,6 +133,13 @@ void mgmt_send_status();
 void mgmt_send_beacon();
 
 
+float getBattVoltage() {
+#ifdef TBEAM_07
+  return analogRead(35) * 0.85 * (2.0 / 1024.0); // 0.85 is voltage divider ratio measured
+#else
+  return axp.getBattVoltage()/1000;
+#endif
+}
 
 //------------------------------------------------------------------------------
 // CREATE PAYLOADS
@@ -158,7 +165,7 @@ unsigned char* _mkStatus()
   status.state.beacon = mgmt_beacon;
   status.state.voltage = 0;
 #if defined(AXP_DEBUG)
-  status.state.voltage = axp.getBattVoltage()/1000;
+  status.state.voltage = getBattVoltage();
 #endif
   status.state.feeds = repo->rplca_cnt;
   status.state.entries = repo->entry_cnt;
@@ -192,6 +199,7 @@ unsigned char* _mkStatus()
   return (unsigned char*) &status;
 }
 
+
 // fill buffer with key packet
 unsigned char* _mkKey(bool op, unsigned char* key)
 {