.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: ['peterus']
+custom: ['paypal.me/peterus07']

.github/workflows/build_check.yml

@@ -0,0 +1,57 @@
+name: Build check and build
+
+on: [push, pull_request]
+
+jobs:
+  PlatformIO-Check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: ${{ runner.os }}-pip-
+      - name: Cache PlatformIO
+        uses: actions/cache@v2
+        with:
+          path: ~/.platformio
+          key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+      - name: Set up Python
+        uses: actions/setup-python@v2
+      - name: Install PlatformIO
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade platformio
+      - name: Run PlatformIO Check
+        run: platformio check --fail-on-defect low --fail-on-defect medium --fail-on-defect high
+
+  PlatformIO-Build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        example: [examples/decoder, examples/simple_aprs, examples/simple_fixed_position]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: ${{ runner.os }}-pip-
+      - name: Cache PlatformIO
+        uses: actions/cache@v2
+        with:
+          path: ~/.platformio
+          key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+      - name: Set up Python
+        uses: actions/setup-python@v2
+      - name: Install PlatformIO
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade platformio
+      - name: Run PlatformIO CI
+        run: platformio ci --lib="." -c ci_platformio.ini
+        env:
+          PLATFORMIO_CI_SRC: ${{ matrix.example }}

ci_platformio.ini

@@ -0,0 +1,15 @@
+[env]
+lib_deps =
+	APRS-Decoder-Lib @ 0.0.6
+	peterus/esp-logger @ 0.0.1
+	NTPClient
+
+[env:ttgo-lora32-v1]
+platform = espressif32
+framework = arduino
+board = ttgo-lora32-v1
+
+[env:d1_mini]
+platform = espressif8266
+framework = arduino
+board = d1_mini

library.json

@@ -0,0 +1,20 @@
+{
+	"name": "APRS-IS-Lib",
+	"keywords": "aprs, aprs-is, hamradio, lora",
+	"description": "This library will provide an simple interface to the APRS-Servers with the help of APRS-IS.",
+	"authors":
+	[
+		{
+			"name": "Peter Buchegger",
+			"email": "peter@pbuchegger.at"
+		}
+	],
+	"repository":
+	{
+		"type": "git",
+		"url": "https://github.com/lora-aprs/APRS-IS-Lib.git"
+	},
+	"version": "0.0.8",
+	"frameworks": "arduino",
+	"platforms": "espressif"
+}

library.properties

@@ -1,11 +1,11 @@
 name=APRS-IS-Lib
-version=0.0.5
+version=0.0.8
 author=Peter Buchegger <peter@pbuchegger.at>
 maintainer=Peter Buchegger <peter@pbuchegger.at>
 sentence=APRS-IS library for ESP32
 paragraph=This library will provide an simple interface to the APRS-Servers with the help of APRS-IS.
 category=Communication
-url=https://github.com/peterus/APRS-IS-Lib
+url=https://github.com/lora-aprs/APRS-IS-Lib
 architectures=*
 includes=APRS-IS.h
 depends=

platformio.ini

@@ -0,0 +1,8 @@
+[env:native]
+platform = native
+lib_compat_mode = off
+test_build_project_src = yes
+lib_deps = https://github.com/peterus/UnixHostDuino
+check_tool = cppcheck
+check_flags =
+	cppcheck: --suppress=*:*.pio\* --suppress=unusedFunction

src/APRS-IS.cpp

@@ -1,3 +1,4 @@
+#include <logger.h>
 #include "APRS-IS.h"
 
 APRS_IS::APRS_IS(const String & user, const String & passcode, const String & tool_name, const String & version)
@@ -8,24 +9,39 @@ APRS_IS::APRS_IS(const String & user, const String & passcode, const String & to
 bool APRS_IS::connect(const String & server, const int port)
 {
 	const String login = "user " + _user + " pass " + _passcode + " vers " + _tool_name + " " + _version + "\n\r";
-	return connect_(server, port, login);
+	return _connect(server, port, login);
 }
 
 bool APRS_IS::connect(const String & server, const int port, const String & filter)
 {
 	const String login = "user " + _user + " pass " + _passcode + " vers " + _tool_name + " " + _version + " filter " + filter + "\n\r";
-	return connect_(server, port, login);
+	return _connect(server, port, login);
 }
 
-bool APRS_IS::connect_(const String & server, const int port, const String & login_line)
+bool APRS_IS::_connect(const String & server, const int port, const String & login_line)
 {
 	if(!_client.connect(server.c_str(), port))
 	{
+		logPrintlnE("Something went wrong on connecting! Is the server reachable?");
 		return false;
 	}
 	sendMessage(login_line);
-	// TODO: implement check if auth was successfull!
-	//while(!available());
+	while(true)
+	{
+		String line = _client.readStringUntil('\n');
+		if(line.indexOf("logresp") != -1)
+		{
+			if(line.indexOf("unverified") == -1)
+			{
+				return true;
+			}
+			else
+			{
+				logPrintlnE("User can not be verified with passcode!");
+				return false;
+			}
+		}
+	}
 	return true;
 }
 
@@ -34,16 +50,24 @@ bool APRS_IS::connected()
 	return _client.connected();
 }
 
-bool APRS_IS::sendMessage(const String & package)
+bool APRS_IS::sendMessage(const String & message)
+{
+	if(!connected())
+	{
+		return false;
+	}
+	_client.println(message);
+	return true;
+}
+
+bool APRS_IS::sendMessage(const std::shared_ptr<APRSMessage> message)
 {
-	if(connected())
+	if(!connected())
 	{
-		_client.println(package);
-		Serial.print("--> ");
-		Serial.println(package);
-		return true;
+		return false;
 	}
-	return false;
+	_client.println(message->encode() + "\n");
+	return true;
 }
 
 int APRS_IS::available()
@@ -60,3 +84,24 @@ String APRS_IS::getMessage()
 	}
 	return line;
 }
+
+std::shared_ptr<APRSMessage> APRS_IS::getAPRSMessage()
+{
+	String line;
+	if (_client.available() > 0)
+	{
+		line = _client.readStringUntil('\n');
+	}
+	if(line.startsWith("#"))
+	{
+		logPrintlnD(line);
+		return 0;
+	}
+	if(line.length() == 0)
+	{
+		return 0;
+	}
+    std::shared_ptr<APRSMessage> msg = std::shared_ptr<APRSMessage>(new APRSMessage());
+	msg->decode(line);
+	return msg;
+}

src/APRS-IS.h

@@ -7,6 +7,7 @@
 #else
 #include <WiFi.h>
 #endif
+#include <APRS-Decoder.h>
 
 class APRS_IS
 {
@@ -15,21 +16,24 @@ class APRS_IS
 
 	bool connect(const String & server, const int port);
 	bool connect(const String & server, const int port, const String & filter);
-	bool connect_(const String & server, const int port, const String & login_line);
 	bool connected();
 
-	bool sendMessage(const String & package);
+	bool sendMessage(const String & message);
+	bool sendMessage(const std::shared_ptr<APRSMessage> message);
 
 	int available();
 
 	String getMessage();
+	std::shared_ptr<APRSMessage> getAPRSMessage();
 
 private:
 	const String _user;
 	const String _passcode;
 	const String _tool_name;
 	const String _version;
 	WiFiClient _client;
+
+	bool _connect(const String & server, const int port, const String & login_line);
 };
 
 #endif