Merge pull request #38 from ethomas997/etsaveSettingsMods

Issues with 'saveSettings'
betaflight · Oct 30, 2017 · 86c2e56 · 86c2e56
2 parents 8b01d94 + 4f1eeee
commit 86c2e56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/SCRIPTS/BF/protocols.lua b/src/SCRIPTS/BF/protocols.lua
@@ -9,7 +9,7 @@ supportedProtocols =
         maxTxBufferSize = 6,
         maxRxBufferSize = 6,
         saveMaxRetries  = 2,
-        saveTimeout     = 150
+        saveTimeout     = 300
     },
     crsf =
     {

diff --git a/src/SCRIPTS/BF/ui.lua b/src/SCRIPTS/BF/ui.lua
@@ -89,6 +89,10 @@ local function processMspReply(cmd,rx_buf)
     if cmd == Page.write then
         if Page.eepromWrite then
             eepromWrite()
+        else
+            invalidatePages()
+            currentState = pageStatus.display
+            saveTS = 0
         end
         pageRequested = false
         return
@@ -356,7 +360,11 @@ function run_ui(event)
     elseif currentState == pageStatus.saving then
         lcd.drawFilledRectangle(SaveBox.x,SaveBox.y,SaveBox.w,SaveBox.h,backgroundFill)
         lcd.drawRectangle(SaveBox.x,SaveBox.y,SaveBox.w,SaveBox.h,SOLID)
-        lcd.drawText(SaveBox.x+SaveBox.x_offset,SaveBox.y+SaveBox.h_offset,"Saving...",DBLSIZE + BLINK + (globalTextOptions))
+        if saveRetries <= 0 then
+            lcd.drawText(SaveBox.x+SaveBox.x_offset,SaveBox.y+SaveBox.h_offset,"Saving...",DBLSIZE + BLINK + (globalTextOptions))
+        else
+            lcd.drawText(SaveBox.x+SaveBox.x_offset,SaveBox.y+SaveBox.h_offset,"Retrying",DBLSIZE + (globalTextOptions))
+        end
     end
     processMspReply(mspPollReply())
     return 0