GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 09:37:36 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Denny
2018-08-03 07:57:58 -04:00
parent 04144ca677 d3c7a50918
commit b90b06e600
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/io/github/dsheirer/source/tuner/rtl/RTL2832TunerController.java
View File

@@ -51,13 +51,11 @@ public abstract class RTL2832TunerController extends USBTunerController
private final static Logger mLog = LoggerFactory.getLogger(RTL2832TunerController.class); private final static Logger mLog = LoggerFactory.getLogger(RTL2832TunerController.class);
public final static int TWO_TO_22_POWER = 4194304; public final static int TWO_TO_22_POWER = 4194304;
public final static int USB_TRANSFER_BUFFER_SIZE_HIGH_SAMPLE_RATE = 131072; public final static int USB_TRANSFER_BUFFER_SIZE_HIGH_SAMPLE_RATE = 131072;
public final static int USB_TRANSFER_BUFFER_SIZE_LOW_SAMPLE_RATE = 32768; public final static int USB_TRANSFER_BUFFER_SIZE_LOW_SAMPLE_RATE = 16384;
public final static byte USB_INTERFACE = (byte) 0x0; public final static byte USB_INTERFACE = (byte) 0x0;
public final static byte CONTROL_ENDPOINT_IN = (byte) (LibUsb.ENDPOINT_IN | LibUsb.REQUEST_TYPE_VENDOR); public final static byte CONTROL_ENDPOINT_IN = (byte) (LibUsb.ENDPOINT_IN | LibUsb.REQUEST_TYPE_VENDOR);
public final static byte CONTROL_ENDPOINT_OUT = (byte) (LibUsb.ENDPOINT_OUT | LibUsb.REQUEST_TYPE_VENDOR); public final static byte CONTROL_ENDPOINT_OUT = (byte) (LibUsb.ENDPOINT_OUT | LibUsb.REQUEST_TYPE_VENDOR);
public final static long TIMEOUT_US = 1000000l; //uSeconds public final static long TIMEOUT_US = 1000000l; //uSeconds
public final static byte REQUEST_ZERO = (byte) 0; public final static byte REQUEST_ZERO = (byte) 0;
public final static byte EEPROM_ADDRESS = (byte) 0xA0; public final static byte EEPROM_ADDRESS = (byte) 0xA0;
@@ -1255,9 +1253,7 @@ public abstract class RTL2832TunerController extends USBTunerController
private int mRate; private int mRate;
private String mLabel; private String mLabel;
private SampleRate(int ratioHigh, private SampleRate(int ratioHigh, int rate, String label)
int rate,
String label)
{ {
mRatioHigh = ratioHigh; mRatioHigh = ratioHigh;
mRate = rate; mRate = rate;
@@ -1318,7 +1314,7 @@ public abstract class RTL2832TunerController extends USBTunerController
private int mCheckAddress; private int mCheckAddress;
private int mCheckValue; private int mCheckValue;
private TunerTypeCheck(int i2c, int address, int value) TunerTypeCheck(int i2c, int address, int value)
{ {
mI2CAddress = i2c; mI2CAddress = i2c;
mCheckAddress = address; mCheckAddress = address;