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
@@ -149,7 +149,7 @@ void ModelCell::setModelId(uint8_t moduleIdx, uint8_t id)
 //     getTimerString(timer, 0);
 //     for (uint8_t i = 0; i < MAX_TIMERS; i++) {
 //       if (partialmodel.timers[i].mode != 0 && partialmodel.timers[i].persistent) {
-//         getTimerString(timer, partialmodel.timers[i].value);
+//         getTimerString(timer, partialmodel.timers[i].value, 1);
 //         break;
 //       }
 //     }