Merge pull request #926 from pwpiwi/fix_iso15693_fpga
authorpwpiwi <pwpiwi@users.noreply.github.com>
Sat, 11 Apr 2020 06:56:14 +0000 (08:56 +0200)
committerGitHub <noreply@github.com>
Sat, 11 Apr 2020 06:56:14 +0000 (08:56 +0200)
* make fpga_version_info.c phony and delete it on 'make clean'
* wait for transfer to complete before returning from FpgaSendCommand()
* log correct tag times in iclass simulation
* shorten pulse from TC1 to TC0 in StartCountSspClk()
* shorten ssp_frame pulse in fpga/hi_reader.v
* some reformatting and whitespace fixes
* NOISE_THRESHOLD /= 2 (starting with c41dd5f it became a relative threshold)
* remove superfluous reader initialization

CI/.travis.yml
client/comms.c

index 0c02c250b8c3a1fd7932d22f0767ea472f22b0c4..01dd168ae9a3be35097685582101bfa46cd4e076 100644 (file)
@@ -1,23 +1,28 @@
 # Travis-CI config
 # variable REPOSITORY_EP must be filled with repository name. as sample: "merlokk/proxmark3"
+
 language: c
 
 compiler: gcc
 
 # Test on Linux and MacOS
-matrix:
+jobs:
   include:
-    - os: osx
-      osx_image: xcode7.3      # OS X 10.11
-    - os: osx
-      osx_image: xcode8.3   # OS X 10.12
     - os: osx
       osx_image: xcode9.4   # OS X 10.13
     - os: osx
       osx_image: xcode10    # OS X 10.13
+    - os: osx
+      osx_image: xcode11    # OS X 10.14
     - os: linux
-      dist: trusty
-      sudo: required
+      dist: trusty          # Ubuntu 14.04
+    - os: linux
+      dist: xenial          # Ubuntu 16.04
+    - os: linux
+      dist: bionic          # Ubuntu 18.04
+
+git:
+  depth: false
 
 before_install:
 ## Install ARM toolchain on Linux.
@@ -26,13 +31,13 @@ before_install:
   echo $REPOSITORY_EP;
   if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
     sudo apt-get update -qq;
-    sudo apt-get install -y gcc-arm-none-eabi libpcsclite-dev;
+    sudo apt-get install -y gcc-arm-none-eabi libnewlib-arm-none-eabi libpcsclite-dev;
   elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     brew update;
     if [[ "$REPOSITORY_EP" == "" ]]; then
-      brew tap proxmark/proxmark3;
+      brew tap --full proxmark/proxmark3;
     else
-      brew tap "$REPOSITORY_EP" --env=std;
+      brew tap --full "$REPOSITORY_EP" --env=std;
     fi
   fi
 
@@ -47,7 +52,7 @@ install:
 before_script:
 
 script: 
-## for the time being we are satisfied if it can be build and then successfully started
+## for the time being we are satisfied if it can be build and hf mf hardnested runs
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
     proxmark3 /dev/notexists travis_test_commands.scr ;
   elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
index b3b85fd2dad016ba1a7a518aecb1ca42d145109a..1391641d569ce9a3183933378e3983c3268ba657 100644 (file)
@@ -9,6 +9,8 @@
 // Code for communicating with the proxmark3 hardware.
 //-----------------------------------------------------------------------------
 
+#define _POSIX_C_SOURCE 199309L // need clock_gettime()
+
 #include "comms.h"
 
 #include <stdio.h>
@@ -17,6 +19,7 @@
 #include <pthread.h>
 #include <inttypes.h>
 #include <time.h>
+#include <sys/time.h>
 
 #include "uart.h"
 #include "ui.h"
Impressum, Datenschutz