X10 (#4377)

[X10] New radio supported!

radio/src/cli.cpp

@@ -681,7 +681,7 @@ int cliDisplay(const char ** argv)
     }
   }
   else if (!strcmp(argv[1], "adc")) {
-    for (int i=0; i<NUMBER_ANALOG; i++) {
+    for (int i=0; i<NUM_ANALOGS; i++) {
       serialPrint("adc[%d] = %04X", i, (int)adcValues[i]);
     }
   }
@@ -859,7 +859,7 @@ int cliRepeat(const char ** argv)
 int cliShowJitter(const char ** argv)
 {
   serialPrint(  "#   anaIn   rawJ   avgJ");
-  for (int i=0; i<NUMBER_ANALOG; i++) {
+  for (int i=0; i<NUM_ANALOGS; i++) {
     serialPrint("A%02d %04X %04X %3d %3d", i, getAnalogValue(i), anaIn(i), rawJitter[i].get(), avgJitter[i].get());
     if (IS_POT_MULTIPOS(i)) {
       StepsCalibData * calib = (StepsCalibData *) &g_eeGeneral.calib[i];
@@ -897,7 +897,7 @@ int cliGps(const char ** argv)
 }
 #endif
 
-#if defined(PCBX9E) || defined(PCBHORUS)
+#if defined(BLUETOOTH)
 int cliBlueTooth(const char ** argv)
 {
   int baudrate = 0;
@@ -964,7 +964,7 @@ const CliCommand cliCommands[] = {
 #if defined(INTERNAL_GPS)
   { "gps", cliGps, "<baudrate>|$<command>|trace" },
 #endif
-#if defined(PCBX9E) || defined(PCBHORUS)
+#if defined(BLUETOOTH)
   { "bt", cliBlueTooth, "<baudrate>|$<command>|read" },
 #endif
   { NULL, NULL, NULL }  /* sentinel */