Skip to content

Commit e43e6f7

Browse files
committed
Fixing ESP8266 and VS project
1 parent 7aaec26 commit e43e6f7

File tree

4 files changed

+18
-21
lines changed

4 files changed

+18
-21
lines changed

Software/Arduino code/OpenAstroTracker/InterruptCallback.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// NOTE: ESP8266 support is not complete and does not work. This code is never called.
1010
#ifdef ESP8266
11-
#include "Timers/ESP8266TimerInterrupt.h"
11+
#include "ESP8266TimerInterrupt.h"
1212
#elif defined __AVR_ATmega328P__ || defined __AVR_ATmega2560__ // Arduino Uno or Mega
1313
#define USE_TIMER_1 true
1414
#define USE_TIMER_2 true

Software/Arduino code/OpenAstroTracker/OpenAstroTracker.vcxproj

Lines changed: 8 additions & 8 deletions
Large diffs are not rendered by default.

Software/Arduino code/OpenAstroTracker/OpenAstroTracker.vcxproj.filters

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@
6060
<ClInclude Include="InterruptCallback.h">
6161
<Filter>Header Files</Filter>
6262
</ClInclude>
63-
<ClInclude Include="Timers\ESP8266TimerInterrupt.h">
63+
<ClInclude Include="ESP8266TimerInterrupt.h">
6464
<Filter>Header Files</Filter>
6565
</ClInclude>
66-
<ClInclude Include="Timers\ESP8266_ISR_Timer-Impl.h">
66+
<ClInclude Include="ESP8266_ISR_Timer-Impl.h">
6767
<Filter>Header Files</Filter>
6868
</ClInclude>
69-
<ClInclude Include="Timers\ESP8266_ISR_Timer.h">
69+
<ClInclude Include="ESP8266_ISR_Timer.h">
7070
<Filter>Header Files</Filter>
7171
</ClInclude>
72-
<ClInclude Include="Timers\TimerInterrupt.h">
72+
<ClInclude Include="TimerInterrupt.h">
7373
<Filter>Header Files</Filter>
7474
</ClInclude>
7575
</ItemGroup>
@@ -98,7 +98,7 @@
9898
<ClCompile Include="InterruptCallback.cpp">
9999
<Filter>Source Files</Filter>
100100
</ClCompile>
101-
<ClCompile Include="Timers\TimerInterrupt.cpp">
101+
<ClCompile Include="TimerInterrupt.cpp">
102102
<Filter>Source Files</Filter>
103103
</ClCompile>
104104
</ItemGroup>

Software/Arduino code/OpenAstroTracker/WifiControl.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#ifdef WIFI_ENABLED
33
#include "ESP8266Wifi.h"
44

5+
#define PORT 4030
56

67
WifiControl::WifiControl(Mount* mount, LcdMenu* lcdMenu)
78
{
@@ -70,11 +71,7 @@ String wifiStatus(int status){
7071

7172
String WifiControl::getStatus()
7273
{
73-
String result = "1," + wifiStatus(WiFi.status()) + ",";
74-
result += WiFi.hostname() + ",";
75-
result += WiFi.localIP().toString() + ":" + String(_tcpServer->port());
76-
77-
return result;
74+
return "1," + wifiStatus(WiFi.status()) + "," + WiFi.hostname() + "," += WiFi.localIP().toString() + ":" + PORT;
7875
}
7976

8077
void WifiControl::loop()
@@ -86,7 +83,7 @@ void WifiControl::loop()
8683
Serial.println("Connected status changed to " + wifiStatus(_status));
8784
#endif
8885
if (_status == WL_CONNECTED) {
89-
_tcpServer = new WiFiServer(4030);
86+
_tcpServer = new WiFiServer(PORT);
9087
_tcpServer->begin();
9188
_tcpServer->setNoDelay(true);
9289
#ifdef DEBUG_MODE
@@ -101,7 +98,7 @@ void WifiControl::loop()
10198
Serial.print(" IP: ");
10299
Serial.print(WiFi.localIP());
103100
Serial.print(":");
104-
Serial.println(String(_tcpServer->port()));
101+
Serial.println(String(PORT));
105102
#endif
106103
}
107104
}

0 commit comments

Comments
 (0)