From 26571c53f854aa77cb1e1b4ba0194341af6b5762 Mon Sep 17 00:00:00 2001
From: David <stierint@hotmail.com>
Date: Wed, 19 Feb 2020 19:21:08 -0600
Subject: [PATCH] Added flag to disable the LCD
---
README.MD | 6 ++----
src/application/dw_main.c | 43 +++++++++++++++++++++++++++++---------
src/application/instance.h | 3 ++-
src/platform/port.c | 12 +++++++----
src/platform/port.h | 2 +-
5 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/README.MD b/README.MD
index 8324b13..df58582 100644
--- a/README.MD
+++ b/README.MD
@@ -50,10 +50,8 @@ Then simply click the *Build* button and the EVK1000/Debug/bin/ directory will b
### Interfacing with the iBQR
-### EVK1000 Display
+### EVB1000 Display
-In order to save power, the LCD display is disabled by default. It can be reenabled by setting ... in .... When enabled, the LCD will display the range calculated and the address of the TAG/ANCHOR that it ranged with.
-
-//TODO have the display disabled by default but allow it to be enabled by setting a flag in the software
+In order to save power, the LCD display is disabled by default. It can be reenabled by changing `#define USING_LCD (0)` to `#define USING_LCD (1)` in [src/application/instance.h](src/application/instance.h). When enabled, the LCD will display the range calculated and the address of the TAG/ANCHOR that it ranged with.
### Calibration
\ No newline at end of file
diff --git a/src/application/dw_main.c b/src/application/dw_main.c
index 42a3a8f..557c760 100644
--- a/src/application/dw_main.c
+++ b/src/application/dw_main.c
@@ -261,12 +261,14 @@ void setLCDline1(uint8 s1switch)
**/
void configure_continuous_txspectrum_mode(uint8 s1switch)
{
+#if (USING_LCD == 1)
uint8 command = 0x2 ; //return cursor home
writetoLCD( 1, 0, &command);
sprintf((char*)&dataseq[0], "Conti TX %s:%d:%d ", (s1switch & SWS1_SHF_MODE) ? "S" : "L", chan, prf);
writetoLCD( 40, 1, dataseq); //send some data
memcpy(dataseq, (const uint8 *) "Spectrum Test ", 16);
writetoLCD( 16, 1, dataseq); //send some data
+#endif
//configure DW1000 into Continuous TX mode
instance_starttxtest(0x1000);
@@ -295,17 +297,21 @@ int dw_main(void)
int i = 0;
int toggle = 1;
double range_result = 0;
-// double avg_result = 0;
int canSleep;
led_off(LED_ALL); //turn off all the LEDs
peripherals_init();
- spi_peripheral_init();
+#if (USING_LCD == 1)
+ spi_peripheral_init(1);
+#else
+ spi_peripheral_init(0);
+#endif
Sleep(1000); //wait for LCD to power on
+#if (USING_LCD == 1)
initLCD();
memset(dataseq, 0x0, sizeof(dataseq));
@@ -313,6 +319,7 @@ int dw_main(void)
writetoLCD( 40, 1, dataseq); //send some data
memcpy(dataseq, (const uint8 *) SOFTWARE_VER_STRING, 16); // Also set at line #26 (Should make this from single value !!!)
writetoLCD( 16, 1, dataseq); //send some data
+#endif
Sleep(1000);
@@ -336,7 +343,7 @@ int dw_main(void)
{
int j = 1000000;
uint8 command;
-
+#if (USING_LCD == 1)
memset(dataseq, 0, LCD_BUFF_LEN);
while(j--);
@@ -345,18 +352,21 @@ int dw_main(void)
memcpy(dataseq, (const uint8 *) "DECAWAVE ", 12);
writetoLCD( 40, 1, dataseq); //send some data
+#endif
#ifdef USB_SUPPORT //this is set in the port.h file
memcpy(dataseq, (const uint8 *) "USB to SPI ", 12);
#else
#endif
+#if (USING_LCD == 1)
writetoLCD( 16, 1, dataseq); //send some data
-
+#endif
j = 1000000;
while(j--);
-
+#if (USING_LCD == 1)
command = 0x2 ; //return cursor home
writetoLCD( 1, 0, &command);
+#endif
#ifdef USB_SUPPORT //this is set in the port.h file
// Do nothing in foreground -- allow USB application to run, I guess on the basis of USB interrupts?
while (1) // loop forever
@@ -368,6 +378,7 @@ int dw_main(void)
}
else //run DecaRanging application
{
+#if (USING_LCD == 1)
uint8 dataseq[LCD_BUFF_LEN];
uint8 command = 0x0;
@@ -376,6 +387,7 @@ int dw_main(void)
memset(dataseq, ' ', LCD_BUFF_LEN);
memcpy(dataseq, (const uint8 *) "DECAWAVE RANGE", 16);
writetoLCD( 16, 1, dataseq); //send some data
+#endif
led_off(LED_ALL);
@@ -385,7 +397,7 @@ int dw_main(void)
if(inittestapplication(s1switch) == (uint32)-1)
{
-
+#if (USING_LCD == 1)
led_on(LED_ALL); //to display error....
dataseq[0] = 0x2 ; //return cursor home
@@ -395,6 +407,7 @@ int dw_main(void)
writetoLCD( 40, 1, dataseq); //send some data
memcpy(dataseq, (const uint8 *) " INIT FAIL ", 12);
writetoLCD( 40, 1, dataseq); //send some data
+#endif
return 0; //error
}
@@ -409,18 +422,20 @@ int dw_main(void)
i=30;
while(i--)
{
+#if (USING_LCD == 1)
if (i & 1) led_off(LED_ALL);
else led_on(LED_ALL);
-
+#endif
Sleep(200);
}
i = 0;
led_off(LED_ALL);
+#if (USING_LCD == 1)
command = 0x2 ; //return cursor home
writetoLCD( 1, 0, &command);
memset(dataseq, ' ', LCD_BUFF_LEN);
-
+#endif
if(s1switch & SWS1_ANC_MODE)
{
instance_mode = ANCHOR;
@@ -433,6 +448,7 @@ int dw_main(void)
led_on(LED_PC7);
}
+#if (USING_LCD == 1)
if(instance_mode == TAG)
{
memcpy(&dataseq[2], (const uint8 *) " TAG BLINK ", 12);
@@ -451,10 +467,14 @@ int dw_main(void)
command = 0x2 ; //return cursor home
writetoLCD( 1, 0, &command);
+#endif
+
}
+#if (USING_LCD == 1)
memset(dataseq, ' ', LCD_BUFF_LEN);
memset(dataseq1, ' ', LCD_BUFF_LEN);
+#endif
port_EnableEXT_IRQ();
// main loop
@@ -471,6 +491,7 @@ int dw_main(void)
//send the new range information to LCD and/or USB
range_result = instance_get_idist(inst->newRangeUWBIndex);
//set_rangeresult(range_result);
+#if (USING_LCD == 1)
dataseq[0] = 0x2 ; //return cursor home
writetoLCD( 1, 0, dataseq);
@@ -482,7 +503,7 @@ int dw_main(void)
// sprintf((char*)&dataseq1[1], " ");
writetoLCD( 16, 1, dataseq1); //send some data
-
+#endif
aaddr = instancenewrangeancadd();
taddr = instancenewrangetagadd();
txa = instancetxantdly();
@@ -514,7 +535,7 @@ int dw_main(void)
#endif
}
-
+#if (USING_LCD == 1)
if(ranging == 0) //discovery/initialization mode for anchor and tag
{
@@ -598,6 +619,8 @@ int dw_main(void)
}
}
}
+#endif
+
#ifdef USB_SUPPORT //this is set in the port.h file
usb_run();
diff --git a/src/application/instance.h b/src/application/instance.h
index b587d81..7a711ce 100644
--- a/src/application/instance.h
+++ b/src/application/instance.h
@@ -42,7 +42,8 @@ extern "C" {
#define MASK_TXDTS (0x00FFFFFFFE00) //The TX timestamp will snap to 8 ns resolution - mask lower 9 bits.
-#define USING_64BIT_ADDR (1) //when set to 0 - the DecaRanging application will use 16-bit addresses
+#define USING_64BIT_ADDR (1) //when set to 0 - the DecaRanging application will use 16-bit addresses
+#define USING_LCD (0) //when set to 0 - the DecaRanging application will not use the LCD display
//! callback events
#define DWT_SIG_RX_NOERR 0
diff --git a/src/platform/port.c b/src/platform/port.c
index 71f5bae..ef5c17b 100644
--- a/src/platform/port.c
+++ b/src/platform/port.c
@@ -135,13 +135,17 @@ int peripherals_init (void)
/* @fn spi_peripheral_init
* */
-void spi_peripheral_init()
+void spi_peripheral_init(uint8_t using_lcd)
{
SPI1_Configuration(); //initialise SPI1 peripheral for DW1000 control
- SPI2_Configuration(); //initialise SPI2 peripheral for LCD control
- port_LCD_RS_clear();
- port_LCD_RW_clear();
+ if (using_lcd)
+ {
+ SPI2_Configuration(); //initialise SPI2 peripheral for LCD control
+
+ port_LCD_RS_clear();
+ port_LCD_RW_clear();
+ }
}
diff --git a/src/platform/port.h b/src/platform/port.h
index 1ba8c08..200e857 100644
--- a/src/platform/port.h
+++ b/src/platform/port.h
@@ -170,7 +170,7 @@ void led_on(led_t led);
void led_off(led_t led);
int peripherals_init(void);
-void spi_peripheral_init(void);
+void spi_peripheral_init(uint8_t using_lcd);
void setup_DW1000RSTnIRQ(int enable);
--
GitLab