1. Summary
  2. Files
  3. Support
  4. Report Spam
  5. Create account
  6. Log in

Changeset 1620

Show
Ignore:
Timestamp:
07/12/09 11:18:57 (5 years ago)
Author:
sm0svx
Message:

Reversed the tone map.

Location:
branches/tone_siglev/src/svxlink
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • branches/tone_siglev/src/svxlink/remotetrx/remotetrx.conf

    r1619 r1620  
    5555SIGLEV_SLOPE=1 
    5656SIGLEV_OFFSET=0 
    57 #TONE_SIGLEV_MAP=8,19,23,28,32,37,50,60,84,100 
     57#TONE_SIGLEV_MAP=100,84,60,50,37,32,28,23,19,8 
    5858DEEMPHASIS=0 
    5959DTMF_DEC_TYPE=INTERNAL 
  • branches/tone_siglev/src/svxlink/svxlink/svxlink.conf

    r1619 r1620  
    130130SIGLEV_SLOPE=1 
    131131SIGLEV_OFFSET=0 
    132 #TONE_SIGLEV_MAP=8,19,23,28,32,37,50,60,84,100 
     132#TONE_SIGLEV_MAP=100,84,60,50,37,32,28,23,19,8 
    133133DEEMPHASIS=0 
    134134#SQL_TAIL_ELIM=300 
  • branches/tone_siglev/src/svxlink/trx/SigLevDetTone.cpp

    r1619 r1620  
    3636#include <algorithm> 
    3737#include <cstdlib> 
    38 #include <iostream> 
    3938 
    4039 
     
    110109static int tone_siglev_map[10] = 
    111110{ 
    112   10, 20, 30, 40, 50, 60, 70, 80, 90, 100 
     111  100, 90, 80, 70, 60, 50, 40, 30, 20, 10 
    113112}; 
    114113 
     
    161160      } 
    162161       
    163       cout << "Adding value: " << value << endl; 
    164162      tone_siglev_map[i++] = atoi(value.c_str()); 
    165163    } while ((comma != mapstr.end()) && (i < 10)); 
     
    219217        if (snr > 10.0f) 
    220218        { 
    221           last_siglev = tone_siglev_map[9-max_idx]; 
     219          last_siglev = tone_siglev_map[max_idx]; 
    222220          printf("fq=%d  max=%.2f  prev_max=%.2f  snr=%.2f  siglev=%d\n", 
    223221                5500 + max_idx * 100, max, prev_max, snr, last_siglev);