jessmag

.gitignore

@@ -0,0 +1,2 @@
+MagRead.pro.user
+.*swp

ChangeLog

@@ -0,0 +1,44 @@
+magread (0.1.5) stable; urgency=low
+
+  * Fixed a bug (#1) in displaying driver licence/id numbers from some states
+  * Fixed a formatting issue (#7) for bank cards read from track 2
+  * Fixed a bug (#9) that could cause a bad loop of failed reads that could
+    prevent the user from easily stopping the process.
+  * Create a settings page
+  * Allow user to turn on/off auto-rotation on Maemo
+  * Create setting for always formatting or not formatting AAMVA and bank
+    cards
+  * Add support for setting normalization, silence and timeout variables
+  * Add support for selecting the input audio device
+  * Add support for choosing a decoding algorithm
+
+ -- Jeffrey Malone <ieatlint@tehinterweb.com>  Wed,  1 Dec 2010 15:19:00 -0700
+
+magread (0.1.3) stable; urgency=low
+
+  * Moved entirely over to Qt.  Now requires PR1.3 to successfully read cards.
+  * Added support for Symbian, Windows, OS X and Linux
+  * Supports auto-rotate functionality; redraws the screen to suite current
+    orientation.
+  * Fixed several bugs
+  * Added an about dialogue that includes a version number and a link to my
+    blog.
+  * Moved all issue tracking from the Maemo Garage to github because it is now
+    a multiplatform program.
+
+ -- Jeffrey Malone <ieatlint@tehinterweb.com>  Sun, 28 Nov 2010 22:56:47 -0700
+
+magread (0.1.1) unstable; urgency=low
+
+  * Fixed missing icon
+  * Rotated icon 180 degrees
+  * Fixed a leap year issue for calculating ages that could result in 1 day
+    age skew.
+
+ -- Jeffrey Malone <ieatlint@tehinterweb.com>  Sat,  6 Nov 2010 16:06:47 -0700
+
+magread (0.1.0) unstable; urgency=low
+
+  * Initial release
+
+ -- Jeffrey Malone <ieatlint@tehinterweb.com>  Thu, 04 Nov 2010 06:10:14 -0700

MagRead.pro

@@ -13,7 +13,7 @@ maemo5 {
 TARGET = MagRead
 TEMPLATE = app
 
-VERSION = 0.1.3
+VERSION = 0.1.5
 DEFINES += APP_VERSION=$$VERSION
 
 SOURCES += main.cpp\
@@ -23,7 +23,8 @@ SOURCES += main.cpp\
     mslib.c \
     llist.c \
     accountcard.cpp \
-    aamvacard.cpp
+    aamvacard.cpp \
+    settingspage.cpp
 
 HEADERS  += magread.h \
     carddetect.h \
@@ -32,7 +33,8 @@ HEADERS  += magread.h \
     llist.h \
     magcard.h \
     accountcard.h \
-    aamvacard.h
+    aamvacard.h \
+    settingspage.h
 
 symbian {
     TARGET.UID3 = 0xe2c961e1
@@ -41,3 +43,12 @@ symbian {
     TARGET.EPOCHEAPSIZE = 0x020000 0x800000
     ICON = "magread.svg"
 }
+
+unix {
+	INSTALLS += target desktop icon48
+	target.path = /usr/bin/magread
+	desktop.path = /usr/share/applications/hildon
+	desktop.files += maemofiles/magread.desktop
+	icon48.path = /usr/share/icons/hicolor/48x48/hildon
+	icon48.files += maemofiles/magread.png
+}

README

@@ -1,23 +1,45 @@
 MagRead is an application to read magnetic stripe cards.
 
+It was written by myself, Jeffrey Malone as a fun app to demonstrate the mslib
+library that decodes the magnetic stripe data itself.
+MagRead should be able to read any magnetic stripe that conforms to the
+standards defined by the ABA and the IATA.  These two formats are by far the
+predominant ones found, and the only exceptions I've personally run across are
+hotel keys.
+
 Requirements:
  - A hardware audio dongle to read the cards, such as those provided by Square
    for their payment service.
+ - A compatible audio jack on the device.  Compatible jacks are ones that have
+   a pin-out for audio output and input -- typically headset jacks.  These are
+   found on some newer MacBooks and Thinkpads, along with many other devices.
  - Qt 4.6 or later (including Qt Multimedia plugin)
 
-It may run on any device meeting the above requirements, but has only been
-tested on a Linux desktop machine, a Nokia N8 and a Nokia N900.
+Confirmed to work on:
+Mac OS X 10.6 on a current MacBook Pro
+Linux on a Thinkpad W510
+Windows 7 on a Thinkpad W510
+Nokia N8 with Symbian S^3
+Nokia N900 with Maemo 5 PR 1.3 (For <PR1.3, you must use MagRead 1.1 or older)
 
 To build on the terminal, simply run:
 qmake && make
 
 You may also open the project file in Qt Creator to build.
 
-
-A packaged version of this is currently available on the Maemo extras-devel
-repository at:
+For Nokia N900 owners, this application is packaged and found in the
+extras-devel repository at:
 http://maemo.org/packages/view/magread/
+Please vote for it so it can eventually ascend to the extras repo.
+
+For Symbian users, at present you must compile this application yourself.  I'll
+work on getting a dev certificate so that I can sign a sis file soon.
+
+For Linux, Windows and OS X users, binary versions will be available very soon
+on my blog.  The code however can be compiled yourself now, with Linux
+instructions above.
+
 
-Information on how this program works and screenshots of it in action may be
-found on my blog at:
+Further information on how this program works and screenshots of it in action
+may be found on my blog at:
 http://blog.tehinterweb.com/

aamvacard.cpp

@@ -8,8 +8,13 @@ AAMVACard::AAMVACard( MagCard *_card ) {
 	layout = new QVBoxLayout;
 	setLayout( layout );
 
+#ifdef Q_WS_MAEMO_5
+	smallFont.setPointSize( 32 );
+	medFont.setPointSize( 32 );
+#else
 	smallFont.setPointSize( 12 );
 	medFont.setPointSize( 16 );
+#endif
 
 	aamvaIssuerName = new QLabel;
 	aamvaIssuerName->setFont( medFont );
@@ -67,8 +72,8 @@ AAMVACard::AAMVACard( MagCard *_card ) {
 }
 
 void AAMVACard::reorient() {
-//	QSize geometry = size();
-	QRect geometry = QApplication::desktop()->screenGeometry();
+	QSize geometry = size();
+//	QRect geometry = QApplication::desktop()->screenGeometry();
 
 	if( geometry.width() > geometry.height() ) {
 		//landscape

accountcard.cpp

@@ -8,16 +8,19 @@ AccountCard::AccountCard( MagCard *_card ) {
 	layout = new QVBoxLayout;
 	setLayout( layout );
 
-	//smallFont.setPointSize( 12 );
-	//medFont.setPointSize( 16 );
+#ifdef Q_WS_MAEMO_5
 	smallFont.setPointSize( 32 );
 	medFont.setPointSize( 32 );
+#else
+	smallFont.setPointSize( 12 );
+	medFont.setPointSize( 16 );
+#endif
 
 	accountNumber = new QLabel;
 	layout->addWidget( accountNumber, 1, Qt::AlignHCenter );
 
 	accountHolder = new QLabel;
-	accountHolder->setFont( medFont );
+	accountHolder->setFont( smallFont );
 	layout->addWidget( accountHolder, 1, Qt::AlignHCenter );
 
 	label = new QLabel( "Expiration Date" );
@@ -58,18 +61,26 @@ AccountCard::AccountCard( MagCard *_card ) {
 	if( _card ) {
 		card = _card;
 		showData();
-	}
+	};
 }
 
 void AccountCard::reorient() {
-//	QSize geometry = size();
+#ifdef Q_OS_SYMBIAN
+	// for some reason, this works only on symbian, and the else works on everything but symbian
 	QRect geometry = QApplication::desktop()->screenGeometry();
+#else
+	QSize geometry = size();
+#endif
 
 	if( geometry.width() > geometry.height() ) {
 		//landscape
 		if( orientation != LANDSCAPE ) {
 			qDebug() << "Landscape Mode";
-			accountNumberFont.setPointSize( 48 );//18
+#ifdef Q_WS_MAEMO_5
+			accountNumberFont.setPointSize( 48 );
+#else
+			accountNumberFont.setPointSize( 18 );
+#endif
 			accountNumber->setFont( accountNumberFont );
 
 			layout->removeItem( layout->itemAt( 2 ) );
@@ -81,7 +92,11 @@ void AccountCard::reorient() {
 		//portrait
 		if( orientation != PORTRAIT ) {
 			qDebug() << "Portrait Mode";
-			accountNumberFont.setPointSize( 32 );//12
+#ifdef Q_WS_MAEMO_5
+			accountNumberFont.setPointSize( 32 );
+#else
+			accountNumberFont.setPointSize( 12 );
+#endif
 			accountNumber->setFont( accountNumberFont );
 
 			layout->removeItem( layout->itemAt( 2 ) );
@@ -123,8 +138,10 @@ void AccountCard::showData() {
 
 	if( !card->accountHolder.isEmpty() )
 		accountHolder->setText( card->accountHolder );
-	else 
+	else  {
+		accountHolder->hide();
 		accountHolder->clear();
+	}
 
 	/* Expiration Date */
 	tmpStr = card->expirationDate.toString( "MMM dd, yyyy" );

carddetect.cpp

@@ -187,7 +187,7 @@ void CardDetect::aamvaCardCheck( QString expDate ) {
 	card->accountNumber.remove( iin );
 	if( card->miscData.length() > 8 )
 		card->accountNumber.append( card->miscData.mid( 8 ) );
-
+	
 	//format the id number if applicable
 	if( !issuerInfo.format.isEmpty() ) {
 		for( int i = 0; i < issuerInfo.format.length(); i++ ) {
@@ -199,10 +199,14 @@ void CardDetect::aamvaCardCheck( QString expDate ) {
 					card->accountNumber.replace( i, 2, letter );
 			} else if( issuerInfo.format.at( i ) != 'N' ) {
 				card->accountNumber.insert( i, issuerInfo.format.at( i ) );
+			} else if( card->accountNumber.at( i ) == '=' ) {
+				card->accountNumber.replace( i, 1, '0' );
 			}
 		}
 	}
 
+	card->accountNumber.remove( '=' );
+
 	//set the birthday
 	QString bday = card->miscData.left( 8 );
 	if( bday.mid( 4, 2 ) > "12" ) { //some (Calif) violate AAMVA standard and switch the exp and bday month values

debian/changelog

@@ -0,0 +1 @@
+../ChangeLog

debian/control

@@ -2,7 +2,7 @@ Source: magread
 Section: user/utilities
 Priority: extra
 Maintainer: Jeffrey Malone <ieatlint@tehinterweb.com>
-Build-Depends: debhelper (>= 5), libqt4-dev (>=4.6.1), libpulse-dev
+Build-Depends: debhelper (>= 5), libqt4-dev (>=4.6.1), libqt4-multimedia (>=4.6.1)
 Standards-Version: 3.7.3
 
 Package: magread
@@ -16,7 +16,7 @@ Description: Reads magnetic stripe cards
  data and display it in a familiar format.
  *Requires that you have a hardware dongle, such as those provided by Square.*
  See http://blog.tehinterweb.com/ for more details
-XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=1941
+XSBC-Bugtracker: https://github.com/ieatlint/MagRead/issues
 XB-Maemo-Icon-26:
  iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c
  6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0

llist.c

@@ -46,7 +46,7 @@ void llist_remove_idx( LListH *list, int idx ) {
 		prev = trav;
 	}
 
-	if( trav != NULL ) {//if found
+	if( trav != NULL ) {/* if found */
 		if( prev != NULL ) {
 			prev->next = trav->next;
 		} else {

magcard.h

@@ -66,6 +66,13 @@ class MagCard {
 			swipeValid = false;
 		}
 
+		void clear() {
+			type = CARD_UNSET;
+			charStream.clear();
+			bitStream.clear();
+			accountNumber.clear();
+		}
+
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS( MagCard::Types )

magdecode.cpp

@@ -11,6 +11,11 @@ MagDecode::MagDecode(QObject *parent) : QIODevice(parent) {
 
 	normOffsetFound = false;
 	normOffset = 0;
+
+	defaultTimeOut = 10; //default to 10
+	timeOut = defaultTimeOut;
+
+	algorithm = "walk";
 }
 
 void MagDecode::start() {
@@ -25,6 +30,11 @@ qint64 MagDecode::writeData( const char *data, qint64 dataLen ) {
 	if( !captureAudio )
 		return dataLen;
 
+	if( timeOut > 0 ) {
+		timeOut--;
+		return dataLen;
+	}
+
 	const qint16 *pcmDataBlock = reinterpret_cast<const qint16 *>( data );
 	int blockLen = dataLen / sizeof( qint16 );
 
@@ -68,6 +78,8 @@ qint64 MagDecode::writeData( const char *data, qint64 dataLen ) {
 void MagDecode::processSwipe() {
 	bool valid;
 
+	timeOut = defaultTimeOut;
+
 	//Normalize the audio based on calculated 0 level
 	for( int i = 0; i < pcmData.count(); i++ )
 		pcmData[ i ] -= normOffset;
@@ -76,7 +88,14 @@ void MagDecode::processSwipe() {
 
 	ms_set_peakThreshold( ms, silenceThreshold );
 
-	ms_peaks_find_walk( ms );
+	if( algorithm == "intersect" ) {
+		ms_peaks_find( ms );
+		qDebug() << "Intersection algorithm used";
+	} else {
+		ms_peaks_find_walk( ms );
+		qDebug() << "Walk algorithm used";
+	}
+
 	ms_peaks_filter_group( ms );
 
 //	ms_save( ms, "/tmp/swipe" );
@@ -116,3 +135,19 @@ void MagDecode::setThreshold( int threshold ) {
 	silenceThreshold = threshold;
 }
 
+void MagDecode::setTimeOut( int _timeOut ) {
+	defaultTimeOut = _timeOut;
+}
+
+void MagDecode::setNorm( int _normOffset ) {
+	normOffsetFound = true;
+	normOffset = _normOffset;
+}
+
+void MagDecode::setAlgorithm( QString _algorithm ) {
+	qDebug() << "Settings algorithm to" << _algorithm;
+	if( _algorithm == "intersect" )
+		algorithm = _algorithm;
+	else
+		algorithm = "walk";
+}