PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #326 from jmkristian/w6jmk-cm108 

Windows USE_CM108
This commit is contained in:
wb2osz 2021-03-15 20:37:27 -04:00 committed by GitHub
parent e449e39d4d 09de2f6681
commit 7fa91dd551
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -312,6 +312,8 @@ else()
set(ALSA_LIBRARIES "") set(ALSA_LIBRARIES "")
set(UDEV_INCLUDE_DIRS "") set(UDEV_INCLUDE_DIRS "")
set(UDEV_LIBRARIES "") set(UDEV_LIBRARIES "")
# Version 1.7 supports CM108/CM119 GPIO PTT for Windows.
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_CM108")
set(PORTAUDIO_INCLUDE_DIRS "") set(PORTAUDIO_INCLUDE_DIRS "")
set(PORTAUDIO_LIBRARIES "") set(PORTAUDIO_LIBRARIES "")
endif() endif()

7
src/direwolf.h
View File

@ -37,13 +37,6 @@
#endif #endif
// Version 1.7 supports CM108/CM119 GPIO PTT for Windows.
// Define it here so we don't need to have separate Windows
// check in all the places that test this.
#if __WIN32__
#define USE_CM108 1
#endif
/* /*
* Previously, we could handle only a single audio device. * Previously, we could handle only a single audio device.
* This meant we could have only two radio channels. * This meant we could have only two radio channels.

10
src/ptt.c
View File

@ -162,15 +162,15 @@
#include <hamlib/rig.h> #include <hamlib/rig.h>
#endif #endif
#ifdef USE_CM108
#include "cm108.h"
#endif
/* So we can have more common code for fd. */ /* So we can have more common code for fd. */
typedef int HANDLE; typedef int HANDLE;
#define INVALID_HANDLE_VALUE (-1) #define INVALID_HANDLE_VALUE (-1)
#endif #endif /* __WIN32__ */
#ifdef USE_CM108
#include "cm108.h"
#endif /* USE_CM108 */
#include "textcolor.h" #include "textcolor.h"
#include "audio.h" #include "audio.h"