Переглянути джерело

Removed unused definition

Sandro Kalatozishvili 2 роки тому
батько
коміт
3b587d93b9
3 змінених файлів з 6 додано та 9 видалено
  1. 2 4
      xremote_analyzer.c
  2. 1 0
      xremote_app.h
  3. 3 5
      xremote_learn.c

+ 2 - 4
xremote_analyzer.c

@@ -9,14 +9,12 @@
 #include "xremote_analyzer.h"
 #include "xremote_analyzer.h"
 #include "views/xremote_signal_view.h"
 #include "views/xremote_signal_view.h"
 
 
-#define XREMOTE_TEXT_MAX    128
-
 struct XRemoteSignalAnalyzer {
 struct XRemoteSignalAnalyzer {
     XRemoteSignalReceiver* ir_receiver;
     XRemoteSignalReceiver* ir_receiver;
+    XRemoteClearCallback on_clear;
     XRemoteAppContext* app_ctx;
     XRemoteAppContext* app_ctx;
-    XRemoteView* signal_view;
     InfraredSignal* ir_signal;
     InfraredSignal* ir_signal;
-    XRemoteClearCallback on_clear;
+    XRemoteView* signal_view;
     void* context;
     void* context;
     bool pause;
     bool pause;
 };
 };

+ 1 - 0
xremote_app.h

@@ -30,6 +30,7 @@
 
 
 #define XREMOTE_APP_EXTENSION   ".ir"
 #define XREMOTE_APP_EXTENSION   ".ir"
 #define XREMOTE_APP_FOLDER      ANY_PATH("infrared")
 #define XREMOTE_APP_FOLDER      ANY_PATH("infrared")
+#define XREMOTE_APP_TEXT_MAX    128
 
 
 #define xremote_app_assert_void(cond) if (!cond) return
 #define xremote_app_assert_void(cond) if (!cond) return
 #define xremote_app_assert(cond, var) if (!cond) return var
 #define xremote_app_assert(cond, var) if (!cond) return var

+ 3 - 5
xremote_learn.c

@@ -9,8 +9,6 @@
 #include "xremote_learn.h"
 #include "xremote_learn.h"
 #include "views/xremote_learn_view.h"
 #include "views/xremote_learn_view.h"
 
 
-#define XREMOTE_TEXT_MAX    128
-
 struct XRemoteLearnContext {
 struct XRemoteLearnContext {
     /* XRemote context */
     /* XRemote context */
     XRemoteSignalReceiver* ir_receiver;
     XRemoteSignalReceiver* ir_receiver;
@@ -32,7 +30,7 @@ struct XRemoteLearnContext {
     void* context;
     void* context;
 
 
     /* Private control flags */
     /* Private control flags */
-    char text_store[XREMOTE_TEXT_MAX + 1];
+    char text_store[XREMOTE_APP_TEXT_MAX + 1];
     uint8_t current_button;
     uint8_t current_button;
     bool finish_learning;
     bool finish_learning;
     bool stop_receiver;
     bool stop_receiver;
@@ -257,7 +255,7 @@ static void xremote_learn_finish(XRemoteLearnContext *learn_ctx)
 
 
     if (infrared_remote_get_button_count(learn_ctx->ir_remote) || learn_ctx->is_dirty)
     if (infrared_remote_get_button_count(learn_ctx->ir_remote) || learn_ctx->is_dirty)
     {
     {
-        snprintf(learn_ctx->text_store, XREMOTE_TEXT_MAX, "Remote_");
+        snprintf(learn_ctx->text_store, XREMOTE_APP_TEXT_MAX, "Remote_");
         text_input_set_header_text(learn_ctx->text_input, "Name new remote");
         text_input_set_header_text(learn_ctx->text_input, "Name new remote");
 
 
         text_input_set_result_callback(
         text_input_set_result_callback(
@@ -265,7 +263,7 @@ static void xremote_learn_finish(XRemoteLearnContext *learn_ctx)
             xremote_learn_text_input_callback,
             xremote_learn_text_input_callback,
             learn_ctx,
             learn_ctx,
             learn_ctx->text_store,
             learn_ctx->text_store,
-            XREMOTE_TEXT_MAX,
+            XREMOTE_APP_TEXT_MAX,
             true);
             true);
 
 
         xremote_learn_switch_to_view(learn_ctx, XRemoteViewTextInput);
         xremote_learn_switch_to_view(learn_ctx, XRemoteViewTextInput);