From 6d82563327b4658e8c31a898be609aad280efdad Mon Sep 17 00:00:00 2001
From: Robert Hedman <robert.hedman@mac.com>
Date: Sun, 26 Nov 2017 23:34:18 +0100
Subject: [PATCH] added port and address constants
---
src/main.rs | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index 53b0cd1..15d2468 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,6 +16,12 @@ use serial::prelude::*;
//use std::str;
+
+// constants
+
+const LIDAR_ADDRESS: &str = "127.0.0.1:8080";
+const COUNTER_SERIAL_PORT: &str = "/dev/cu.usbmodem41";
+
// should the map matrix be two dim array of const size, vecs of dynamic, or what?
@@ -25,7 +31,7 @@ const COLS: usize = 100;
fn main() {
// dummy thread for replacing lidar
let server = thread::spawn(|| {
- let listener = TcpListener::bind("127.0.0.1:8080").unwrap();
+ let listener = TcpListener::bind(LIDAR_ADDRESS).unwrap();
let mut stream;
let mut message = [0u8; 2];
match listener.accept() {
@@ -60,8 +66,7 @@ fn main() {
println!("Tracker started.");
let mut serial_buf: [u8; 8] = [0; 8];
- let device = String::from("/dev/cu.usbmodem41");
- let mut port = serial::open(&device).unwrap();
+ let mut port = serial::open(&COUNTER_SERIAL_PORT).unwrap();
interact(&mut port).unwrap();
@@ -111,7 +116,7 @@ fn main() {
let mut pos: (i32, i32); //= (0,0);
// set up connection to lidar
- let mut stream = TcpStream::connect("127.0.0.1:8080").unwrap();
+ let mut stream = TcpStream::connect(&LIDAR_ADDRESS).unwrap();
let mut lidar_buf: [u8; 2] = [0; 2];
// main loop for this thread
--
GitLab