From c7a67854ffb9fe314e34f5e40347b0dc27ff4862 Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Wed, 3 Jun 2020 13:09:11 +0200 Subject: [PATCH] partly revert commit 073ccfc, diseqc options standard now off Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b91a48e720cfea5f736d2433ce21ff4d2ce36784 Author: Frankenstone Date: 2020-06-03 (Wed, 03 Jun 2020) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/zapit/src/femanager.cpp | 6 +++--- src/zapit/src/frontend.cpp | 2 +- src/zapit/src/getservices.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp index 919f842b4..5c1930470 100644 --- a/src/zapit/src/femanager.cpp +++ b/src/zapit/src/femanager.cpp @@ -317,9 +317,9 @@ bool CFEManager::loadSettings() /* defaults, to replace CServiceManager::InitSatPosition/LoadMotorPositions * in the future */ satconfig.position = position; - satconfig.diseqc = 0; - satconfig.commited = 0; - satconfig.uncommited = 0; + satconfig.diseqc = -1; + satconfig.commited = -1; + satconfig.uncommited = -1; satconfig.motor_position = 0; satconfig.diseqc_order = 0; satconfig.lnbOffsetLow = 9750; diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index fdcc5cec8..34a4c668e 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -252,7 +252,7 @@ CFrontend::CFrontend(int Number, int Adapter) config.uni_scr = 0; /* the unicable SCR address 0-7 */ config.uni_freq = 0; /* the unicable frequency in MHz */ config.uni_lnb = 0; /* for two-position switches */ - config.uni_pin = 0; /* for MDU setups */ + config.uni_pin = -1; /* for MDU setups */ config.highVoltage = false; config.motorRotationSpeed = 0; //in 0.1 degrees per second diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index 4ff8a7366..4706eb058 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -810,9 +810,9 @@ bool CServiceManager::InitSatPosition(t_satellite_position position, const char { if(force || (satellitePositions.find(position) == satellitePositions.end())) { satellitePositions[position].position = position; - satellitePositions[position].diseqc = 0; - satellitePositions[position].commited = 0; - satellitePositions[position].uncommited = 0; + satellitePositions[position].diseqc = -1; + satellitePositions[position].commited = -1; + satellitePositions[position].uncommited = -1; satellitePositions[position].motor_position = 0; satellitePositions[position].diseqc_order = 0; satellitePositions[position].lnbOffsetLow = 9750;