power output fix, added ci builds

Author: ryankurte

.travis.yml

@@ -1,6 +1,5 @@
 language: rust
 cache: cargo
-
 matrix:
   include:
   - env: TARGET=x86_64-unknown-linux-gnu
@@ -10,24 +9,32 @@ matrix:
     addons:
       apt:
         packages:
-          - libc6-i386
-          - libc6-dev-i386
-          - gcc-arm-linux-gnueabihf
-          - libc6-armhf-cross
-          - libc6-dev-armhf-cross
-
+        - libc6-i386
+        - libc6-dev-i386
+        - gcc-arm-linux-gnueabihf
+        - libc6-armhf-cross
+        - libc6-dev-armhf-cross
 install:
 - cargo fetch
 - rustup target add armv7-unknown-linux-gnueabihf
 - rustup component add rustfmt
-
-script: 
-  - cargo build && cargo test && cargo build --target=$TARGET --release
-
-before_deploy: 
-  - "tar -cvf target/sx128-$TARGET-$TRAVIS_TAG.tgz -C target/$TARGET/release/ sx127x-util || return 0" 
+script:
+- cargo build && cargo test && cargo build --target=$TARGET --release
+before_deploy:
+- tar -cvf target/sx127x-$TARGET-$TRAVIS_TAG.tgz -C target/$TARGET/release/ sx127x-util
 
 notifications:
   email:
     on_success: never
     on_failure: never
+deploy:
+  provider: releases
+  api_key:
+    secure: KwL6ue3wNTQiUM05SxMUNlcOnlkCHxpZIKRNmpqhdT0F27RxNIl4DD0wcrA9yD1IB2jv+ZOiXeQGgYEu5s/uYpoNul9lEk3K3UxxxnzKxKH/ByaeiPnlzymBnaN47QFcjFEk5uY8eLHdtXzk6Ku6YbmSJ4uS2WSq3+Q/hnS2od/jqGi2aYy/RBHrS7oFirpcEDYQWfBDftn8vRtVSVPrv+kdBV1qKI5GhP7nodApC3g/LJHeoXHfJo9gxf4PxyCsrFKrjWvUPVkHAq62+J2ETzWNupMYpj8t23Ip+1KxTQd2MLL2epUggTvLA6nunwI3877Trjy76b4F1Ic72GD1WbL3o4UXG/9QRfAGXfjfDnp2W52v0L9uW9URF4qmBI1NY0lceQOmaSyYSJz/4xMV6Txbx+MPoISpsgVsdieMkRFUPo9cm/Lj4+TTgbLVXl2iNZU6H9ezbkx8K0gdrqGZIUJmpsPmONl7nqSNKHHtmyE0xME6TlRDwHWnLizRe4XfoIN89Fj3IM9I6AHx96gK8T7SRWBhIyVsJmuM13E1rbmKyaamB7onBjbay2rXeeO89f2uqvRBjcdsMecH85uUw0H5DnC4mPBJE8bGHnwm3sHx25a6ZP+vBS/Dza33Nqodh3KgNDOPSEK15Vn7+zB5Z5YhERhiL81bke3NF2irSko=
+  file: target/*.tgz
+  file_glob: true
+  skip_cleanup: true
+  on:
+    tags: true
+  on:
+    repo: ryankurte/rust-radio-sx127x

src/lora.rs

@@ -173,9 +173,7 @@ where
         let mut power = power;
 
         // Limit to viable input range
-        if power > 15 {
-            power = 15;
-        }
+        let power = core::cmp::min(power, 15);
 
         // Read from config to determine PA mode
         let config = self.read_reg(regs::Common::PACONFIG)?;
@@ -184,7 +182,7 @@ where
             PASELECT_RFO => {
                 let max = (config & MAXPOWER_MASK) >> MAXPOWER_SHIFT;
 
-                let power = core::cmp::max(power, 17u8);
+                let power = core::cmp::min(power, 17u8);
                 let value = power - max + 15;
 
                 let v = self.update_reg(regs::Common::PACONFIG, OUTPUTPOWER_MASK, value)?;
@@ -193,7 +191,7 @@ where
             },
             PASELECT_PA_BOOST => {
 
-                let power = core::cmp::max(power, 20u8);
+                let power = core::cmp::min(power, 20u8);
                 let value = power - 17 + 15;
 
                 self.update_reg(regs::Common::PACONFIG, OUTPUTPOWER_MASK, value)?;

src/util/main.rs

@@ -27,8 +27,13 @@ use radio_sx127x::prelude::*;
 #[derive(StructOpt)]
 #[structopt(name = "Sx127x-util")]
 /// A Command Line Interface (CLI) for interacting with a local Sx127x radio device
-/// Configuration 1:  --spi=/dev/spidev0.0 --cs-pin 16 --rst-pin 17 --busy-pin 5
-/// Configuration 2:  --spi=/dev/spidev0.0 --cs-pin 13 --rst-pin 18 --busy-pin 8
+/// 
+/// Configuration 1:  --cs-pin 16 --rst-pin 17 --busy-pin 5
+/// 
+/// Configuration 2:  --cs-pin 13 --rst-pin 18 --busy-pin 8
+/// 
+/// Configuration 3:  --cs-pin 8 --rst-pin 17 --busy-pin 5
+/// 
 pub struct Options {
 
     #[structopt(subcommand)]
@@ -52,19 +57,10 @@ pub struct Options {
     #[structopt(long = "busy-pin", default_value = "5", env = "SX127X_BUSY")]
     busy: u64,
 
-    /// DIO1 pin
-    #[structopt(long = "dio1-pin", default_value = "20", env = "SX127X_DIO1")]
-    dio1: u64,
-
-    /// DIO2 pin
-    #[structopt(long = "dio2-pin", default_value = "23", env = "SX127X_DIO2")]
-    _dio2: u64,
-
     /// Baud rate setting
     #[structopt(long = "baud", default_value = "1000000", env = "SX127X_BAUD")]
     baud: u32,
 
-
     #[structopt(long = "log-level", default_value = "info")]
     /// Enable verbose logging
     level: LevelFilter,
@@ -147,7 +143,7 @@ fn main() {
     // Connect to hardware
     let mut spi = Spidev::open(opts.spi).expect("error opening spi device");
     let mut config = spidev::SpidevOptions::new();
-    config.mode(spidev::SPI_MODE_0);
+    config.mode(spidev::SPI_MODE_0 | spidev::SPI_NO_CS);
     config.max_speed_hz(opts.baud);
     spi.configure(&config).expect("error configuring spi device");
 
@@ -165,11 +161,6 @@ fn main() {
     busy.export().expect("error exporting busy pin");
     busy.set_direction(Direction::Out).expect("error setting busy pin direction");
 
-    let dio1 = PinDev::new(opts.dio1);
-    dio1.export().expect("error exporting dio1 pin");
-    dio1.set_direction(Direction::Out).expect("error setting dio1 pin direction");
-
-
     debug!("Creating radio instance");
 
     let settings = Settings::default();
@@ -247,4 +238,6 @@ fn main() {
         //_ => warn!("unsuppored command: {:?}", opts.command),
     }
 
+
+
 }