diff options
author | Nick Van Doorn <vandoorn.nick@gmail.com> | 2018-04-06 11:24:54 -0700 |
---|---|---|
committer | Nick Van Doorn <vandoorn.nick@gmail.com> | 2018-04-06 11:24:54 -0700 |
commit | e000fd2750b725b1f62ba5712e01d860b559811a (patch) | |
tree | 9c6d5bf152671d493a39f361c32adf087667a6d9 | |
parent | 195bf959d81b157456a66353da1946a7b51cbe33 (diff) |
Make serial device configurable
-rw-r--r-- | camera.c | 4 | ||||
-rw-r--r-- | camera.h | 7 |
2 files changed, 5 insertions, 6 deletions
@@ -111,8 +111,8 @@ int fd_openSerial(const char* device, int baud) { /** * Open a serial connection to the camera */ -int fd_openCam() { - return fd_openSerial(TTY_PATH, CAM_BAUD_RATE); +int fd_openCam(char* devPath) { + return fd_openSerial(devPath, CAM_BAUD_RATE); } /** @@ -47,9 +47,8 @@ #define CAM_BAUD_RATE 38400 #define TTY_TIMEOUT 5000 -static const char TTY_PATH[] = "/dev/ttyHS0"; - typedef struct { + char devPath[256]; int fd; // file descriptor for the serial port uint8_t serialNum; // camera serial number uint8_t buff[CAM_BUFF_SIZE]; // uint8_t array to store camera data @@ -124,8 +123,8 @@ void cam_sendCommand(Camera* cam, uint8_t cmd, uint8_t args[], uint8_t nArgs); int fd_dataAvail(int fd, int* data); ssize_t fd_getByte(int fd, uint8_t* data); LE_SHARED int fd_closeCam(int fd); -LE_SHARED int fd_openCam(); +LE_SHARED int fd_openCam(char* devPath); int fd_openSerial(const char* device, int baud); speed_t fd_convertBaud(int baud); -#endif
\ No newline at end of file +#endif |