From 92f7a55b1c2111027e12b0b1958782afb5bec47d Mon Sep 17 00:00:00 2001
From: Yuval Adam <_@yuv.al>
Date: Sun, 29 Jul 2018 13:32:39 +0300
Subject: Lower case fields in Device struct

---
 src/devices/fc0013.rs | 8 ++++----
 src/devices/mod.rs    | 9 ++++-----
 src/devices/r820t.rs  | 8 ++++----
 src/lib.rs            | 6 +++---
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/devices/fc0013.rs b/src/devices/fc0013.rs
index bd5ab50..6482eee 100644
--- a/src/devices/fc0013.rs
+++ b/src/devices/fc0013.rs
@@ -1,8 +1,8 @@
 use super::Device;
 
 pub const FC0013: Device = Device {
-    NAME: "Fitipower FC0013",
-    I2C_ADDR: 0xc6,
-    CHECK_ADDR: 0x00,
-    CHECK_VAL: 0xa3
+    name: "Fitipower FC0013",
+    i2c_addr: 0xc6,
+    check_addr: 0x00,
+    check_val: 0xa3
 };
diff --git a/src/devices/mod.rs b/src/devices/mod.rs
index 5221bec..3290f72 100644
--- a/src/devices/mod.rs
+++ b/src/devices/mod.rs
@@ -1,11 +1,10 @@
 pub mod fc0013;
 pub mod r820t;
 
-#[allow(non_snake_case)]
 pub struct Device {
-    pub NAME: &'static str,
-    pub I2C_ADDR: u8,
-    pub CHECK_ADDR: u8,
-    pub CHECK_VAL: u8
+    pub name: &'static str,
+    pub i2c_addr: u8,
+    pub check_addr: u8,
+    pub check_val: u8
 }
 
diff --git a/src/devices/r820t.rs b/src/devices/r820t.rs
index 094816a..70fad38 100644
--- a/src/devices/r820t.rs
+++ b/src/devices/r820t.rs
@@ -1,8 +1,8 @@
 use super::Device;
 
 pub const R820T: Device = Device {
-    NAME: "Rafael Micro R820T",
-    I2C_ADDR: 0x34,
-    CHECK_ADDR: 0x00,
-    CHECK_VAL: 0x69
+    name: "Rafael Micro R820T",
+    i2c_addr: 0x34,
+    check_addr: 0x00,
+    check_val: 0x69
 };
diff --git a/src/lib.rs b/src/lib.rs
index 2bd0de1..b7b43eb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -223,10 +223,10 @@ impl<'a> RtlSdr<'a> {
                     self.set_i2c_repeater(&handle, true);
 
                     for d in &DEVICES {
-                        match self.i2c_read_reg(&handle, d.I2C_ADDR, d.CHECK_ADDR) {
+                        match self.i2c_read_reg(&handle, d.i2c_addr, d.check_addr) {
                             Ok(reg) => {
-                                if reg == d.CHECK_VAL {
-                                    println!("Found {} tuner\n", d.NAME);
+                                if reg == d.check_val {
+                                    println!("Found {} tuner\n", d.name);
                                 }
                             },
                             Err(_) => {}
-- 
cgit v1.3.1