Skip to content

Commit 0151fbf

Browse files
kwagyemankwagyeman
committed
Fix library headers
1 parent adecd32 commit 0151fbf

File tree

4 files changed

+38
-46
lines changed

4 files changed

+38
-46
lines changed

‎examples/arduino_to_arduino_streaming_comms_as_the_remote_device/arduino_to_arduino_streaming_comms_as_the_remote_device.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ openmv::rpc_callback_buffer<8> callback_buffer; // All RPC objects share this bu
6767
// openmv::rpc_hardware_serial2_uart_slave -> Serial2
6868
// openmv::rpc_hardware_serial3_uart_slave -> Serial3
6969
//
70-
// openmv::rpc_hardware_serial3_uart_slave interface(115200);
70+
// openmv::rpc_hardware_serial_uart_slave interface(115200);
7171

7272
// Uncomment the below line to setup for be controlled over a software UART.
7373
//

‎examples/popular_features_as_the_controller_device_example/popular_features_as_the_controller_device_example.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ openmv::rpc_scratch_buffer<256> scratch_buffer; // All RPC objects share this bu
2828
// NOTE: Master and slave message ids and can bit rates must match. Connect master can high to slave
2929
// can high and master can low to slave can lo. The can bus must be terminated with 120 ohms.
3030
//
31-
openmv::rpc_can_master interface(0x7FF, 250E3);
31+
// openmv::rpc_can_master interface(0x7FF, 250E3);
3232

3333
// Uncomment the below line to setup your Arduino for controlling over I2C.
3434
//
@@ -78,7 +78,7 @@ openmv::rpc_can_master interface(0x7FF, 250E3);
7878
// NOTE: Master and slave baud rates must match. Connect master tx to slave rx and master rx to
7979
// slave tx. Finally, both devices must share a common ground.
8080
//
81-
// openmv::rpc_software_serial_uart_master interface(2, 3, 19200);
81+
openmv::rpc_software_serial_uart_master interface(2, 3, 19200);
8282

8383
void setup() {
8484

‎src/openmvrpc.cpp

+19-20
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ void rpc::_set_packet(uint8_t *buff, uint16_t magic_value, uint8_t *data, size_t
173173
buff[size + 3] = crc >> 8;
174174
}
175175

176-
bool rpc::stream_reader_setup(uint32_t queue_depth = 1)
176+
bool rpc::stream_reader_setup(uint32_t queue_depth)
177177
{
178178
uint8_t packet[8];
179179
_set_packet(packet, 0xEDF6, (uint8_t *) &queue_depth, sizeof(queue_depth));
@@ -663,7 +663,6 @@ void rpc_slave::loop(unsigned long send_timeout, unsigned long recv_timeout)
663663
break;
664664
}
665665
}
666-
667666
break;
668667
}
669668
}
@@ -873,35 +872,35 @@ void rpc_hardware_serial##name##_uart_master::_flush() \
873872
bool rpc_hardware_serial##name##_uart_master::get_bytes(uint8_t *buff, size_t size, unsigned long timeout) \
874873
{ \
875874
Serial##name.setTimeout(timeout + 1); \
876-
bool ok = (Serial##name.readBytes(buff, size) == size) && (!_same(buff, size)); \
875+
bool ok = (Serial##name.readBytes((char *) buff, size) == size) && (!_same(buff, size)); \
877876
if (!ok) delay(_get_short_timeout); \
878877
return ok; \
879878
} \
880879
\
881880
bool rpc_hardware_serial##name##_uart_master::put_bytes(uint8_t *buff, size_t size, unsigned long timeout) \
882881
{ \
883882
(void) timeout; \
884-
return Serial##name.write(buff, size) == size; \
883+
return Serial##name.write((char *) buff, size) == size; \
885884
}
886885

887-
#ifdef HAVE_HWSERIAL0
886+
#ifdef SERIAL_PORT_HARDWARE
888887
RPC_HARDWARE_SERIAL_UART_MASTER_IMPLEMENTATION()
889888
#endif
890889

891-
#ifdef HAVE_HWSERIAL1
890+
#ifdef SERIAL_PORT_HARDWARE1
892891
RPC_HARDWARE_SERIAL_UART_MASTER_IMPLEMENTATION(1)
893892
#endif
894893

895-
#ifdef HAVE_HWSERIAL2
894+
#ifdef SERIAL_PORT_HARDWARE2
896895
RPC_HARDWARE_SERIAL_UART_MASTER_IMPLEMENTATION(2)
897896
#endif
898897

899-
#ifdef HAVE_HWSERIAL3
898+
#ifdef SERIAL_PORT_HARDWARE3
900899
RPC_HARDWARE_SERIAL_UART_MASTER_IMPLEMENTATION(3)
901900
#endif
902901

903-
#ifdef HAVE_CDCSERIAL
904-
RPC_HARDWARE_SERIAL_UART_MASTER_IMPLEMENTATION()
902+
#ifdef SERIAL_PORT_USBVIRTUAL
903+
RPC_HARDWARE_SERIAL_UART_MASTER_IMPLEMENTATION(USB)
905904
#endif
906905

907906
#define RPC_HARDWARE_SERIAL_UART_SLAVE_IMPLEMENTATION(name) \
@@ -913,36 +912,36 @@ void rpc_hardware_serial##name##_uart_slave::_flush() \
913912
bool rpc_hardware_serial##name##_uart_slave::get_bytes(uint8_t *buff, size_t size, unsigned long timeout) \
914913
{ \
915914
Serial##name.setTimeout(timeout + 1); \
916-
return Serial##name.readBytes(buff, size) == size; \
915+
return Serial##name.readBytes((char *) buff, size) == size; \
917916
} \
918917
\
919918
bool rpc_hardware_serial##name##_uart_slave::put_bytes(uint8_t *buff, size_t size, unsigned long timeout) \
920919
{ \
921920
(void) timeout; \
922-
return Serial##name.write(buff, size) == size; \
921+
return Serial##name.write((char *) buff, size) == size; \
923922
}
924923

925-
#ifdef HAVE_HWSERIAL0
924+
#ifdef SERIAL_PORT_HARDWARE
926925
RPC_HARDWARE_SERIAL_UART_SLAVE_IMPLEMENTATION()
927926
#endif
928927

929-
#ifdef HAVE_HWSERIAL1
928+
#ifdef SERIAL_PORT_HARDWARE1
930929
RPC_HARDWARE_SERIAL_UART_SLAVE_IMPLEMENTATION(1)
931930
#endif
932931

933-
#ifdef HAVE_HWSERIAL2
932+
#ifdef SERIAL_PORT_HARDWARE2
934933
RPC_HARDWARE_SERIAL_UART_SLAVE_IMPLEMENTATION(2)
935934
#endif
936935

937-
#ifdef HAVE_HWSERIAL3
936+
#ifdef SERIAL_PORT_HARDWARE3
938937
RPC_HARDWARE_SERIAL_UART_SLAVE_IMPLEMENTATION(3)
939938
#endif
940939

941-
#ifdef HAVE_CDCSERIAL
942-
RPC_HARDWARE_SERIAL_UART_SLAVE_IMPLEMENTATION()
940+
#ifdef SERIAL_PORT_USBVIRTUAL
941+
RPC_HARDWARE_SERIAL_UART_SLAVE_IMPLEMENTATION(USB)
943942
#endif
944943

945-
#ifndef ARDUINO_ARCH_SAM
944+
#ifdef ARDUINO_ARCH_AVR
946945
void rpc_software_serial_uart_master::_flush()
947946
{
948947
__serial.listen();
@@ -1004,4 +1003,4 @@ bool rpc_software_serial_uart_slave::put_bytes(uint8_t *buff, size_t size, unsig
10041003
(void) timeout;
10051004
return __serial.write(buff, size) == size;
10061005
}
1007-
#endif // ARDUINO_ARCH_SAM
1006+
#endif // ARDUINO_ARCH_AVR

‎src/openmvrpc.h

+16-23
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
#include <Arduino.h>
1111
#include <CAN.h>
12-
#ifndef ARDUINO_ARCH_SAM
12+
#ifdef ARDUINO_ARCH_AVR
1313
#include <SoftwareSerial.h>
14-
#endif // ARDUINO_ARCH_SAM
14+
#endif // ARDUINO_ARCH_AVR
1515
#include <SPI.h>
1616
#include <Wire.h>
1717

@@ -325,31 +325,24 @@ private: \
325325
rpc_hardware_serial##name##_uart_master(const rpc_hardware_serial##name##_uart_master &); \
326326
};
327327

328-
#ifdef ARDUINO_ARCH_SAM
329-
#define HAVE_HWSERIAL0
330-
#define HAVE_HWSERIAL1
331-
#define HAVE_HWSERIAL2
332-
#define HAVE_HWSERIAL3
333-
#endif
334-
335-
#ifdef HAVE_HWSERIAL0
328+
#ifdef SERIAL_PORT_HARDWARE
336329
RPC_HARDWARE_SERIAL_UART_MASTER()
337330
#endif
338331

339-
#ifdef HAVE_HWSERIAL1
332+
#ifdef SERIAL_PORT_HARDWARE1
340333
RPC_HARDWARE_SERIAL_UART_MASTER(1)
341334
#endif
342335

343-
#ifdef HAVE_HWSERIAL2
336+
#ifdef SERIAL_PORT_HARDWARE2
344337
RPC_HARDWARE_SERIAL_UART_MASTER(2)
345338
#endif
346339

347-
#ifdef HAVE_HWSERIAL3
340+
#ifdef SERIAL_PORT_HARDWARE3
348341
RPC_HARDWARE_SERIAL_UART_MASTER(3)
349342
#endif
350343

351-
#ifdef HAVE_CDCSERIAL
352-
RPC_HARDWARE_SERIAL_UART_MASTER()
344+
#ifdef SERIAL_PORT_USBVIRTUAL
345+
RPC_HARDWARE_SERIAL_UART_MASTER(USB)
353346
#endif
354347

355348
#define RPC_HARDWARE_SERIAL_UART_SLAVE(name) \
@@ -368,27 +361,27 @@ private: \
368361
rpc_hardware_serial##name##_uart_slave(const rpc_hardware_serial##name##_uart_slave &); \
369362
};
370363

371-
#ifdef HAVE_HWSERIAL0
364+
#ifdef SERIAL_PORT_HARDWARE
372365
RPC_HARDWARE_SERIAL_UART_SLAVE()
373366
#endif
374367

375-
#ifdef HAVE_HWSERIAL1
368+
#ifdef SERIAL_PORT_HARDWARE1
376369
RPC_HARDWARE_SERIAL_UART_SLAVE(1)
377370
#endif
378371

379-
#ifdef HAVE_HWSERIAL2
372+
#ifdef SERIAL_PORT_HARDWARE2
380373
RPC_HARDWARE_SERIAL_UART_SLAVE(2)
381374
#endif
382375

383-
#ifdef HAVE_HWSERIAL3
376+
#ifdef SERIAL_PORT_HARDWARE3
384377
RPC_HARDWARE_SERIAL_UART_SLAVE(3)
385378
#endif
386379

387-
#ifdef HAVE_CDCSERIAL
388-
RPC_HARDWARE_SERIAL_UART_SLAVE()
380+
#ifdef SERIAL_PORT_USBVIRTUAL
381+
RPC_HARDWARE_SERIAL_UART_SLAVE(USB)
389382
#endif
390383

391-
#ifndef ARDUINO_ARCH_SAM
384+
#ifdef ARDUINO_ARCH_AVR
392385
class rpc_software_serial_uart_master : public rpc_master
393386
{
394387
public:
@@ -418,7 +411,7 @@ class rpc_software_serial_uart_slave : public rpc_slave
418411
SoftwareSerial __serial;
419412
rpc_software_serial_uart_slave(const rpc_software_serial_uart_slave &);
420413
};
421-
#endif // ARDUINO_ARCH_SAM
414+
#endif // ARDUINO_ARCH_AVR
422415

423416
} // namespace openmv
424417

0 commit comments

Comments
 (0)