Merge branch '2.3' into 2.4

This commit is contained in:
Raphael Coeffic
2021-05-16 12:55:21 +02:00
150 changed files with 7726 additions and 4099 deletions
+1 -1
View File
@@ -244,7 +244,7 @@ void menuModelSelect(event_t event)
#endif
#endif
#if defined(ROTARY_ENCODER) && defined(NAVIGATION_X7)
#if defined(ROTARY_ENCODER_NAVIGATION) && defined(NAVIGATION_X7)
case EVT_ROTARY_LEFT:
case EVT_ROTARY_RIGHT:
#endif