MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RPi: Fix RFM95 build (#654)

Browse Source
This commit is contained in:
Marcelo Aquino
2016-11-24 15:59:01 +01:00
committed by Olivier
parent 66599c0b23
commit 9ef1df5407
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+11 -2
View File
@@ -53,7 +53,7 @@ MySensors options:
MQTT publish topic prefix. MQTT publish topic prefix.
--my-mqtt-subscribe-topic-prefix=<PREFIX> --my-mqtt-subscribe-topic-prefix=<PREFIX>
MQTT subscribe topic prefix. MQTT subscribe topic prefix.
--my-transport=[none|nrf24|rs485] --my-transport=[none|nrf24|rs485|rfm95]
Transport type, set to none to disable transport feature. [nrf24] Transport type, set to none to disable transport feature. [nrf24]
--my-rf24-channel=<0-125> RF channel for the sensor net, 0-125. [76] --my-rf24-channel=<0-125> RF channel for the sensor net, 0-125. [76]
--my-rf24-pa-level=[RF24_PA_MAX|RF24_PA_LOW] --my-rf24-pa-level=[RF24_PA_MAX|RF24_PA_LOW]
@@ -396,10 +396,19 @@ elif [[ ${gateway_type} == "mqtt" ]]; then
CPPFLAGS="-DMY_GATEWAY_LINUX -DMY_GATEWAY_MQTT_CLIENT $CPPFLAGS" CPPFLAGS="-DMY_GATEWAY_LINUX -DMY_GATEWAY_MQTT_CLIENT $CPPFLAGS"
fi fi
if [[ ${transport_type} == "nrf24" ]]; then if [[ ${transport_type} == "none" ]]; then
# Transport disabled
:
elif [[ ${transport_type} == "nrf24" ]]; then
CPPFLAGS="-DMY_RADIO_NRF24 $CPPFLAGS" CPPFLAGS="-DMY_RADIO_NRF24 $CPPFLAGS"
elif [[ ${transport_type} == "rs485" ]]; then elif [[ ${transport_type} == "rs485" ]]; then
CPPFLAGS="-DMY_RS485 $CPPFLAGS" CPPFLAGS="-DMY_RS485 $CPPFLAGS"
elif [[ ${transport_type} == "rfm95" ]]; then
CPPFLAGS="-DMY_RADIO_RFM95 $CPPFLAGS"
else
echo "Invalid transport type."
echo "Aborting."
exit 1
fi fi
LDFLAGS="-pthread $LDFLAGS" LDFLAGS="-pthread $LDFLAGS"
drivers/RFM95/RFM95.cpp
+6 -4
View File
@@ -179,7 +179,7 @@ LOCAL void RFM95_interruptHandler(void) {
(void)RFM95_setRadioMode(RFM95_RADIO_MODE_STDBY); (void)RFM95_setRadioMode(RFM95_RADIO_MODE_STDBY);
// Have received a packet // Have received a packet
//In order to retrieve received data from FIFO the user must ensure that ValidHeader, PayloadCrcError, RxDone and RxTimeout interrupts in the status register RegIrqFlags are not asserted to ensure that packet reception has terminated successfully(i.e.no flags should be set). //In order to retrieve received data from FIFO the user must ensure that ValidHeader, PayloadCrcError, RxDone and RxTimeout interrupts in the status register RegIrqFlags are not asserted to ensure that packet reception has terminated successfully(i.e.no flags should be set).
const uint8_t bufLen = min(RFM95_readReg(RFM95_REG_13_RX_NB_BYTES), RFM95_MAX_PACKET_LEN); const uint8_t bufLen = min(RFM95_readReg(RFM95_REG_13_RX_NB_BYTES), (uint8_t)RFM95_MAX_PACKET_LEN);
if (bufLen >= RFM95_HEADER_LEN) { if (bufLen >= RFM95_HEADER_LEN) {
// Reset the fifo read ptr to the beginning of the packet // Reset the fifo read ptr to the beginning of the packet
RFM95_writeReg(RFM95_REG_0D_FIFO_ADDR_PTR, RFM95_readReg(RFM95_REG_10_FIFO_RX_CURRENT_ADDR)); RFM95_writeReg(RFM95_REG_0D_FIFO_ADDR_PTR, RFM95_readReg(RFM95_REG_10_FIFO_RX_CURRENT_ADDR));
@@ -277,7 +277,7 @@ LOCAL bool RFM95_sendFrame(const uint8_t recipient, uint8_t* data, const uint8_t
packet.header.sender = RFM95.address; packet.header.sender = RFM95.address;
packet.header.recipient = recipient; packet.header.recipient = recipient;
packet.header.controlFlags = 0x00; packet.header.controlFlags = 0x00;
packet.payloadLen = min(len, RFM95_MAX_PAYLOAD_LEN); packet.payloadLen = min(len, (const uint8_t)RFM95_MAX_PAYLOAD_LEN);
packet.header.controlFlags = flags; packet.header.controlFlags = flags;
memcpy(&packet.payload, data, packet.payloadLen); memcpy(&packet.payload, data, packet.payloadLen);
return RFM95_send(packet); return RFM95_send(packet);
@@ -292,8 +292,8 @@ LOCAL void RFM95_setFrequency(const float centre) {
LOCAL bool RFM95_setTxPower(uint8_t powerLevel) { LOCAL bool RFM95_setTxPower(uint8_t powerLevel) {
// RFM95/96/97/98 does not have RFO pins connected to anything. Only PA_BOOST // RFM95/96/97/98 does not have RFO pins connected to anything. Only PA_BOOST
powerLevel = max(RFM95_MIN_POWER_LEVEL_DBM, powerLevel); powerLevel = max((uint8_t)RFM95_MIN_POWER_LEVEL_DBM, powerLevel);
powerLevel = min(RFM95_MAX_POWER_LEVEL_DBM, powerLevel); powerLevel = min((uint8_t)RFM95_MAX_POWER_LEVEL_DBM, powerLevel);
if (powerLevel != RFM95.powerLevel) { if (powerLevel != RFM95.powerLevel) {
RFM95.powerLevel = powerLevel; RFM95.powerLevel = powerLevel;
uint8_t val; uint8_t val;
@@ -414,6 +414,8 @@ LOCAL bool RFM95_executeATC(const rfm95_RSSI_t currentRSSI, const rfm95_RSSI_t t
} }
LOCAL bool RFM95_sendWithRetry(const uint8_t recipient, const void* buffer, const uint8_t bufferSize, const uint8_t retries, const uint32_t retryWaitTime) { LOCAL bool RFM95_sendWithRetry(const uint8_t recipient, const void* buffer, const uint8_t bufferSize, const uint8_t retries, const uint32_t retryWaitTime) {
(void)retryWaitTime;
for (uint8_t retry = 0; retry < retries; retry++) { for (uint8_t retry = 0; retry < retries; retry++) {
RFM95_DEBUG(PSTR("RFM95:SWR:SEND TO=%d,RETRY=%d\n"), recipient, retry); RFM95_DEBUG(PSTR("RFM95:SWR:SEND TO=%d,RETRY=%d\n"), recipient, retry);
rfm95_flag_t flags = 0x00; rfm95_flag_t flags = 0x00;