Merge branch '2.4' into 3djc/fix-chars

2020-12-04 16:45:21 +01:00
parent 23e1531c72 edd16a4b85
commit 32807418e8
2 changed files with 3 additions and 4 deletions
@@ -18,8 +18,7 @@
 * GNU General Public License for more details.
 */

-#ifndef _LIBOPENUI_CONFIG_H_
-#define _LIBOPENUI_CONFIG_H_
+#pragma once

 #include "debug.h"
 #include "libopenui_defines.h"
@@ -173,4 +172,4 @@ constexpr LcdFlags TABLE_BODY_FONT = FONT(STD);
 constexpr int CJK_FIRST_LETTER_INDEX = 189;
 constexpr coord_t CHAR_SPACING = 0;

-#endif // _LIBOPENUI_CONFIG_H_
+#define ROTARY_ENCODER_SPEED() rotencSpeed