Merge pull request #27 from bromptonista/master

Fix typos, spelling mistakes and add info about prebuilt apk

README.md

@@ -50,6 +50,7 @@ Create local.properties file in root dir, it should be looking like that:
    ```
    app/build/outputs/apk/app-debug.apk is your apk.
 
+   ## Now available in [f-droid](https://f-droid.org/repository/browse/?fdfilter=simplert&fdid=com.viper.simplert)
    A prebuilt apk can also be found under `Downloads` at the [Github releases](https://github.com/iteratec/SimpleRT/releases)
    tab.
 
@@ -60,9 +61,9 @@ Create local.properties file in root dir, it should be looking like that:
    - libresolv (usually already present in both linux and macos)
    - tuntap kernel module (linux version), utun (macos version, builtin)
 
-   before build (debian based example):
+   before build (debian-based example):
    ```
-   sudo apt-get install build-essential pkg-config libusb-1.0-0-dev
+   sudo apt install build-essential pkg-config libusb-1.0-0-dev
    ```
 
    Makefile is universal for all platforms, just type "make && make install" to install it in prefix /usr/local and
@@ -73,7 +74,7 @@ Create local.properties file in root dir, it should be looking like that:
 
 Usage:
 
-- run console util as root
+- run console util as root (sudo simple-rt). The iface_up.sh file needs to be present in the application folder.
 - connect your android device
 
 First connection requires some trivial steps:

simple-rt-android/app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">SimpleRT</string>
     <string name="title_activity_main">MainActivity</string>
-    <string name="accessory_error">Seems like you device doesn\'t support Android Open Accessory protocol!</string>
-    <string name="tun_error">Seems like you device doesn\'t support Android VpnApi! Check out tun.ko app.</string>
+    <string name="accessory_error">Seems like your device doesn\'t support Android Open Accessory protocol!</string>
+    <string name="tun_error">Seems like your device doesn\'t support Android VpnApi! Check out tun.ko app.</string>
     <string name="description_service_running">Service running</string>
 </resources>

simple-rt-android/app/src/main/res/xml/accessory_filter.xml

@@ -4,5 +4,5 @@
     <usb-accessory
         manufacturer="Konstantin Menyaev"
         model="SimpleRT"
-        version="1.0"/>
-</resources>
+        version="1.1"/>
+</resources>

simple-rt-cli/src/accessory.c

@@ -215,7 +215,7 @@ accessory_id_t gen_new_serial_string(char *str, size_t size)
     accessory_id_t id;
 
     if ((id = acquire_accessory_id()) == 0) {
-        fprintf(stderr, "No free accessory id's left\n");
+        fprintf(stderr, "No free accessory IDs left\n");
         return 0;
     }
 
@@ -248,4 +248,3 @@ void run_usb_probe_thread_detached(struct libusb_device *dev)
     pthread_attr_setdetachstate(&attrs, PTHREAD_CREATE_DETACHED);
     pthread_create(&th, &attrs, usb_device_thread_proc, dev);
 }
-

simple-rt-cli/src/adk.c

@@ -186,7 +186,7 @@ accessory_t *probe_usb_device(struct libusb_device *dev,
         libusb_get_device_descriptor(dev, &desc);
         printf("Detected usb device with vendor id %x and product id %x does "
                "not support Android Open Accessory protocol.\n",
-		desc.idVendor, desc.idProduct);
+    		desc.idVendor, desc.idProduct);
         ret = 0;
         goto error;
     }
@@ -282,7 +282,7 @@ accessory_t *probe_usb_device(struct libusb_device *dev,
         }
     }
 
-    puts("Accessory was inited successfully!");
+    puts("Accessory was initialized successfully!");
 
 error:
     if (ret < 0) {
@@ -349,4 +349,3 @@ ssize_t write_usb_packet(struct libusb_device_handle *handle, uint8_t ep,
 
     return transferred;
 }
-

simple-rt-cli/src/network.c

@@ -180,7 +180,7 @@ bool start_network(void)
     }
 
     if (!iface_up(tun_name)) {
-        fprintf(stderr, "Unable set iface %s up\n", tun_name);
+        fprintf(stderr, "Unable to set interface %s up\n", tun_name);
         close(tun_fd);
         return false;
     }
@@ -234,4 +234,3 @@ char *fill_serial_param(char *buf, size_t size, accessory_id_t id)
 
     return buf;
 }
-