Merge branch 'release/5.4.0.2'

LDmicro · Dec 10, 2019 · ca23731 · ca23731
2 parents 5cc7acd + 2a4708e
commit ca23731
Show file tree

Hide file tree

Showing 16 changed files with 4,494 additions and 1,807 deletions.
diff --git a/common/utils/filetracker.hpp b/common/utils/filetracker.hpp
@@ -97,6 +97,11 @@ class FileTracker
             }
         return *this;
     }
+    std::string name()
+    {
+        return name_;
+    }
+
 private:
     mutable FILE* file_;
     std::string name_;

diff --git a/ldmicro/CHANGES.txt b/ldmicro/CHANGES.txt
@@ -1,3 +1,15 @@
+== Release 5.4.0.2
+
+    * Fixed Microchip PIC16F887 44-TQFP UART, ISP,I2C pins.
+
+    * Fixed Quad Encoder Output dialog Dir pin name.
+
+    * Fixed Atmel AVR ATmega32U4 pins mapping for Arduino.
+
+    * Fixed Spanish locale. Thank you very much, Paulino Cano.
+      lang-es.txt, manual-es.txt updated.
+
+
 == Release 5.4.0.1 String type support
 
     * Added

diff --git a/ldmicro/iolist.cpp b/ldmicro/iolist.cpp
@@ -909,7 +909,8 @@ bool LoadIoListFromFile(FileTracker &f)
                     type = IO_TYPE_MODBUS_HREG;
                     break;
                 default:
-                    oops();
+                    Warning(_("Line\n'%s'\nis skipped in IO LIST section from '%s'"), strspace(line), f.name());
+                    continue;
             }
         }
         char *s = strstr(line, " at ");