Cleaned up compile-time configuration flags.

Author: ccattuto

firmware/nRF51/tag-proximity/inc/config.h

@@ -26,13 +26,16 @@
 #define __CONFIG_H__
 
 /* log to flash */
-#define CONFIG_FLASH_LOGGING  1
+#define CONFIG_FLASH_LOGGING        1
 
 /* blink on receiving a proximity packet */
-#define PROXIMITY_BLINK       0
+#define CONFIG_PROXIMITY_BLINK      0
 
 /* if epoch is invalid, pick up time from proximity packet */
-#define PROXIMITY_TIME        1
+#define CONFIG_EPOCH_PROXIMITY      1
+
+/* double blink on invalid epoch time */
+#define CONFIG_EPOCH_INVALID_BLINK  1
 
 /* every CONFIG_PROX_SPACING-RANDOM(2^CONFIG_PROX_SPACING_RNG_BITS)
  * listen for CONFIG_PROX_LISTEN - all based on LF_FREQUENCY ticks */

firmware/nRF51/tag-proximity/inc/openbeacon-proto.h

@@ -41,11 +41,12 @@
 
 #define FLAG_BOOT               (1 << 0)
 #define FLAG_TIME_RESET         (1 << 1)
-#define FLAG_LOG_STOPPED        (1 << 2)
-#define ERROR_FLASH_WRITE       (1 << 3)
-#define ERROR_LOG_BUF_OVERRUN   (1 << 4)
-#define ERROR_LOG_COMPRESS      (1 << 5)
-#define ERROR_FLASH_FULL        (1 << 6)
+#define FLAG_HIBERNATE			(1 << 2)
+#define FLAG_LOG_STOPPED        (1 << 3)
+#define ERROR_FLASH_WRITE       (1 << 4)
+#define ERROR_LOG_BUF_OVERRUN   (1 << 5)
+#define ERROR_LOG_COMPRESS      (1 << 6)
+#define ERROR_FLASH_FULL        (1 << 7)
 
 
 typedef struct

firmware/nRF51/tag-proximity/src/main.c

@@ -206,6 +206,7 @@ void main_entry(void)
 			timer_wait(MILLISECONDS(1));
 			nrf_gpio_pin_clear(CONFIG_LED_PIN);
 
+#if CONFIG_EPOCH_INVALID_BLINK
 			/* double blink if epoch time is invalid */
 			if (get_time() < VALID_EPOCH_THRES) {
 				timer_wait(MILLISECONDS(100));
@@ -214,6 +215,7 @@ void main_entry(void)
 				timer_wait(MILLISECONDS(1));
 				nrf_gpio_pin_clear(CONFIG_LED_PIN);
 			}
+#endif /* CONFIG_EPOCH_INVALID_BLINK */
 		}
 	}
 }

firmware/nRF51/tag-proximity/src/radio.c

@@ -193,7 +193,7 @@ void RTC0_IRQ_Handler(void)
 		/* stop HF clock */
 		NRF_CLOCK->TASKS_HFCLKSTOP = 1;
 
-#if PROXIMITY_BLINK
+#if CONFIG_PROXIMITY_BLINK
 		if(g_nrf_state == NRF_STATE_RX_PROX_BLINK)
 		{
 			g_nrf_state = NRF_STATE_IDLE;
@@ -203,7 +203,7 @@ void RTC0_IRQ_Handler(void)
 			NRF_RTC0->CC[2] = NRF_RTC0->COUNTER + MILLISECONDS(1);
 		}
 		else
-#endif /*PROXIMITY_BLINK*/
+#endif /* CONFIG_PROXIMITY_BLINK */
 		{
 			/* set next state */
 			g_nrf_state = NRF_STATE_IDLE;
@@ -212,10 +212,10 @@ void RTC0_IRQ_Handler(void)
 			/* disable DC-DC converter */
 			NRF_POWER->DCDCEN = 0;
 
-#if PROXIMITY_BLINK
+#if CONFIG_PROXIMITY_BLINK
 			/* disable LED */
 			nrf_gpio_pin_clear(CONFIG_LED_PIN);
-#endif /*PROXIMITY_BLINK*/
+#endif /* CONFIG_PROXIMITY_BLINK */
 		}
 	}
 }
@@ -271,14 +271,14 @@ static void radio_on_prox_packet(uint16_t delta_t)
 	if(g_pkt_prox_rx.p.prox.uid == g_pkt_prox.p.prox.uid)
 		return;
 
-#if PROXIMITY_TIME
+#if CONFIG_EPOCH_PROXIMITY
 	/* if we lack a valid epoch time, get it from proximity packet */
 	if ( g_time < VALID_EPOCH_THRES && g_pkt_prox_rx.p.prox.epoch > VALID_EPOCH_THRES )
 	{
 		g_time = g_pkt_prox_rx.p.prox.epoch;
 		status_flags |= FLAG_TIME_RESET;
 	}
-#endif /* PROXIMITY_TIME */
+#endif /* CONFIG_EPOCH_PROXIMITY */
 
 	/* maintain epoch time offset */
 	if(g_pkt_prox_rx.p.prox.epoch > (g_time+g_time_offset))