Merge with latest 2.3

2020-10-07 21:01:45 +02:00
parent fd9ae06519 c07be1eb9b
commit 42a3198568
376 changed files with 10566 additions and 8633 deletions
@@ -69,3 +69,5 @@ void editSingleName(coord_t x, coord_t y, const char * label, char *name, uint8_

 uint8_t s_currIdx;
 uint8_t s_currIdxSubMenu;
+uint16_t s_currSrcRaw;
+uint16_t s_currScale;