From 999afdf05e77ade16c9ee41716d619ed7c5ebbff Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Wed, 17 Mar 2021 20:29:27 +0800
Subject: [PATCH] wifi now works on portduino

---
 .idea/workspace.xml             | 30 ++++++++++++++++--------------
 bin/program-1.1-tbeam.sh        |  1 +
 bin/run-both.sh                 | 11 +++++++++++
 docs/software/TODO.md           |  3 +++
 proto                           |  2 +-
 src/mesh/generated/mesh.pb.h    |  7 ++++---
 src/portduino/PortduinoGlue.cpp |  2 +-
 7 files changed, 37 insertions(+), 19 deletions(-)
 create mode 100755 bin/program-1.1-tbeam.sh
 create mode 100755 bin/run-both.sh

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6ba904e2e..1381bb27a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,11 +14,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="58922733-b05b-4b90-9655-b9b18914977a" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/mesh/wifi/WiFiServerAPI.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/mesh/wifi/WiFiServerAPI.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/portduino/PortduinoGlue.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/portduino/PortduinoGlue.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docs/software/TODO.md" beforeDir="false" afterPath="$PROJECT_DIR$/docs/software/TODO.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/proto" beforeDir="false" afterPath="$PROJECT_DIR$/proto" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/mesh/generated/mesh.pb.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/mesh/generated/mesh.pb.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -51,11 +50,6 @@
     <property name="settings.editor.selected.configurable" value="CMakeSettings" />
   </component>
   <component name="RunManager" selected="PlatformIO.PlatformIO Upload">
-    <configuration default="true" type="CLionExternalRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" PASS_PARENT_ENVS_2="true">
-      <method v="2">
-        <option name="CLION.EXTERNAL.BUILD" enabled="true" />
-      </method>
-    </configuration>
     <configuration default="true" type="CLion_Remote" version="1" remoteCommand="tcp:localhost:2345" symbolFile="" sysroot="">
       <debugger kind="GDB" isBundled="true" />
       <method v="2" />
@@ -99,7 +93,9 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1615788661896</updated>
-      <workItem from="1615788663210" duration="4775000" />
+      <workItem from="1615788663210" duration="6661000" />
+      <workItem from="1615938346019" duration="1208000" />
+      <workItem from="1615971126983" duration="5945000" />
     </task>
     <servers />
   </component>
@@ -116,14 +112,20 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
-          <url>file://$PROJECT_DIR$/src/main.cpp</url>
-          <line>282</line>
-          <option name="timeStamp" value="1" />
+          <url>file://$PROJECT_DIR$/src/mesh/StreamAPI.cpp</url>
+          <line>20</line>
+          <option name="timeStamp" value="4" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/src/mesh/wifi/WiFiServerAPI.cpp</url>
+          <line>53</line>
+          <option name="timeStamp" value="6" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
diff --git a/bin/program-1.1-tbeam.sh b/bin/program-1.1-tbeam.sh
new file mode 100755
index 000000000..9b95c3380
--- /dev/null
+++ b/bin/program-1.1-tbeam.sh
@@ -0,0 +1 @@
+esptool.py --baud 921600 write_flash 0x10000 release/archive/firmware-tbeam-1.1.50.bin
diff --git a/bin/run-both.sh b/bin/run-both.sh
new file mode 100755
index 000000000..e5a66b329
--- /dev/null
+++ b/bin/run-both.sh
@@ -0,0 +1,11 @@
+set -e 
+
+pio run
+
+echo uploading to usb1
+pio run --upload-port /dev/ttyUSB1 -t upload &
+
+echo uploading to usb0
+pio run --upload-port /dev/ttyUSB0 -t upload &
+
+wait
\ No newline at end of file
diff --git a/docs/software/TODO.md b/docs/software/TODO.md
index 9633c021e..c65a53658 100644
--- a/docs/software/TODO.md
+++ b/docs/software/TODO.md
@@ -4,6 +4,9 @@ You probably don't care about this section - skip to the next one.
 
 ## 1.2 cleanup & multichannel support:
 
+* before next relase: test empty channel sets on android
+* test link sharing on android
+  
 * DONE cleanup the external notification and serial plugins
 * non ack version of stress test fails sometimes!
 * timestamps on oled screen are wrong - don't seem to be updating based on message rx
diff --git a/proto b/proto
index e68763737..39bb8b26b 160000
--- a/proto
+++ b/proto
@@ -1 +1 @@
-Subproject commit e68763737e3345ebf12c4776c84d27d83e1e9e1a
+Subproject commit 39bb8b26bbc107aae3586d5a5e11a06ea12680bc
diff --git a/src/mesh/generated/mesh.pb.h b/src/mesh/generated/mesh.pb.h
index 5f4f9bf35..84bdbbb43 100644
--- a/src/mesh/generated/mesh.pb.h
+++ b/src/mesh/generated/mesh.pb.h
@@ -26,7 +26,8 @@ typedef enum _HardwareModel {
     HardwareModel_PPR = 34,
     HardwareModel_GENIEBLOCKS = 35,
     HardwareModel_NRF52_UNKNOWN = 36,
-    HardwareModel_PORTDUINO = 37
+    HardwareModel_PORTDUINO = 37,
+    HardwareModel_ANDROID_SIM = 38
 } HardwareModel;
 
 typedef enum _Constants {
@@ -193,8 +194,8 @@ typedef struct _ToRadio {
 
 /* Helper constants for enums */
 #define _HardwareModel_MIN HardwareModel_UNSET
-#define _HardwareModel_MAX HardwareModel_PORTDUINO
-#define _HardwareModel_ARRAYSIZE ((HardwareModel)(HardwareModel_PORTDUINO+1))
+#define _HardwareModel_MAX HardwareModel_ANDROID_SIM
+#define _HardwareModel_ARRAYSIZE ((HardwareModel)(HardwareModel_ANDROID_SIM+1))
 
 #define _Constants_MIN Constants_Unused
 #define _Constants_MAX Constants_DATA_PAYLOAD_LEN
diff --git a/src/portduino/PortduinoGlue.cpp b/src/portduino/PortduinoGlue.cpp
index 44cb89464..5e3746335 100644
--- a/src/portduino/PortduinoGlue.cpp
+++ b/src/portduino/PortduinoGlue.cpp
@@ -28,7 +28,7 @@ void getMacAddr(uint8_t *dmac)
 
 void setBluetoothEnable(bool on)
 {
-    notImplemented("setBluetoothEnable");
+    // not needed
 }
 
 void cpuDeepSleep(uint64_t msecs) {