From cc09157106f45ff039f42197026c6d480a25b399 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Fri, 13 Apr 2018 17:27:22 +1000 Subject: [PATCH] Fix UK -> UA for Ukrainian #261 --- workspace/TS100/build.sh | 2 +- workspace/TS100/src/Translation.cpp | 2 +- workspace/TS100/src/main.cpp | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/workspace/TS100/build.sh b/workspace/TS100/build.sh index ea881bf2..ec9292b0 100755 --- a/workspace/TS100/build.sh +++ b/workspace/TS100/build.sh @@ -33,5 +33,5 @@ make -j16 lang=BR rm -rf Objects/src make -j16 lang=LT rm -rf Objects/src -make -j16 lang=UK +make -j16 lang=UA rm -rf Objects/src diff --git a/workspace/TS100/src/Translation.cpp b/workspace/TS100/src/Translation.cpp index 5719b57a..ec005760 100644 --- a/workspace/TS100/src/Translation.cpp +++ b/workspace/TS100/src/Translation.cpp @@ -1454,7 +1454,7 @@ const char* SettingsMenuEntriesDescriptions[4] ={ }; #endif -#ifdef LANG_UK +#ifdef LANG_UA const char* SettingsDescriptions[17] = { // These are all the help text for all the settings. // No requirements on spacing or length. diff --git a/workspace/TS100/src/main.cpp b/workspace/TS100/src/main.cpp index acb7a467..5b3fa094 100644 --- a/workspace/TS100/src/main.cpp +++ b/workspace/TS100/src/main.cpp @@ -860,9 +860,8 @@ void startPIDTask(void const *argument) { } const int32_t itermMax = 100; pidTaskNotification = xTaskGetCurrentTaskHandle(); - uint32_t ulNotificationValue; for (;;) { - ulNotificationValue = ulTaskNotifyTake( pdTRUE, 100);//Wait a max of 100ms + ulTaskNotifyTake( pdTRUE, 100); //Wait a max of 100ms //This is a call to block this thread until the ADC does its samples uint16_t rawTemp = getTipRawTemp(1); // get instantaneous reading if (currentlyActiveTemperatureTarget) { @@ -900,8 +899,8 @@ void startPIDTask(void const *argument) { } /*if (currentlyActiveTemperatureTarget < rawTemp) { - output = 0; - }*/ + output = 0; + }*/ setTipPWM(output); derivativeLastValue = rawTemp; // store for next loop