rename X_flag to X

alon · Sep 3, 2010 · 9b93bb3 · 9b93bb3
1 parent 7402755
commit 9b93bb3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/juggled/cmd_tbl.h b/juggled/cmd_tbl.h
@@ -14,10 +14,10 @@ static cmd_t cmd_tbl[] =
     {"csent",   cmd_print_adxl_transmit_count},
     {"cread",   cmd_print_adxl_read_count},
     {"send",    cmd_send_test_message},
-    READ_WRITE_FLAG__CMD_TBL(read_adxl_flag),
-    READ_WRITE_FLAG__CMD_TBL(adxl_flag),
-    READ_WRITE_FLAG__CMD_TBL(print_flag),
-    READ_WRITE_FLAG__CMD_TBL(transmit_flag),
+    {"enb",     cmd_enable_adxl_interrupt},
+    READ_WRITE_FLAG__CMD_TBL(read_adxl),
+    READ_WRITE_FLAG__CMD_TBL(print),
+    READ_WRITE_FLAG__CMD_TBL(transmit),
     {NULL,      NULL}
 };
 

diff --git a/juggled/juggled_main.c b/juggled/juggled_main.c
@@ -55,10 +55,9 @@ static U32 adxl_transmit_count = 0;
 
 #define CYCLES_PER_TRANSMIT 1000
 
-READ_WRITE_FLAG__FLAG_IMP_DEFAULT(read_adxl_flag, false);
-READ_WRITE_FLAG__FLAG_IMP_DEFAULT(adxl_flag, false);
-READ_WRITE_FLAG__FLAG_IMP_DEFAULT(print_flag, false);
-READ_WRITE_FLAG__FLAG_IMP_DEFAULT(transmit_flag, false);
+READ_WRITE_FLAG__FLAG_IMP_DEFAULT(read_adxl, true);
+READ_WRITE_FLAG__FLAG_IMP_DEFAULT(print, false);
+READ_WRITE_FLAG__FLAG_IMP_DEFAULT(transmit, true);
 
 static U16 time_to_transmit = false;
 
@@ -253,14 +252,13 @@ void cmd_send_test_message(U8 argc, char **argv)
     static U8 test_count = 0;
     char str[10];
     sprintf(str, "%u", test_count++);
-    chb_init();
+    //chb_init();
     chb_write(STATIONARY_SHORT_ADDRESS, (U8*)str, strlen(str));
 }
 
-READ_WRITE_FLAG__CMD_IMPL(read_adxl_flag);
-READ_WRITE_FLAG__CMD_IMPL(adxl_flag);
-READ_WRITE_FLAG__CMD_IMPL(print_flag);
-READ_WRITE_FLAG__CMD_IMPL(transmit_flag);
+READ_WRITE_FLAG__CMD_IMPL(read_adxl);
+READ_WRITE_FLAG__CMD_IMPL(print);
+READ_WRITE_FLAG__CMD_IMPL(transmit);
 
 
 // Interrupt based adxl reads

diff --git a/juggled/juggled_main.h b/juggled/juggled_main.h
@@ -57,10 +57,9 @@ void cmd_##flag##_show (U8 argc, char **argv)
  {#flag "_off", cmd_##flag##_off},\
  {#flag "_show", cmd_##flag##_show}
 
-READ_WRITE_FLAG__CMD_DECL(read_adxl_flag);
-READ_WRITE_FLAG__CMD_DECL(adxl_flag);
-READ_WRITE_FLAG__CMD_DECL(print_flag);
-READ_WRITE_FLAG__CMD_DECL(transmit_flag);
+READ_WRITE_FLAG__CMD_DECL(read_adxl);
+READ_WRITE_FLAG__CMD_DECL(print);
+READ_WRITE_FLAG__CMD_DECL(transmit);
 
 #endif