third-party
/
HamShield
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix dangermode

This commit is contained in:
morgan 2016-04-17 17:19:33 -07:00
parent 5f363f1537
commit 0011026567
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
HamShield.cpp
View File

@ -121,6 +121,11 @@ volatile long bouncer = 0;
HamShield::HamShield() { HamShield::HamShield() {
devAddr = A1846S_DEV_ADDR_SENLOW; devAddr = A1846S_DEV_ADDR_SENLOW;
sHamShield = this; sHamShield = this;
pinMode(A1, OUTPUT);
digitalWrite(A1, HIGH);
pinMode(A4, OUTPUT);
pinMode(A5, OUTPUT);
} }
/** Specific address constructor. /** Specific address constructor.
@ -131,6 +136,11 @@ HamShield::HamShield() {
*/ */
HamShield::HamShield(uint8_t address) { HamShield::HamShield(uint8_t address) {
devAddr = address; devAddr = address;
pinMode(A1, OUTPUT);
digitalWrite(A1, HIGH);
pinMode(A4, OUTPUT);
pinMode(A5, OUTPUT);
} }
/** Power on and prepare for general usage. /** Power on and prepare for general usage.
@ -142,11 +152,6 @@ void HamShield::initialize() {
uint16_t tx_data; uint16_t tx_data;
pinMode(A1, OUTPUT);
digitalWrite(A1, HIGH);
pinMode(A4, OUTPUT);
pinMode(A5, OUTPUT);
// reset all registers in A1846S // reset all registers in A1846S
softReset(); softReset();
@ -485,12 +490,16 @@ bool HamShield::getRX(){
void HamShield::setModeTransmit(){ void HamShield::setModeTransmit(){
// check to see if we should allow them to do this // check to see if we should allow them to do this
if(restrictions == true) { if(restrictions == true) {
if((radio_frequency > 139999) & (radio_frequency < 148001)) { setRX(false); } if(((radio_frequency > 139999) & (radio_frequency < 148001)) ||
if((radio_frequency > 218999) & (radio_frequency < 225001)) { setRX(false); } ((radio_frequency > 218999) & (radio_frequency < 225001)) ||
if((radio_frequency > 419999) & (radio_frequency < 450001)) { setRX(false); } ((radio_frequency > 419999) & (radio_frequency < 450001)))
} else { { // we're good, so just drop down to the rest of this function
setTX(true); } else {
} setRX(false);
return;
}
}
setTX(true);
} }
void HamShield::setModeReceive(){ void HamShield::setModeReceive(){
// turn on rx, turn off tx // turn on rx, turn off tx
@ -995,7 +1004,7 @@ bool HamShield::getPreDeEmphEnabled(){
int16_t HamShield::readRSSI(){ int16_t HamShield::readRSSI(){
HSreadBitsW(devAddr, A1846S_RSSI_REG, A1846S_RSSI_BIT, A1846S_RSSI_LENGTH, radio_i2c_buf); HSreadBitsW(devAddr, A1846S_RSSI_REG, A1846S_RSSI_BIT, A1846S_RSSI_LENGTH, radio_i2c_buf);
int16_t rssi = (radio_i2c_buf[0] & 0xFF); // - 137; int16_t rssi = (radio_i2c_buf[0] & 0xFF) - 137;
return rssi; return rssi;
} }
uint16_t HamShield::readVSSI(){ uint16_t HamShield::readVSSI(){