More efficient code

diff --git a/src/avr/src/vars.c b/src/avr/src/vars.c
index 5a4b0cdbd228d5fae88c7a8888a6f1fe860f46fe..888c3500a47e2b881e01aa3aa6af71947dccb25d 100644 (file)
--- a/src/avr/src/vars.c
+++ b/src/avr/src/vars.c
@@ -161,24 +161,25 @@ void vars_report(bool full) {
   bool reported = false;
 
 #define VAR(NAME, CODE, TYPE, INDEX, ...)                               \
-  IF(INDEX)(for (int i = 0; i < (INDEX ? INDEX : 1); i++)) {            \
-    TYPE value = get_##NAME(IF(INDEX)(i));                              \
-    TYPE last = (NAME##_state)IF(INDEX)([i]);                           \
-    bool report = _get_report_var(var_code_##CODE);                     \
+  if (_get_report_var(var_code_##CODE)) {                               \
+    IF(INDEX)(for (int i = 0; i < (INDEX ? INDEX : 1); i++)) {          \
+      TYPE value = get_##NAME(IF(INDEX)(i));                            \
+      TYPE last = (NAME##_state)IF(INDEX)([i]);                         \
                                                                         \
-    if ((report && !type_eq_##TYPE(value, last)) || full) {             \
-      (NAME##_state)IF(INDEX)([i]) = value;                             \
+      if (full || (!type_eq_##TYPE(value, last))) {                     \
+        (NAME##_state)IF(INDEX)([i]) = value;                           \
                                                                         \
-      if (!reported) {                                                  \
-        reported = true;                                                \
-        putchar('{');                                                   \
-      } else putchar(',');                                              \
+        if (!reported) {                                                \
+          reported = true;                                              \
+          putchar('{');                                                 \
+        } else putchar(',');                                            \
                                                                         \
-      printf_P                                                          \
-        (IF_ELSE(INDEX)(indexed_code_fmt, code_fmt),                    \
-         IF(INDEX)(INDEX##_LABEL[i],) #CODE);                           \
+        printf_P                                                        \
+          (IF_ELSE(INDEX)(indexed_code_fmt, code_fmt),                  \
+           IF(INDEX)(INDEX##_LABEL[i],) #CODE);                         \
                                                                         \
-      type_print_##TYPE(value);                                         \
+        type_print_##TYPE(value);                                       \
+      }                                                                 \
     }                                                                   \
   }