diff --git a/openhantek/src/OH_BUILD.h b/openhantek/src/OH_BUILD.h index 6bdfb134..18ced08d 100644 --- a/openhantek/src/OH_BUILD.h +++ b/openhantek/src/OH_BUILD.h @@ -1,2 +1,2 @@ // Do not edit, will be re-created at each commit! -#define OH_BUILD "20220312 - commit 965" +#define OH_BUILD "20220313 - commit 966" diff --git a/openhantek/src/hantekdso/hantekdsocontrol.cpp b/openhantek/src/hantekdso/hantekdsocontrol.cpp index d536c310..78d9a2ec 100644 --- a/openhantek/src/hantekdso/hantekdsocontrol.cpp +++ b/openhantek/src/hantekdso/hantekdsocontrol.cpp @@ -38,11 +38,13 @@ HantekDsoControl::HantekDsoControl( ScopeDevice *device, const DSOModel *model, // Apply special requirements by the devices model model->applyRequirements( this ); getCalibrationFromEEPROM(); - // unique offset/gain calibration file "DSO-6022BE_NNNNNNNNNNNN_calibration.conf" in ".config/OpenHantek" + // unique offset/gain calibration file: + // Linux, Unix, macOS: "$HOME/.config/OpenHantek/DSO-6022BE_NNNNNNNNNNNN_calibration.ini" + // Windows: "%APPDATA%\OpenHantek\DSO-6022BE_NNNNNNNNNNNN_calibration.ini" calibrationSettings = std::unique_ptr< QSettings >( - new QSettings( QCoreApplication::organizationName(), + new QSettings( QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(), scopeDevice->getModel()->name + "_" + scopeDevice->getSerialNumber() + "_calibration" ) ); - // load the offsets (persistent, saved at shutdown) + // load the offsets (persistent, saved at shutdown as "*.ini" file, ) calibrationSettings->beginGroup( "offset" ); for ( int ch = 0; ch < HANTEK_CHANNEL_NUMBER; ++ch ) { calibrationSettings->beginGroup( "ch" + QString::number( ch ) ); diff --git a/openhantek/translations/openhantek_de.ts b/openhantek/translations/openhantek_de.ts index 204fffd4..cda94f69 100644 --- a/openhantek/translations/openhantek_de.ts +++ b/openhantek/translations/openhantek_de.ts @@ -764,7 +764,7 @@ Konnte Kanalpegeldaten des Oszilloskops nicht lesen - + Couldn't get calibration data from oscilloscope's EEPROM. Use a config file for calibration! Konnte Kalibrierdaten des Oszilloskops nicht lesen, benutze eine config-Datei für die Kalibrierung! diff --git a/openhantek/translations/openhantek_es.ts b/openhantek/translations/openhantek_es.ts index fbbdabb1..7b80e706 100644 --- a/openhantek/translations/openhantek_es.ts +++ b/openhantek/translations/openhantek_es.ts @@ -696,7 +696,7 @@ No se pudieron obtener los datos de calibración del osciloscopio - + Couldn't get calibration data from oscilloscope's EEPROM. Use a config file for calibration! No se pudieron obtener los datos de calibración del osciloscopio. ¡Usa un archivo de configuración para la calibración! diff --git a/openhantek/translations/openhantek_fr.ts b/openhantek/translations/openhantek_fr.ts index d5c892c6..9d2716e9 100644 --- a/openhantek/translations/openhantek_fr.ts +++ b/openhantek/translations/openhantek_fr.ts @@ -748,7 +748,7 @@ Impossible d'obtenir les données de niveau du canal depuis l'oscilloscope - + Couldn't get calibration data from oscilloscope's EEPROM. Use a config file for calibration! Impossible d'obtenir les données de niveau du canal depuis l'oscilloscope. Utilisez un fichier de configuration pour la calibration ! diff --git a/openhantek/translations/openhantek_it.ts b/openhantek/translations/openhantek_it.ts index ffd28d5f..11eec93d 100644 --- a/openhantek/translations/openhantek_it.ts +++ b/openhantek/translations/openhantek_it.ts @@ -596,7 +596,7 @@ HantekDsoControl - + Couldn't get calibration data from oscilloscope's EEPROM. Use a config file for calibration! Impossibile ottenere i dati di calibrazione dall'EEPROM dell'oscilloscopio. Utilizzare un file di configurazione per la calibrazione! diff --git a/openhantek/translations/openhantek_pl.ts b/openhantek/translations/openhantek_pl.ts index 577814b9..12d51b84 100644 --- a/openhantek/translations/openhantek_pl.ts +++ b/openhantek/translations/openhantek_pl.ts @@ -764,7 +764,7 @@ Nie można uzyskać danych o poziomie kanału z oscyloskopu - + Couldn't get calibration data from oscilloscope's EEPROM. Use a config file for calibration! Nie można pobrać danych kalibracyjnych z pamięci EEPROM oscyloskopu. Użyj pliku konfiguracyjnego do kalibracji! diff --git a/openhantek/translations/openhantek_pt.ts b/openhantek/translations/openhantek_pt.ts index 7cd271c1..30794856 100644 --- a/openhantek/translations/openhantek_pt.ts +++ b/openhantek/translations/openhantek_pt.ts @@ -758,7 +758,7 @@ Não foi possível obter dados do canal do osciloscópio - + Couldn't get calibration data from oscilloscope's EEPROM. Use a config file for calibration! Não foi possível obter dados de calibração a partir da EEPROM do osciloscópio. Use um arquivo de configuração para a calibração! diff --git a/openhantek/translations/openhantek_ru.ts b/openhantek/translations/openhantek_ru.ts index ea30cb41..f79ae0e9 100644 --- a/openhantek/translations/openhantek_ru.ts +++ b/openhantek/translations/openhantek_ru.ts @@ -682,7 +682,7 @@ HantekDsoControl - + Couldn't get calibration data from oscilloscope's EEPROM. Use a config file for calibration! Не удалось получить данные калибровки из EEPROM осциллографа. Используйте файл конфигурации для калибровки! diff --git a/openhantek/translations/openhantek_sv.ts b/openhantek/translations/openhantek_sv.ts index fba95034..2065880e 100644 --- a/openhantek/translations/openhantek_sv.ts +++ b/openhantek/translations/openhantek_sv.ts @@ -560,7 +560,7 @@ HantekDsoControl - + Couldn't get calibration data from oscilloscope's EEPROM. Use a config file for calibration! Kunde inte hämta kalibreringsdata från oscilloskopets EEPROM. Använd en konfigurationsfil för kalibrering! diff --git a/openhantek/translations/openhantek_zh.ts b/openhantek/translations/openhantek_zh.ts index 5a3652dd..f82b1c88 100644 --- a/openhantek/translations/openhantek_zh.ts +++ b/openhantek/translations/openhantek_zh.ts @@ -760,7 +760,7 @@ 获取示波器通道数据失败 - + Couldn't get calibration data from oscilloscope's EEPROM. Use a config file for calibration! 从示波器EEPOM获取校准数据失败，请使用配置文件进行校准！