Skip to content

Commit

Permalink
fixed a typo
Browse files Browse the repository at this point in the history
  • Loading branch information
fpoussin committed Jul 26, 2015
1 parent 452b6b0 commit d328f73
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 71 deletions.
140 changes: 70 additions & 70 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
**QSTLink2**
========

**Description**

QSTLink2 is a cross-platform STLinkV2 GUI.

It can perform the following actions:
- Write
- Read
- Verify
- Erase

**Downloads**

Windows binaries:
- https://drive.google.com/folderview?id=0BzWyTGWIwcYQS0JRQkw2Q3J6R1U&usp=sharing
- https://github.com/fpoussin/QStlink2/releases

Ubuntu PPA:
- https://launchpad.net/~fpoussin/+archive/ppa

**Building on Linux**

*Build dependencies for Qt4:*
- libusb-1.0
- QtUSB (included)
- qt4-qmake
- qt4-dev
- libqt4-gui
- libqt4-xml

*Build dependencies for Qt5:*
- libusb-1.0
- QtUSB (included)
- qt5-qmake
- qtbase5-dev
- libqt5gui5
- libqt5xml5

*Build steps:*

git clone git@github.com:fpoussin/QStlink2.git
git submodule update --init
qt4-qmake # or qt5-qmake
make
sudo make install # Optional


**Building in Windows**

You will need to run these commands from MSVC's CLI (I use MSVC2012 express)
You might need to install windows driver SDK (WDK) to get WinUSB libs/headers.
You can also build from Qt Creator

I recommend that you build/download a static version of Qt for Windows.

*Dependencies:*
- MSVC 2008 or better (community/express editions work fine)
- WinUsb (WDK)
- QtUSB (included)
- Qt 5.2 SDK or better recommended

*Build steps:*

git clone git@github.com:fpoussin/QStlink2.git
git submodule update --init
qmake
nmake

**QSTLink2**
========

**Description**

QSTLink2 is a cross-platform STLinkV2 GUI.

It can perform the following actions:
- Write
- Read
- Verify
- Erase

**Downloads**

Windows binaries:
- https://drive.google.com/folderview?id=0BzWyTGWIwcYQS0JRQkw2Q3J6R1U&usp=sharing
- https://github.com/fpoussin/QStlink2/releases

Ubuntu PPA:
- https://launchpad.net/~fpoussin/+archive/ppa

**Building on Linux**

*Build dependencies for Qt4:*
- libusb-1.0
- QtUSB (included)
- qt4-qmake
- qt4-dev
- libqt4-gui
- libqt4-xml

*Build dependencies for Qt5:*
- libusb-1.0
- QtUSB (included)
- qt5-qmake
- qtbase5-dev
- libqt5gui5
- libqt5xml5

*Build steps:*

git clone git@github.com:fpoussin/QStlink2.git
git submodule update --init
qt4-qmake # or qt5-qmake
make
sudo make install # Optional


**Building in Windows**

You will need to run these commands from MSVC's CLI (I use MSVC2012 express)
You might need to install windows driver SDK (WDK) to get WinUSB libs/headers.
You can also build from Qt Creator

I recommend that you build/download a static version of Qt for Windows.

*Dependencies:*
- MSVC 2008 or better (community/express editions work fine)
- WinUsb (WDK)
- QtUSB (included)
- Qt 5.2 SDK or better recommended

*Build steps:*

git clone git@github.com:fpoussin/QStlink2.git
git submodule update --init
qmake
nmake

2 changes: 1 addition & 1 deletion src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ bool MainWindow::Connect()
this->setModeSWD();
this->getStatus();
if (this->getMCU()) {
this->lockUI(true);
this->lockUI(false);
return true;
}
else
Expand Down

0 comments on commit d328f73

Please sign in to comment.