diff -rcw FreeRTOSV4.7.2/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c *** FreeRTOSV4.7.2/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c 2008-02-21 19:05:50.000000000 -0500 --- FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c 2008-02-22 16:00:17.000000000 -0500 *************** *** 107,112 **** --- 107,115 ---- #include "rit128x96x4.h" #include "osram128x64x4.h" + /* 1 if running on Luminary Micro LM3S6965 Rev C Board with RIT OLED else 0 */ + #define EK_LM3S6965_REVC 1 + /*-----------------------------------------------------------*/ /* The time between cycles of the 'check' functionality (defined within the *************** *** 333,339 **** --- 336,344 ---- for the evaluation kit being used. */ switch( HWREG( SYSCTL_DID1 ) & SYSCTL_DID1_PRTNO_MASK ) { + #if !EK_LM3S6965_REVC case SYSCTL_DID1_PRTNO_6965 : + #endif case SYSCTL_DID1_PRTNO_2965 : vOLEDInit = OSRAM128x64x4Init; vOLEDStringDraw = OSRAM128x64x4StringDraw; vOLEDImageDraw = OSRAM128x64x4ImageDraw; diff -rcw FreeRTOSV4.7.2/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/rit128x96x4.c FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/rit128x96x4.c *** FreeRTOSV4.7.2/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/rit128x96x4.c 2008-02-17 18:36:14.000000000 -0500 --- FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/rit128x96x4.c 2008-02-22 15:51:12.000000000 -0500 *************** *** 56,61 **** --- 56,66 ---- #define LM3S8962_GPIO_OLEDDC_PIN GPIO_PIN_6 #define LM3S8962_GPIO_OLEDEN_PIN GPIO_PIN_7 + #define LM3S6965_SYSCTL_PERIPH_GPIO_OLEDDC SYSCTL_PERIPH_GPIOC + #define LM3S6965_GPIO_OLEDDC_BASE GPIO_PORTC_BASE + #define LM3S6965_GPIO_OLEDDC_PIN GPIO_PIN_7 + #define LM3S6965_GPIO_OLEDEN_PIN GPIO_PIN_6 + #define LM3S1968_SYSCTL_PERIPH_GPIO_OLEDDC SYSCTL_PERIPH_GPIOH #define LM3S1968_GPIO_OLEDDC_BASE GPIO_PORTH_BASE #define LM3S1968_GPIO_OLEDDC_PIN GPIO_PIN_2 *************** *** 591,597 **** // If there is room, dump the single data byte column to the // display. Otherwise, bail out. // ! if(ulX < 126) { RITWriteData(g_pucBuffer, 8); ulX += 2; --- 596,602 ---- // If there is room, dump the single data byte column to the // display. Otherwise, bail out. // ! if(ulX <= 126) { RITWriteData(g_pucBuffer, 9); ulX += 2; *************** *** 845,856 **** /* Determine which board is being used. */ if( SysCtlPeripheralPresent( SYSCTL_PERIPH_ETH ) ) { ! /* Ethernet is present, we must be using the LM3S8962 EK. */ ulGPIOId = LM3S8962_SYSCTL_PERIPH_GPIO_OLEDDC; ulGPIOBase = LM3S8962_GPIO_OLEDDC_BASE; ulOLEDDC_PIN = GPIO_PIN_6; ulOLEDEN_PIN = GPIO_PIN_7; } else { /* Ethernet is not present, we must be using the LM3S1968 EK. */ --- 850,871 ---- /* Determine which board is being used. */ if( SysCtlPeripheralPresent( SYSCTL_PERIPH_ETH ) ) { ! /* Ethernet is present, check if LM3S6965 or LM3S8962 EK. */ ! if ( (HWREG( SYSCTL_DID1 ) & SYSCTL_DID1_PRTNO_MASK) == SYSCTL_DID1_PRTNO_6965) { ! ulGPIOId = LM3S6965_SYSCTL_PERIPH_GPIO_OLEDDC; ! ulGPIOBase = LM3S6965_GPIO_OLEDDC_BASE; ! ulOLEDDC_PIN = LM3S6965_GPIO_OLEDDC_PIN; ! ulOLEDEN_PIN = LM3S6965_GPIO_OLEDEN_PIN; ! } ! else ! { ulGPIOId = LM3S8962_SYSCTL_PERIPH_GPIO_OLEDDC; ulGPIOBase = LM3S8962_GPIO_OLEDDC_BASE; ulOLEDDC_PIN = GPIO_PIN_6; ulOLEDEN_PIN = GPIO_PIN_7; } + + } else { /* Ethernet is not present, we must be using the LM3S1968 EK. */