Changeset 42867 for titan/titan


Ignore:
Timestamp:
10/03/18 16:27:24 (5 years ago)
Author:
gost
Message:

[titan] last fix DVB-t2 nit scan

File:
1 edited

Legend:

Unmodified
Added
Removed
  • titan/titan/scan.h

    r42864 r42867  
    412412                        cfre = cfre | (loop3[i1+3] & 0xff);
    413413                        frequency = cfre * 10;
    414                         tpnode == NULL;
    415                         if(checktransponderonscan(frequency, orbitalpos) == 0)
    416                                 //tpnode = createtransponder(id, FE_OFDM, orbitalpos, frequency, inversion, bandwidth, lp, hp, modulation, guardinterval, transmission, system);
    417                                 tpnode = createtransponder(0, FE_OFDM, orbitalpos, frequency, inversion, bandwidth, lp, hp, modulation, guardinterval, transmission, system);
    418414                        debug(500, "nitscan DVB-T2 - Flag=%d -> id=%llu freq=%d bandwidth=%d hp=%d lp=%d modulation=%d guard=%d trans=%d hierarchy=%d tpnode=%p", flag, id, frequency, bandwidth, hp, lp, modulation, guardinterval, transmission, hierarchy, tpnode);
    419415                        debug(200, "nitscan DVB-T2 - Flag=%d -> id=%llu freq=%d bandwidth=%d hp=%d lp=%d modulation=%d guard=%d trans=%d hierarchy=%d tpnode=%p", flag, id, frequency, bandwidth, hp, lp, modulation, guardinterval, transmission, hierarchy, tpnode);
     416                        tpnode = NULL;
     417                        if(checktransponderonscan(frequency, orbitalpos) == 0)
     418                        {
     419                                tpnode = createtransponder(id, FE_OFDM, orbitalpos, frequency, inversion, bandwidth, lp, hp, modulation, guardinterval, transmission, system);
     420                                debug(500, "nitscan DVB-T2 --> add transponder");
     421                                //tpnode = createtransponder(0, FE_OFDM, orbitalpos, frequency, inversion, bandwidth, lp, hp, modulation, guardinterval, transmission, system);
     422                        }
    420423                        if(tpnode != NULL)
    421424                                addtrans++;
    422425                        else
    423                                 err("not add nitscan DVB-T2 - Flag=%d -> id=%llu frequency:%s", flag, id, frequency);
     426                                printf("nitscan DVB-T2 --> transponder not added\n");
     427                                //err("not add nitscan DVB-T2 - Flag=%d -> id=%llu frequency:%s", flag, id, frequency);
    424428                        sillen = loop3[i1+4];
    425429                        step1 = step1 + sillen+1;
     
    440444                                cfre = cfre | (loop2[i2+3] & 0xff);
    441445                                frequency = cfre * 10;
     446                                debug(500, "nitscan DVB-T2 - Flag=%d -> id=%llu freq=%d bandwidth=%d hp=%d lp=%d modulation=%d guard=%d trans=%d hierarchy=%d tpnode=%p", flag, id, frequency, bandwidth, hp, lp, modulation, guardinterval, transmission, hierarchy, tpnode);
     447                                debug(200, "nitscan DVB-T2 - Flag=%d -> id=%llu freq=%d bandwidth=%d hp=%d lp=%d modulation=%d guard=%d trans=%d hierarchy=%d tpnode=%p", flag, id, frequency, bandwidth, hp, lp, modulation, guardinterval, transmission, hierarchy, tpnode);                         
    442448                                tpnode = NULL;
    443449                                if(checktransponderonscan(frequency, orbitalpos) == 0)
    444                                         //tpnode = createtransponder(id, FE_OFDM, orbitalpos, frequency, inversion, bandwidth, lp, hp, modulation, guardinterval, transmission, system);
    445                                         tpnode = createtransponder(0, FE_OFDM, orbitalpos, frequency, inversion, bandwidth, lp, hp, modulation, guardinterval, transmission, system);
    446                                 debug(500, "nitscan DVB-T2 - Flag=%d -> id=%llu freq=%d bandwidth=%d hp=%d lp=%d modulation=%d guard=%d trans=%d hierarchy=%d tpnode=%p", flag, id, frequency, bandwidth, hp, lp, modulation, guardinterval, transmission, hierarchy, tpnode);
    447                                 debug(200, "nitscan DVB-T2 - Flag=%d -> id=%llu freq=%d bandwidth=%d hp=%d lp=%d modulation=%d guard=%d trans=%d hierarchy=%d tpnode=%p", flag, id, frequency, bandwidth, hp, lp, modulation, guardinterval, transmission, hierarchy, tpnode);                         
     450                                {
     451                                        tpnode = createtransponder(id, FE_OFDM, orbitalpos, frequency, inversion, bandwidth, lp, hp, modulation, guardinterval, transmission, system);
     452                                        debug(500, "nitscan DVB-T2 --> add transponder");
     453                                        //tpnode = createtransponder(0, FE_OFDM, orbitalpos, frequency, inversion, bandwidth, lp, hp, modulation, guardinterval, transmission, system);
     454                                }
    448455                                if(tpnode != NULL)
    449456                                        addtrans++;
    450457                                else
    451                                         err("not add nitscan DVB-T2 - Flag=%d -> id=%llu frequency:%s", flag, id, frequency);
     458                                        printf("nitscan DVB-T2 --> transponder not added\n");
     459                                        //err("not add nitscan DVB-T2 - Flag=%d -> id=%llu frequency:%s", flag, id, frequency);
    452460                        }
    453461                        sillen = loop2[i2];
Note: See TracChangeset for help on using the changeset viewer.