Skip to content

Commit db4e980

Browse files
author
Konrad Iturbe
committed
Mac address fix, task fix
1 parent 37e8e71 commit db4e980

File tree

2 files changed

+110
-106
lines changed

2 files changed

+110
-106
lines changed

examples/ESP32_FreeRTOS/ESP32_FreeRTOS.ino

Lines changed: 98 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -15,112 +15,116 @@ void setup()
1515

1616
void loop()
1717
{
18-
if (Serial.available() > 0)
18+
if (Serial.available() > 0)
1919
{
2020
in = Serial.read();
2121
//Serial.write(in);
2222
}
2323

2424
switch (in)
2525
{
26-
default:
27-
break;
28-
29-
// connect
30-
case 'C':
31-
gp.begin();
32-
break;
33-
34-
// turn on/off
35-
case 'T':
36-
gp.turnOn();
37-
break;
38-
39-
case 't':
40-
gp.turnOff();
41-
break;
42-
43-
// take a picture of start a video
44-
case 'A':
45-
gp.shoot();
46-
break;
47-
48-
// stop the video
49-
case 'S':
50-
gp.stopShoot();
51-
break;
52-
53-
//set modes
54-
case 'V':
55-
gp.setMode(VIDEO_MODE);
56-
break;
57-
58-
case 'P':
59-
gp.setMode(PHOTO_MODE);
60-
break;
61-
62-
case 'M':
63-
gp.setMode(MULTISHOT_MODE);
64-
break;
65-
66-
// set orientation
67-
case 'u':
68-
gp.setOrientation(ORIENTATION_UP);
69-
break;
70-
71-
case 'd':
72-
gp.setOrientation(ORIENTATION_DOWN);
73-
break;
74-
75-
case 'W':
76-
gp.setVideoFov(MEDIUM_FOV);
77-
break;
78-
79-
case 'E':
80-
gp.setFrameRate(FR_120);
81-
break;
82-
83-
case 'f':
84-
gp.setPhotoResolution(PR_11MP_WIDE);
85-
break;
86-
87-
case 'F':
88-
gp.setVideoResolution(VR_1080p);
89-
break;
90-
91-
case 'L':
92-
gp.setTimeLapseInterval(60);
93-
break;
94-
95-
case 'O':
96-
gp.localizationOn();
97-
break;
98-
99-
case 'I':
100-
gp.localizationOff();
101-
break;
102-
103-
case 'l':
104-
gp.deleteLast();
105-
break;
106-
107-
case 'D':
108-
gp.deleteAll();
109-
break;
110-
111-
case 'X':
112-
gp.end();
113-
break;
114-
115-
case 'p':
116-
gp.printStatus();
117-
break;
26+
default:
27+
break;
28+
29+
// connect
30+
case 'C':
31+
gp.begin();
32+
break;
33+
34+
// turn on/off
35+
case 'T':
36+
gp.turnOn();
37+
break;
38+
39+
case 't':
40+
gp.turnOff();
41+
break;
42+
43+
// take a picture of start a video
44+
case 'A':
45+
gp.shoot();
46+
break;
47+
48+
// stop the video
49+
case 'S':
50+
gp.stopShoot();
51+
break;
52+
53+
//set modes
54+
case 'V':
55+
gp.setMode(VIDEO_MODE);
56+
break;
57+
58+
case 'P':
59+
gp.setMode(PHOTO_MODE);
60+
break;
61+
62+
case 'M':
63+
gp.setMode(MULTISHOT_MODE);
64+
break;
65+
66+
// set orientation
67+
case 'u':
68+
gp.setOrientation(ORIENTATION_UP);
69+
break;
70+
71+
case 'd':
72+
gp.setOrientation(ORIENTATION_DOWN);
73+
break;
74+
75+
case 'W':
76+
gp.setVideoFov(MEDIUM_FOV);
77+
break;
78+
79+
case 'E':
80+
gp.setFrameRate(FR_120);
81+
break;
82+
83+
case 'f':
84+
gp.setPhotoResolution(PR_11MP_WIDE);
85+
break;
86+
87+
case 'F':
88+
gp.setVideoResolution(VR_1080p);
89+
break;
90+
91+
case 'L':
92+
gp.setTimeLapseInterval(60);
93+
break;
94+
95+
case 'O':
96+
gp.localizationOn();
97+
break;
98+
99+
case 'I':
100+
gp.localizationOff();
101+
break;
102+
103+
case 'l':
104+
gp.deleteLast();
105+
break;
106+
107+
case 'D':
108+
gp.deleteAll();
109+
break;
110+
111+
case 'X':
112+
gp.end();
113+
break;
114+
115+
case 'p':
116+
gp.printStatus();
117+
break;
118118
}
119119

120120
in = 0;
121121
}
122122

123123
void keep_alive(void *parameter)
124124
{
125-
gp.keepAlive();
125+
while (gp.checkConnection(true)) {
126+
gp.keepAlive();
127+
Serial.println("KeepAlive sent");
128+
}
129+
vTaskDelete( NULL );
126130
}

src/GoProControl.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,18 +1355,18 @@ void GoProControl::printStatus()
13551355
if (_camera >= HERO4)
13561356
{
13571357
_debug_port->print("GoPro MAC:\t");
1358-
//WiFi.BSSID(mac);
1359-
_debug_port->print(mac[5], HEX);
1360-
_debug_port->print(":");
1361-
_debug_port->print(mac[4], HEX);
1362-
_debug_port->print(":");
1363-
_debug_port->print(mac[3], HEX);
1364-
_debug_port->print(":");
1365-
_debug_port->print(mac[2], HEX);
1366-
_debug_port->print(":");
1367-
_debug_port->print(mac[1], HEX);
1368-
_debug_port->print(":");
1369-
_debug_port->println(mac[0], HEX);
1358+
uint8_t* gpMac = WiFi.BSSID();
1359+
_debug_port->print(gpMac[5],HEX);
1360+
_debug_port->print(":");
1361+
_debug_port->print(gpMac[4],HEX);
1362+
_debug_port->print(":");
1363+
_debug_port->print(gpMac[3],HEX);
1364+
_debug_port->print(":");
1365+
_debug_port->print(gpMac[2],HEX);
1366+
_debug_port->print(":");
1367+
_debug_port->print(gpMac[1],HEX);
1368+
_debug_port->print(":");
1369+
_debug_port->println(gpMac[0],HEX);
13701370
_debug_port->print("Board Name:\t");
13711371
_debug_port->println(_board_name);
13721372
}

0 commit comments

Comments
 (0)