prepare master

starkfire · Apr 19, 2019 · 66c018c · 66c018c
1 parent 163ae7a
commit 66c018c
Show file tree

Hide file tree

Showing 17 changed files with 9 additions and 322 deletions.
diff --git a/MFRC522-RPi/.gitignore → .gitignore b/MFRC522-RPi/.gitignore → .gitignore
diff --git a/FLPClient APK/AndroidManifest.xml b/FLPClient APK/AndroidManifest.xml
diff --git a/FLPClient APK/MainActivity.java b/FLPClient APK/MainActivity.java
diff --git a/FLPClient APK/README.md b/FLPClient APK/README.md
diff --git a/FLPClient APK/activity_main.xml b/FLPClient APK/activity_main.xml
diff --git a/FLPClient APK/build.gradle b/FLPClient APK/build.gradle
diff --git a/MFRC522-RPi/MFRC522(backup).py → MFRC522(backup).py b/MFRC522-RPi/MFRC522(backup).py → MFRC522(backup).py
diff --git a/MFRC522-RPi/README.md → README.md b/MFRC522-RPi/README.md → README.md
@@ -23,3 +23,12 @@ A simple script that utilizes the Raspberry Pi and a MFRC522 module to emulate t
 ## Usage
 1. Install SPI-Py from [here](https://github.com/lthiery/SPI-Py)
 2. Run ``` python app.py ```
+
+## Experimental Variants
+Two variants will be implemented with this project. These variants will implement distance-dependent fare rate using GPS data from an Android phone. Vincenty's Formulae will be used for approximating the P2P distance.
+
+1. GPSL+ Variant
+* a variant that will use the GPSLogger app for dynamic fare charges by retrieving location data using an Android phone
+
+2. FCPClient Variant
+* similar to GPSL+. However, unlike GPSL+, this variant will use the [Fused Location Provider API](https://developers.google.com/location-context/fused-location-provider/) for fetching location data and implement a TCP socket for retrieving data
diff --git a/MFRC522-RPi/__init__.py → __init__.py b/MFRC522-RPi/__init__.py → __init__.py
diff --git a/MFRC522-RPi/app.py → app.py b/MFRC522-RPi/app.py → app.py
diff --git a/MFRC522-RPi/cards.py → cards.py b/MFRC522-RPi/cards.py → cards.py
diff --git a/MFRC522-RPi/module/MFRC522.py → module/MFRC522.py b/MFRC522-RPi/module/MFRC522.py → module/MFRC522.py
diff --git a/MFRC522-RPi/module/__init__.py → module/__init__.py b/MFRC522-RPi/module/__init__.py → module/__init__.py
diff --git a/MFRC522-RPi/module/base.py → module/base.py b/MFRC522-RPi/module/base.py → module/base.py
diff --git a/MFRC522-RPi/module/read_card.py → module/read_card.py b/MFRC522-RPi/module/read_card.py → module/read_card.py
diff --git a/MFRC522-RPi/module/wipe_card.py → module/wipe_card.py b/MFRC522-RPi/module/wipe_card.py → module/wipe_card.py
diff --git a/MFRC522-RPi/module/write_card.py → module/write_card.py b/MFRC522-RPi/module/write_card.py → module/write_card.py