From 549fb91d5d927018a5841d72b986c18bca010ac5 Mon Sep 17 00:00:00 2001 From: Georg Lukas Date: Sat, 24 Sep 2016 18:46:02 +0200 Subject: [PATCH] DB: new log type 'TX' for outgoing non-APRS data like TNC init --- src/PostListAdapter.scala | 6 +++--- src/StorageDatabase.scala | 2 ++ src/backend/UsbTnc.scala | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/PostListAdapter.scala b/src/PostListAdapter.scala index 24a040e..f73647c 100644 --- a/src/PostListAdapter.scala +++ b/src/PostListAdapter.scala @@ -24,8 +24,8 @@ class PostListAdapter(context : Context) class PostViewBinder extends ViewBinder { - // post, info, error, incoming - val COLORS = Array(0xff30b030, 0xffc0c080, 0xffffb0b0, 0xff8080b0) + // post, info, error, incoming, tx + val COLORS = Array(0xff30b030, 0xffc0c080, 0xffffb0b0, 0xff8080b0, 0xff30b030) override def setViewValue (view : View, cursor : Cursor, columnIndex : Int) : Boolean = { import StorageDatabase.Post._ @@ -36,7 +36,7 @@ class PostViewBinder extends ViewBinder { val v = view.asInstanceOf[TextView] v.setText(m) v.setTextColor(COLORS(t)) - if (t == TYPE_POST || t == TYPE_INCMG) + if (t == TYPE_POST || t == TYPE_INCMG || t == TYPE_TX) v.setTypeface(Typeface.MONOSPACE) else v.setTypeface(Typeface.DEFAULT) diff --git a/src/StorageDatabase.scala b/src/StorageDatabase.scala index 4070f26..5624339 100644 --- a/src/StorageDatabase.scala +++ b/src/StorageDatabase.scala @@ -34,6 +34,8 @@ object StorageDatabase { val TYPE_INFO = 1 val TYPE_ERROR = 2 val TYPE_INCMG = 3 + val TYPE_TX = 4 + val COLUMN_TYPE = 3 val COLUMN_MESSAGE = 5 diff --git a/src/backend/UsbTnc.scala b/src/backend/UsbTnc.scala index dd4ff9c..9292715 100644 --- a/src/backend/UsbTnc.scala +++ b/src/backend/UsbTnc.scala @@ -163,8 +163,8 @@ class UsbTnc(service : AprsService, prefs : PrefsWrapper) extends AprsBackend(pr val initstring = java.net.URLDecoder.decode(prefs.getString("usb.init", ""), "UTF-8") val initdelay = prefs.getStringInt("usb.delay", 300) if (initstring != null && initstring != "") { - log("Sending init: " + initstring) for (line <- initstring.split("\n")) { + log(initstring) os.write(line.getBytes()) os.write('\r') os.write('\n')