Skip to content

Commit 1cb8f5d

Browse files
committed
fixed some minor warnning messages and improved C++ compatibility
1 parent 90829f5 commit 1cb8f5d

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

examples/esp32cam-p2p-sender/esp32cam-p2p-sender.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void setup() {
4141
}
4242

4343
// M5Core2 receiver target (P2P or 1:1 mode)
44-
uint8_t macRecv[6] = {0xB8,0xF0,0x09,0xC6,0x0E,0xCC};
44+
const uint8_t macRecv[6] = {0xB8,0xF0,0x09,0xC6,0x0E,0xCC};
4545
radio.setTarget(macRecv);
4646
radio.init();
4747

examples/freenove-p2p-sender/freenove-p2p-sender.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void setup() {
4040
}
4141

4242
// M5Core2 receiver
43-
uint8_t macRecv[6] = {0xB8,0xF0,0x09,0xC6,0x0E,0xCC};
43+
const uint8_t macRecv[6] = {0xB8,0xF0,0x09,0xC6,0x0E,0xCC};
4444
radio.setTarget(macRecv);
4545
radio.init();
4646

examples/m5core2-basic-receiver/m5core2-basic-receiver.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void setup() {
3636
}
3737

3838
// BE CAREFUL WITH IT, IF JPG LEVEL CHANGES, INCREASE IT
39-
fb = (uint8_t*) ps_malloc(5000* sizeof( uint8_t ) ) ;
39+
fb = static_cast<uint8_t *>(ps_malloc(5000 * sizeof(uint8_t)));
4040

4141
radio.setRecvBuffer(fb);
4242
radio.setRecvCallback(onDataReady);

examples/m5core2-espnow-receiver/m5core2-espnow-receiver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void setup() {
3636
}
3737

3838
// BE CAREFUL WITH IT, IF JPG LEVEL CHANGES, INCREASE IT
39-
fb = (uint8_t *)ps_malloc(15000 * sizeof(uint8_t));
39+
fb = static_cast<uint8_t*>(ps_malloc(15000 * sizeof(uint8_t)));
4040

4141
radio.setRecvBuffer(fb);
4242
radio.setRecvCallback(onDataReady);

examples/m5cores3-espnow-receiver/m5cores3-espnow-receiver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ static void print_FPS(int x, int y, const char *msg, uint32_t &frame, uint_fast6
2323
if (millis() - time_stamp > 1000) {
2424
time_stamp = millis();
2525
char output[40];
26-
sprintf(output, "%s %2d FPS JPG: %05d\r\n",msg, frame, len);
26+
sprintf(output, "%s %2d FPS JPG: %05d\r\n", msg, frame, len);
2727
// M5.Display.drawString(output, x, y);
2828
frame = 0;
2929
Serial.print(output);
@@ -53,7 +53,7 @@ void setup() {
5353
}
5454

5555
// BE CAREFUL WITH IT, IF JPG LEVEL CHANGES, INCREASE IT
56-
fb = (uint8_t *)ps_malloc(5000 * sizeof(uint8_t));
56+
fb = static_cast<uint8_t *>(ps_malloc(5000 * sizeof(uint8_t)));
5757

5858
radio.setRecvBuffer(fb);
5959
radio.setRecvCallback(onDataReady);

examples/multi-camera-one-receiver/m5core2-multi-receiver.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ void setup() {
4141
}
4242

4343
// BE CAREFUL WITH IT, IF JPG LEVEL CHANGES, INCREASE IT
44-
fb_camera1 = (uint8_t*) ps_malloc(5000* sizeof( uint8_t ) ) ;
45-
fb_camera2 = (uint8_t*) ps_malloc(5000* sizeof( uint8_t ) ) ;
44+
fb_camera1 = static_cast<uint8_t*>(ps_malloc(5000 * sizeof(uint8_t)));
45+
fb_camera2 = static_cast<uint8_t*>(ps_malloc(5000 * sizeof(uint8_t)));
4646

4747
// TJournal Camera 24:0a:c4:2f:8e:90
48-
uint8_t camera1[6] = {0x24, 0x0A, 0xC4, 0x2F, 0x8E, 0x90};
48+
const uint8_t camera1[6] = {0x24, 0x0A, 0xC4, 0x2F, 0x8E, 0x90};
4949
// XIAOSense Camera 74:4d:bd:81:4e:fc
50-
uint8_t camera2[6] = {0x74, 0x4D, 0xBD, 0x81, 0x4E, 0xFC};
50+
const uint8_t camera2[6] = {0x74, 0x4D, 0xBD, 0x81, 0x4E, 0xFC};
5151

5252
radio.setRecvFilter(fb_camera1, camera1, onCamera1DataReady);
5353
radio.setRecvFilter(fb_camera2, camera2, onCamera2DataReady);

examples/multi-camera-one-receiver/m5cores3-camera1.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
ESPNowCam radio;
1414
int32_t dw, dh;
1515

16-
static void drawFPS() {
16+
static inline void drawFPS() {
1717
static uint_least64_t timeStamp = 0;
1818
frame++;
1919
if (millis() - timeStamp > 1000) {
@@ -58,7 +58,7 @@ void setup() {
5858
// M5Core2 receiver MAC: B8:F0:09:C6:0E:CC
5959
// uint8_t macRecv[6] = {0xB8,0xF0,0x09,0xC6,0x0E,0xCC};
6060
// Makerfabs receiver 7C:DF:A1:F3:73:3C
61-
uint8_t macRecv[6] = {0x7C,0xDF,0xA1,0xF3,0x73,0x3C};
61+
const uint8_t macRecv[6] = {0x7C,0xDF,0xA1,0xF3,0x73,0x3C};
6262

6363
radio.setTarget(macRecv);
6464
radio.init();

examples/multi-camera-one-receiver/makerfabs-multi-receiver.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,16 @@ void setup() {
8585
}
8686

8787
// BE CAREFUL WITH IT, IF JPG LEVEL CHANGES, INCREASE IT
88-
fb_camera1 = (uint8_t *)ps_malloc(20000 * sizeof(uint8_t));
89-
fb_camera2 = (uint8_t *)ps_malloc(10000 * sizeof(uint8_t));
90-
fb_camera3 = (uint8_t *)ps_malloc(10000 * sizeof(uint8_t));
88+
fb_camera1 = static_cast<uint8_t*>(ps_malloc(20000 * sizeof(uint8_t)));
89+
fb_camera2 = static_cast<uint8_t*>(ps_malloc(10000 * sizeof(uint8_t)));
90+
fb_camera3 = static_cast<uint8_t*>(ps_malloc(10000 * sizeof(uint8_t)));
9191

9292
// M5CoreS3 Camera f4:12:fa:85:f4:9c
93-
uint8_t camera1[6] = {0xF4, 0x12, 0xFA, 0x85, 0xF4, 0x9C};
93+
const uint8_t camera1[6] = {0xF4, 0x12, 0xFA, 0x85, 0xF4, 0x9C};
9494
// TJournal Camera 24:0a:c4:2f:8e:90
95-
uint8_t camera2[6] = {0x24, 0x0A, 0xC4, 0x2F, 0x8E, 0x90};
95+
const uint8_t camera2[6] = {0x24, 0x0A, 0xC4, 0x2F, 0x8E, 0x90};
9696
// XIAOSense Camera 74:4d:bd:81:4e:fc
97-
uint8_t camera3[6] = {0x74, 0x4D, 0xBD, 0x81, 0x4E, 0xFC};
97+
const uint8_t camera3[6] = {0x74, 0x4D, 0xBD, 0x81, 0x4E, 0xFC};
9898

9999
radio.setRecvFilter(fb_camera1, camera1, onCamera1DataReady);
100100
radio.setRecvFilter(fb_camera2, camera2, onCamera2DataReady);

src/ESPNowCam.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ size_t encodeMsg(Frame msg);
2424
bool encode_uint8_array(pb_ostream_t *stream, const pb_field_t *field, void *const *arg) {
2525
if (!pb_encode_tag_for_field(stream, field))
2626
return false;
27-
return pb_encode_string(stream, (uint8_t *)(outdata + chunk_pos), chunk_size_left);
27+
return pb_encode_string(stream, static_cast<uint8_t*>(outdata + chunk_pos), chunk_size_left);
2828
}
2929

3030
void msgSentCb(const uint8_t *macAddr, esp_now_send_status_t status) {
@@ -97,7 +97,7 @@ bool sendMessage(uint32_t msglen, const uint8_t *mac) {
9797
return false;
9898
}
9999

100-
bool ESPNowCam::setTarget(uint8_t *macAddress) {
100+
bool ESPNowCam::setTarget(const uint8_t *macAddress) {
101101
memcpy(targetAddress, macAddress, 6);
102102
return false;
103103
}

src/ESPNowCam.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class ESPNowCam {
2424
void setRecvBuffer(uint8_t *fb);
2525
void setRecvFilter(uint8_t *fb, const uint8_t *macAddr, RecvCb cb);
2626
bool sendData(uint8_t* data, uint32_t lenght);
27-
bool setTarget(uint8_t* macAddress);
27+
bool setTarget(const uint8_t* macAddress);
2828
bool init(uint8_t chunksize = 244);
2929
};
3030

0 commit comments

Comments
 (0)