From 934666c77dc255aa0b683e2d756b7b0110c1b222 Mon Sep 17 00:00:00 2001 From: "matthias.ringwald@gmail.com" Date: Fri, 4 Apr 2014 08:36:07 +0000 Subject: [PATCH] remove display code in order to compile with mspgcc-201204xx LTS version --- MSP-EXP430F5438-CC256x/example/Makefile | 2 +- MSP-EXP430F5438-CC256x/example/spp_accel.c | 34 ---------------------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/MSP-EXP430F5438-CC256x/example/Makefile b/MSP-EXP430F5438-CC256x/example/Makefile index 10214d634..ce19ef172 100644 --- a/MSP-EXP430F5438-CC256x/example/Makefile +++ b/MSP-EXP430F5438-CC256x/example/Makefile @@ -67,7 +67,7 @@ led_counter.out: ${CORE_OBJ} led_counter.o hid_demo.out: ${CORE_OBJ} ${COMMON_OBJ} ${LCD_OBJ} hid_demo.o ${CC} $^ ${LDFLAGS} -o $@ -spp_accel.out: ${CORE_OBJ} ${COMMON_OBJ} ${LCD_OBJ} spp_accel.o ../firmware/hal_adc.o +spp_accel.out: ${CORE_OBJ} ${COMMON_OBJ} spp_accel.o ../firmware/hal_adc.o ${CC} $^ ${LDFLAGS} -o $@ spp_counter.out: ${CORE_OBJ} ${COMMON_OBJ} spp_counter.o ../firmware/hal_adc.o diff --git a/MSP-EXP430F5438-CC256x/example/spp_accel.c b/MSP-EXP430F5438-CC256x/example/spp_accel.c index f1932c738..fccd55ac8 100644 --- a/MSP-EXP430F5438-CC256x/example/spp_accel.c +++ b/MSP-EXP430F5438-CC256x/example/spp_accel.c @@ -15,11 +15,8 @@ #include "hal_adc.h" #include "hal_board.h" #include "hal_compat.h" -#include "hal_lcd.h" #include "hal_usb.h" -#include "UserExperienceGraphics.h" - #include #include #include @@ -43,32 +40,6 @@ static uint8_t rfcomm_channel_nr = 1; static uint16_t rfcomm_channel_id; static uint8_t spp_service_buffer[150]; -// LCD setup -void doLCD(void){ - //Initialize LCD - // 138 x 110, 4-level grayscale pixels. - halLcdInit(); - halLcdSetContrast(100); - halLcdClearScreen(); - halLcdImage(TI_TINY_BUG, 4, 32, 104, 12 ); - - halLcdPrintLine("BTstack on ", 0, 0); - halLcdPrintLine("TI MSP430", 1, 0); - halLcdPrintLine("SPP ACCEL", 2, 0); - halLcdPrintLine("Init...", 4, 0); - row = 5; -} - -void clearLine(int line){ - halLcdClearImage(130, FONT_HEIGHT, 0, line*FONT_HEIGHT); -} - -void printLine(char *text){ - printf("LCD: %s\n\r", text); - halLcdPrintLine(text, row++, 0); -} - - // SPP description static uint8_t accel_buffer[6]; @@ -137,7 +108,6 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha case HCI_EVENT_PIN_CODE_REQUEST: // inform about pin code request - printLine( "PIN = 0000"); printf("Pin code request - using '0000'\n\r"); bt_flip_addr(event_addr, &packet[2]); hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000"); @@ -156,7 +126,6 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha // data: event(8), len(8), status (8), address (48), server channel(8), rfcomm_cid(16), max frame size(16) if (packet[2]) { printf("RFCOMM channel open failed, status %u\n\r", packet[2]); - printLine("Connection failed :("); } else { rfcomm_channel_id = READ_BT_16(packet, 12); mtu = READ_BT_16(packet, 14); @@ -219,9 +188,6 @@ int main(void) { LED_PORT_OUT |= LED_1 | LED_2; LED_PORT_DIR |= LED_1 | LED_2; - // show off - doLCD(); - prepare_accel_packet(); printf("Init BTstack...\n\r");