Changed makefile so that CFLAGS can be put in config.mk

bitcraze · Sep 3, 2015 · 04c8844 · 04c8844
1 parent e655163
commit 04c8844
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ PROCESSOR = -mcpu=cortex-m0 -mthumb
 NRF= -DNRF51
 PROGRAM=cf2_nrf
 
-CFLAGS=$(PROCESSOR) $(NRF) $(PERSONAL_DEFINES) $(INCLUDES) -g3 -O0 -Wall# -fdata-sections
+CFLAGS+=$(PROCESSOR) $(NRF) $(PERSONAL_DEFINES) $(INCLUDES) -g3 -O0 -Wall# -fdata-sections
 CFLAGS+= -fsingle-precision-constant -ffast-math
 # --specs=nano.specs -flto
 ASFLAGS=$(PROCESSOR)

diff --git a/src/pm.c b/src/pm.c
@@ -178,7 +178,11 @@ static void pmRunSystem(bool enable)
 
     // Enable RF power amplifier
     nrf_gpio_cfg_output(RADIO_PAEN_PIN);
+#ifdef DISABLE_PA
+    nrf_gpio_pin_clear(RADIO_PAEN_PIN);
+#else
     nrf_gpio_pin_set(RADIO_PAEN_PIN);
+#endif
 
     // Sink battery divider
     nrf_gpio_cfg_output(PM_VBAT_SINK_PIN);

diff --git a/src/uart.c b/src/uart.c
@@ -168,6 +168,8 @@ char uartGetc()
   if (!isInit)
       return c;
 
+  // TODO: Add overrun check
+
   if (head!=tail) {
     c = rxq[tail++];
     if (tail >= Q_LENGTH) tail = 0;