diff --git a/devsetup.ui b/devsetup.ui index 05d80ec43..14f7e0ae7 100644 --- a/devsetup.ui +++ b/devsetup.ui @@ -1461,7 +1461,7 @@ Si570 Control - + 41 diff --git a/libm65/ptt.c b/libm65/ptt.c index d0ee0cb1e..0f99d1be8 100644 --- a/libm65/ptt.c +++ b/libm65/ptt.c @@ -6,7 +6,7 @@ int ptt_(int *nport, int *ntx, int *iptt) static HANDLE hFile; static int open=0; char s[10]; - int i3,i4,i5,i6,i9,i00; + int i3=0,i4=0,i5=0,i6=0,i9=0,i00=0; if(*nport==0) { *iptt=*ntx; @@ -38,5 +38,6 @@ int ptt_(int *nport, int *ntx, int *iptt) *iptt=0; open=0; } + if((i00+i3+i4+i5+i6+i9)==-99) return -1; //Silence compiler warning return 0; } diff --git a/mainwindow.cpp b/mainwindow.cpp index cd50442a2..16ba488c8 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" diff --git a/mainwindow.ui b/mainwindow.ui index 960c0fcb3..1ab8fa750 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1122,8 +1122,6 @@ p, li { white-space: pre-wrap; } - - diff --git a/paInputDevice.c b/paInputDevice.c index 641bd859d..7cf305134 100644 --- a/paInputDevice.c +++ b/paInputDevice.c @@ -5,7 +5,7 @@ void paInputDevice(int id, char* hostAPI_DeviceName, int* minChan, int* maxChan, int* minSpeed, int* maxSpeed) { - int i, j, k; + int i; char pa_device_name[128]; char pa_device_hostapi[128]; double pa_device_max_speed; @@ -16,7 +16,7 @@ void paInputDevice(int id, char* hostAPI_DeviceName, int* minChan, int pa_device_min_channels; char p2[50]; char *p,*p1; - static int iret, numDevices, valid_dev_cnt; + static int iret, valid_dev_cnt; iret=pa_get_device_info (id, &pa_device_name, diff --git a/plotter.cpp b/plotter.cpp index 286d50476..feed46b48 100644 --- a/plotter.cpp +++ b/plotter.cpp @@ -721,33 +721,6 @@ void CPlotter::setPalette(QString palette) //setPalette() } m_ColorTbl[255].setRgb(255,255,100); } - - if(palette=="Blue") { - FILE* fp=fopen("blue.dat","r"); - int n,r,g,b; - float xr,xg,xb; - for(int i=0; i<256; i++) { -// fscanf(fp,"%d%f%f%f",&n,&xr,&xg,&xb); - r=255.0*xr + 0.5; - g=255.0*xg + 0.5; - b=255.0*xb + 0.5; - m_ColorTbl[i].setRgb(r,g,b); - } - } - - if(palette=="AFMHot") { - FILE* fp=fopen("afmhot.dat","r"); - int n,r,g,b; - float xr,xg,xb; - for(int i=0; i<256; i++) { -// fscanf(fp,"%d%f%f%f",&n,&xr,&xg,&xb); - r=255.0*xr + 0.5; - g=255.0*xg + 0.5; - b=255.0*xb + 0.5; - m_ColorTbl[i].setRgb(r,g,b); - } - } - } void CPlotter::setFsample(int n)