Fix timer display and listing error messages

src/rx.c

@@ -4,20 +4,20 @@
 
 #ifdef DEBUG
 
-#define DEBUG_TEST_PART_VERSION
-#define DEBUG_EEPROM_DATA_READ
-#define DEBUG_EEPROM_DATA_WRITE
-#define DEBUG_MISSING_PACKETS
-#define DEBUG_PACKET_DUMP
-#define DEBUG_PACKET_DUMP_TUNE
-#define DEBUG_PACKET_DUMP_BIND
-#define DEBUG_PACKET_DUMP_LIST
-#define DEBUG_PPM_VALUES
-#define DEBUG_ERROR_MESSAGES
-#define DEBUG_MESSAGES
-#define DEBUG_HOP_DATA
-
-//#define DEBUG_SINGLE_CHARACTER_MESSAGES
+//#define DEBUG_TEST_PART_VERSION
+//#define DEBUG_EEPROM_DATA_READ
+//#define DEBUG_EEPROM_DATA_WRITE
+//#define DEBUG_MISSING_PACKETS
+//#define DEBUG_PACKET_DUMP
+//#define DEBUG_PACKET_DUMP_TUNE
+//#define DEBUG_PACKET_DUMP_BIND
+//#define DEBUG_PACKET_DUMP_LIST
+//#define DEBUG_PPM_VALUES
+//#define DEBUG_ERROR_MESSAGES
+//#define DEBUG_MESSAGES
+//#define DEBUG_HOP_DATA
+
+#define DEBUG_SINGLE_CHARACTER_MESSAGES
 
 #define ALWAYS_PERFORM_BINDING
 #define DISABLE_REAL_EEPROM_WRITE
@@ -291,6 +291,7 @@ static void tuning() {
 
         }
 
+        // TODO use timer here?
         if (frequencyOffsetTimer > 3000) {
             frequencyOffsetTimer = 0;
             //cc2500WriteReg(CC2500_0C_FSCTRL0, frequencyOffsetHack);
@@ -509,6 +510,11 @@ static void performBind(void) {
                             debugWrite("\n");
 #endif
                         }
+#ifdef DEBUG_SINGLE_CHARACTER_MESSAGES
+                        debugChar('l');
+#endif
+                        break;
+                    } else {
 #ifdef DEBUG_ERROR_MESSAGES
                         if (!(ccData[ccLen - 1] & CC2500_LQI_CRC_OK_BM)) {
                             debugWrite("RX: List: invalid CRC!\n");
@@ -543,11 +549,6 @@ static void performBind(void) {
                         }
 #endif
 #ifdef DEBUG_SINGLE_CHARACTER_MESSAGES
-                        debugChar('l');
-#endif
-                        break;
-                    } else {
-#ifdef DEBUG_SINGLE_CHARACTER_MESSAGES
                         debugChar('m');
 #endif
                     }
@@ -873,7 +874,7 @@ void rxReceivePacket() {
 
 #ifdef DEBUG_PPM_VALUES
         debugWrite("RX: got packet @ ");
-        debugUnsigned64(timerGet() / 1000);
+        debugUnsigned64(timerGet() / 1000000);
         debugWrite("s:\n");
         for (uint8_t i = 0; i < CHANNELS; i++) {
             debugUnsigned8(i);