Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Begin ITSO card support #56

Closed
wants to merge 21 commits into from
Closed

Begin ITSO card support #56

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
20dc726
First vague stab at adding ITSO Transit data
rjmunro Oct 20, 2012
2a9a13a
Added ITSO to list of supported cards
rjmunro Oct 28, 2012
c0c09d8
Add beginnings of working ITSO card support
rjmunro Oct 28, 2012
4d4b129
Move bytesToHexString to Utils.getHexString()
rjmunro Nov 14, 2012
e806503
Get ISSN from shell
rjmunro Nov 14, 2012
86f923d
Get serial number
rjmunro Nov 14, 2012
a800621
Add TODO about other card types
rjmunro Nov 14, 2012
9c447cf
Upgrade to newer version of Farebot
rjmunro Nov 15, 2012
6cdcc2e
Split serial no with space and include ISSN
rjmunro Aug 2, 2013
8c16b5c
Make directoryBytes, logs and shellBytes properties of the object
rjmunro Aug 2, 2013
2a5d93b
Add ItsoTrip subclass and populate getTrips
rjmunro Aug 5, 2013
6cd74bb
Add 2 Oxford bus companies and some routes
rjmunro Aug 6, 2013
7c12b41
Use SparseArray rather than HashMap for data
rjmunro Aug 6, 2013
817f5a8
Sort returned trips
rjmunro Aug 6, 2013
ca782d7
Make ItsoTrip parcelable
rjmunro Aug 6, 2013
cb28e8e
Add 1 more bus company and 9 more routes
rjmunro Aug 7, 2013
edbcd72
Remove commented out bits copied from clipper
rjmunro Aug 8, 2013
b40e96f
Save raw sector data
rjmunro Aug 8, 2013
6192ada
Look for cardholder name sector & extract name
rjmunro Aug 8, 2013
1ad7e3f
Extract Cardholder DOB
rjmunro Aug 9, 2013
c012cc3
Add some more routes
rjmunro Sep 23, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add 1 more bus company and 9 more routes 
I now have all 3 companies for which my ticket is valid

Route 300 thanks to @pandalion
  • Loading branch information
@rjmunro
rjmunro committed Aug 19, 2013
commit cb28e8ef263a2770171e09ff1fda041b2b4c11d1
12 changes: 11 additions & 1 deletion src/main/java/com/codebutler/farebot/transit/ItsoTransitData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,15 +271,24 @@ public ItsoTrip setRoute(int routeID) {
}

private static SparseArray<String> routes = new SparseArray<String>() {{
put(0x0fff, "1");
put(0x1fff, "3");
put(0x27ff, "4");
put(0x22bf, "4A");
put(0x233f, "4C");
put(0x2fff, "5");
put(0x47ff, "8");
put(0x083f, "10");
put(0x087f, "11");
put(0x08ff, "13");
put(0x28ff, "U1");
put(0xc18d, "66");
put(0x1801, "300");
put(0x2001, "400");
put(0xC07f, "S1");
put(0xc87f, "T1");
put(0xc8ff, "T3");
put(0x28ff, "U1");
put(0x29bf, "U5");
put(0xe047, "X13");
}};

Expand All @@ -291,6 +300,7 @@ public String getRouteName() {
private static SparseArray<String> agencys = new SparseArray<String>() {{
put(0x0000, "Stagecoach");
put(0x206c, "Oxford Bus company");
put(0x207f, "Thames Travel");
}};

public ItsoTrip setAgency(int agencyID) {
Expand Down