LoRa Access Point 1.5.2018
Dependencies: mbed ds3231 SX1276Lib_LoRa_Access_Point
Diff: RFM95W.cpp
- Revision:
- 6:1ee035ae2a2c
- Parent:
- 5:19b34c4d27a1
- Child:
- 8:5d99fbf255d6
--- a/RFM95W.cpp Mon Apr 30 22:41:48 2018 +0000 +++ b/RFM95W.cpp Tue May 01 11:26:11 2018 +0000 @@ -65,7 +65,7 @@ void RFM95W::SendMessage() { snprintf((char *)ack, 3, "%c%c%c",GATEWAY_ID, sendBuffer[0], messageNumber); - radio.Send( sendBuffer, 15 ); // poslem len 10 bajtov + radio.Send( sendBuffer, 15 ); } void RFM95W::SendAck(uint8_t addr, uint8_t messageNumber) @@ -121,9 +121,8 @@ void RFM95W::OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr ) { radio.Sleep(); -// debug("%d \r\n", payload[0]); if(payload[0] == GATEWAY_ID) { - uint8_t msgFrom = payload[1]; // konverzia na cislo + uint8_t msgFrom = payload[1]; indicationLed=0; ledTicker.attach(callback(this,&RFM95W::OnLedTick), LED_BLIK_PERIOD); if((size == 3) && (strncmp( ( const char* )payload, ( const char* )ack, 3 ) == 0) ) { @@ -141,11 +140,10 @@ pc.printf("MSG from : %c , message number received= %d \r\n",msgFrom,payload[2]); if(payload[2] == messageNumbers[msgFrom]) { pc.printf("--------------------- Ta ista sprava -------------------- \r\n"); -// radio.Rx(0); return; } messageNumbers[msgFrom] = payload[2]; - payload[2] = 48; // ASCII hodnota cisla 0 + payload[2] = 48; memmove(payload, payload+4, size - 4 + 1); // orezem prve styri bajty snprintf((char *)receivedMessage, BUFF_SIZE, "%d|%d|%d|%d|%s|\r\n", rssi, snr, GATEWAY_ID, msgFrom, payload); wifi.SendMessage((char *)receivedMessage);