SWIG experiments
Squash of the following commits (a full rebase was too hard :( ) *ef309cfdfN - SWIG: create pm3.c (5 months ago) <Philippe Teuwen> *05ba6a73fN - swig pm3_device -> pm3 (5 months ago) <Philippe Teuwen> *d59630183N - swig: move pm3.i (5 months ago) <Philippe Teuwen> *6adcfad75N - Fix historic make & cmake (5 months ago) <Philippe Teuwen> *bcbef2edfN - Fix typo with script_embedded (5 months ago) <slurdge> *538ee4dabN - Better SWIG integration: autogen func & attributes (5 months ago) <slurdge> *756b62466N - SWIG: few helper scripts (5 months ago) <Philippe Teuwen> *47ba4acd0N - SWIG %extend (5 months ago) <Philippe Teuwen> *21841cb9dN - simplify scripts (5 months ago) <Philippe Teuwen> *78c4f7929N - Revert "SWIG experiments: introduce context" (5 months ago) <Philippe Teuwen> *1562b75fcN - SWIG experiments: introduce context (5 months ago) <Philippe Teuwen> *a503dfcd9N - SWIG experiments (5 months ago) <Philippe Teuwen>
This commit is contained in:
1 parent
e959d0e229
commit
eadacd82f5
42 files changed
+8542
-34
No files matched your search
+4
-4
@@ -666,15 +666,15 @@ static int CmdConnect(const char *Cmd) {
|
||||
}
|
||||
|
||||
if (session.pm3_present) {
|
||||
CloseProxmark();
|
||||
CloseProxmark(session.current_device);
|
||||
}
|
||||
|
||||
// 10 second timeout
|
||||
OpenProxmark(port, false, 10, false, baudrate);
|
||||
OpenProxmark(&session.current_device, port, false, 10, false, baudrate);
|
||||
|
||||
if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
|
||||
if (session.pm3_present && (TestProxmark(session.current_device) != PM3_SUCCESS)) {
|
||||
PrintAndLogEx(ERR, _RED_("ERROR:") " cannot communicate with the Proxmark3\n");
|
||||
CloseProxmark();
|
||||
CloseProxmark(session.current_device);
|
||||
return PM3_ENOTTY;
|
||||
}
|
||||
return PM3_SUCCESS;
|
||||
|
||||
Reference in new issue
Block a user