diff --git a/src/Lora_APRS_iGate_DIY.cpp b/src/Lora_APRS_iGate_DIY.cpp index 8cb2c9b..aab2a46 100644 --- a/src/Lora_APRS_iGate_DIY.cpp +++ b/src/Lora_APRS_iGate_DIY.cpp @@ -70,12 +70,12 @@ void connect_and_upload_to_APRS_IS(String packet) { } else { Serial.println("Connected with server: " + String(SERVER) + " APRSPORT: " + String(APRSPORT)); while (espClient.connected()) { - delay(1000); - aprsauth = "user " + callsign_igate + " pass " + passcode_igate + "\n"; //info igate + delay(200); + aprsauth = "user " + iGate_Callsign + " pass " + passcode_igate + "\n"; //info igate espClient.write(aprsauth.c_str()); //Serial.println("Run client.connected()"); - delay(500); + delay(200); espClient.write(packet.c_str()); //Serial.println("Send client.write=" + aprsauth); - delay(500); //Serial.println("Send espClient.write = " + packet_para_APRS_IS); + delay(200); //Serial.println("Send espClient.write = " + packet_para_APRS_IS); Serial.println("Packet uploaded =)\n"); espClient.stop(); espClient.flush(); //Serial.println("(Telnet client disconnect)\n"); @@ -91,7 +91,7 @@ void procesa_y_sube_APRS_IS(String mensaje) { int posicion_dos_puntos = mensaje.indexOf(':'); callsign_y_path_tracker = mensaje.substring(3, posicion_dos_puntos); payload_tracker = mensaje.substring(posicion_dos_puntos); - packet_para_APRS_IS = callsign_y_path_tracker + ",qAO," + callsign_igate + payload_tracker + "\n"; + packet_para_APRS_IS = callsign_y_path_tracker + ",qAO," + iGate_Callsign + payload_tracker + "\n"; //Serial.print("Mensaje APRS_IS : "); Serial.println(packet_para_APRS_IS); //packet = "CD2RXU-9>APLT00,qAO,CD2RXU-10:=" + LAT + "/" + LON + ">" + "\n"; // ejemplo!!! connect_and_upload_to_APRS_IS(packet_para_APRS_IS); @@ -122,18 +122,25 @@ void loop() { String mensaje_recibido = ""; String mensaje_beacon_estacion = IGATE + ">APLG01,TCPIP*,qAC,T2BRAZIL:=" + LAT + "L" + LON + "&" + Mensaje_iGate+ "\n"; // uint32_t lastTx = millis() - lastTxTime; - bool valida_inicio; + bool beacon_update = true; + int packetSize = LoRa.parsePacket(); if (packetSize) { while (LoRa.available()) { int inChar = LoRa.read(); mensaje_recibido += (char)inChar; } - valida_y_procesa_packet(mensaje_recibido); //Serial.println("Mensaje Recibido : " + String(mensaje_recibido)); + valida_y_procesa_packet(mensaje_recibido); //Serial.println("Mensaje Recibido : " + String(mensaje_recibido)); } + if (lastTx >= txInterval) { + beacon_update = true; + } + + if (beacon_update) { Serial.println("enviando Beacon Estacion/iGate"); connect_and_upload_to_APRS_IS(mensaje_beacon_estacion); lastTxTime = millis(); - } + beacon_update = false; + } } \ No newline at end of file diff --git a/src/iGate_config.h b/src/iGate_config.h index c4b66f2..2fcad84 100644 --- a/src/iGate_config.h +++ b/src/iGate_config.h @@ -3,10 +3,10 @@ #include -#define WIFI_SSID "Richon" -#define WIFI_PASSWORD "k4fPnmg5qnyf" +#define WIFI_SSID "Richon" +#define WIFI_PASSWORD "k4fPnmg5qnyf" -String callsign_igate = "CD2RXU-10"; +String iGate_Callsign = "CD2RXU-10"; String passcode_igate = "23201"; const String SERVER = "brazil.aprs2.net"; // write the address of the aprs server diff --git a/src/pins_config.h b/src/pins_config.h index e7541b3..040348c 100644 --- a/src/pins_config.h +++ b/src/pins_config.h @@ -4,12 +4,12 @@ #include -#define LORA_SCK 5 // GPIO5 - SX1276 SCK -#define LORA_MISO 19 // GPIO19 - SX1276 MISO -#define LORA_MOSI 27 // GPIO27 - SX1276 MOSI -#define LORA_CS 18 // GPIO18 - SX1276 CS ---> NSS -#define LORA_RST 14 // GPIO14 - SX1276 RST -#define LORA_IRQ 26 // GPIO26 - SX1276 IRQ ---->DIO0 +#define LORA_SCK 5 +#define LORA_MISO 19 +#define LORA_MOSI 27 +#define LORA_CS 18 +#define LORA_RST 14 +#define LORA_IRQ 26 /* SX1278-------------------> ESP32