Improvements:

- HAL re-organized
- FreeRTOS running stable
- UART finished
- SPI1 & SPI3 finished and functional
- Display driver added (functional)


git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@172 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
mmi
2017-09-20 06:51:53 +00:00
parent f5dd9e0f09
commit c9562e8bfd
313 changed files with 8279 additions and 50216 deletions

View File

@@ -0,0 +1,48 @@
CROSS_COMPILE = arm-none-eabi-
CC = $(CROSS_COMPILE)gcc
LD = $(CROSS_COMPILE)gcc
AR = $(CROSS_COMPILE)ar
OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump
OBJDIR = obj
SRCDIR = src/
ROOTDIR = ../../
LIBRARY_NAME = ../libDisplay.a
CCFLAGS = -c -O2 -Wall -g -fno-common -mcpu=cortex-m3 -mthumb \
-Iinc \
-I../Platform/inc \
-I../Misc/inc \
-I$(ROOTDIR)/hsb-mrts/inc \
-I$(ROOTDIR)/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc \
-I$(ROOTDIR)/FreeRTOS/Source/include \
-I$(ROOTDIR)/FreeRTOS/Source/portable/GCC/ARM_CM3 \
-I$(ROOTDIR)/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x \
-I$(ROOTDIR)/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/CoreSupport
ARFLAGS = rs
OBJECTS = \
nhd0420.o \
vpath %.o $(OBJDIR)
vpath %.c $(SRCDIR)
all: $(LIBRARY_NAME)
$(LIBRARY_NAME): $(OBJDIR) $(OBJECTS)
$(AR) $(ARFLAGS) $@ $(addprefix $(OBJDIR)/, $(OBJECTS))
%.o: %.c
$(CC) $(CCFLAGS) $< -o $(OBJDIR)/$@
$(OBJDIR):
mkdir -p $@
clean:
rm -rf $(OBJDIR) $(LIBRARY_NAME)
.PHONY: all clean

View File

@@ -0,0 +1,242 @@
// -----------------------------------------------------------------------------
/// @file nhd0420.h
/// @brief File description
// -----------------------------------------------------------------------------
// Micro-Key bv
// Industrieweg 28, 9804 TG Noordhorn
// Postbus 92, 9800 AB Zuidhorn
// The Netherlands
// Tel: +31 594 503020
// Fax: +31 594 505825
// Email: support@microkey.nl
// Web: www.microkey.nl
// -----------------------------------------------------------------------------
/// $Revision: $
/// $Author: $
/// $Date: $
// (c) 2017 Micro-Key bv
// -----------------------------------------------------------------------------
/// @defgroup {group_name} {group_description}
/// Description
/// @file nhd0420.h
/// @ingroup {group_name}
#ifndef DISPLAY_INC_NHD0420_H_
#define DISPLAY_INC_NHD0420_H_
// -----------------------------------------------------------------------------
// Include files
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
// Constant and macro definitions
// -----------------------------------------------------------------------------
#define NHD0420_NUMBER_OF_ROWS (4)
#define NHD0420_NUMBER_OF_COLUMNS (20)
#define NHD0420_CONTRAST_MIN (1)
#define NHD0420_CONTRAST_MAX (50)
#define NHD0420_BRIGHTNESS_MIN (1)
#define NHD0420_BRIGHTNESS_MAX (8)
#define NHD0420_BAUDRATE_MIN (1)
#define NHD0420_BAUDRATE_MAX (8)
#define NHD0420_CMD_LENGTH (2)
#define NHD0420_CMD_PREFIX (0xFE)
#define NHD0420_CMD_DISPLAY_ON (0x41)
#define NHD0420_CMD_DISPLAY_OFF (0x42)
#define NHD0420_CMD_CURSOR_SET (0x45)
#define NHD0420_CMD_CURSOR_HOME (0x46)
#define NHD0420_CMD_CURSOR_UL_ON (0x47)
#define NHD0420_CMD_CURSOR_UL_OFF (0x48)
#define NHD0420_CMD_CURSOR_MV_LEFT (0x49)
#define NHD0420_CMD_CURSOR_MV_RIGHT (0x4A)
#define NHD0420_CMD_CURSOR_BLK_ON (0x4B)
#define NHD0420_CMD_CURSOR_BLK_OFF (0x4C)
#define NHD0420_CMD_CURSOR_BACKSPACE (0x4E)
#define NHD0420_CMD_CLR_SCREEN (0x51)
#define NHD0420_CMD_SET_CONTRAST (0x52)
#define NHD0420_CMD_SET_BRIGHTNESS (0x53)
#define NHD0420_CMD_LOAD_CSTM_CHAR (0x54)
#define NHD0420_CMD_MV_DISPLAY_LEFT (0x55)
#define NHD0420_CMD_MV_DISPLAY_RIGHT (0x56)
#define NHD0420_CMD_CHANGE_RS232_BR (0x61)
#define NHD0420_CMD_CHANGE_I2C_ADDRSS (0x62)
#define NHD0420_CMD_SHOW_VERSION (0x70)
#define NHD0420_CMD_SHOW_RS232_BR (0x71)
#define NHD0420_CMD_SHOW_I2C_ADDRSS (0x72)
#define NHD0420_turnOnDisplay() NHD0420_sendCommand(NHD0420_CMD_DISPLAY_ON)
#define NHD0420_turnOffDisplay() NHD0420_sendCommand(NHD0420_CMD_DISPLAY_OFF)
#define NHD0420_setCursorToHome() NHD0420_sendCommand(NHD0420_CMD_CURSOR_HOME)
#define NHD0420_setUnderlineCursorOn() NHD0420_sendCommand(NHD0420_CMD_CURSOR_UL_ON)
#define NHD0420_setUnderlineCursorOff() NHD0420_sendCommand(NHD0420_CMD_CURSOR_UL_OFF)
#define NHD0420_moveCursorToLeft() NHD0420_sendCommand(NHD0420_CMD_CURSOR_MV_LEFT)
#define NHD0420_moveCursorToRight() NHD0420_sendCommand(NHD0420_CMD_CURSOR_MV_RIGHT)
#define NHD0420_turnOnBlinkingCursor() NHD0420_sendCommand(NHD0420_CMD_CURSOR_BLK_ON)
#define NHD0420_turnOffBlinkingCursor() NHD0420_sendCommand(NHD0420_CMD_CURSOR_BLK_OFF)
#define NHD0420_useBackspace() NHD0420_sendCommand(NHD0420_CMD_CURSOR_BACKSPACE)
#define NHD0420_clearScreen() NHD0420_sendCommand(NHD0420_CMD_CLR_SCREEN)
#define NHD0420_moveDisplayToLeft() NHD0420_sendCommand(NHD0420_CMD_MV_DISPLAY_LEFT)
#define NHD0420_moveDisplayToRight() NHD0420_sendCommand(NHD0420_CMD_MV_DISPLAY_RIGHT)
#define NHD0420_showFirmwareVersion() NHD0420_sendCommand(NHD0420_CMD_SHOW_VERSION)
#define NHD0420_showRS232Baudrate() NHD0420_sendCommand(NHD0420_CMD_SHOW_RS232_BR)
#define NHD0420_showI2CAddress() NHD0420_sendCommand(NHD0420_CMD_SHOW_I2C_ADDRSS)
// -----------------------------------------------------------------------------
// Type definitions.
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
// Function declarations
// -----------------------------------------------------------------------------
/** ----------------------------------------------------------------------------
* NHD0420_Init
* Initialises the NewHeaven Display 0420
*
* @param interface The interface to use
*
* @return ErrorStatus SUCCESS if initialisation was successful
* ERROR otherwise
*
* @todo
* -----------------------------------------------------------------------------
*/
extern ErrorStatus NHD0420_construct(void* interface);
/** ----------------------------------------------------------------------------
* NHD0420_setCursorToPosition
* Sets the cursor of the display to the specified row and column
*
* @param row The Row to set - between 1 and 4
* @param column The column to set - between 1 and 20
*
* @return ErrorStatus SUCCESS if initialisation was successful
* ERROR otherwise
*
* @todo
* -----------------------------------------------------------------------------
*/
extern ErrorStatus NHD0420_setCursorToPosition(uint8_t row, uint8_t column);
/** ----------------------------------------------------------------------------
* NHD0420_setContrast
* Sets the contrast of the display
*
* @param contrast The contrast to set - between 1 and 50.
* If passed value is outside the boundaries
* this function will return ERROR
*
* @return ErrorStatus SUCCESS if initialisation was successful
* ERROR otherwise
*
* @todo
* -----------------------------------------------------------------------------
*/
extern ErrorStatus NHD0420_setContrast(uint8_t contrast);
/** ----------------------------------------------------------------------------
* NHD0420_setBacklightBrightness
* Sets the backlight brightness of the display
*
* @param brightness The contrast to set - between 1 and 8
* If passed value is outside the boundaries
* this function will return ERROR
*
* @return ErrorStatus SUCCESS if initialisation was successful
* ERROR otherwise
*
* @todo
* -----------------------------------------------------------------------------
*/
extern ErrorStatus NHD0420_setBacklightBrightness(uint8_t brightness);
/** ----------------------------------------------------------------------------
* NHD0420_setRS232Baudrate
* Sets the baudrate of the display
*
* @param baudrate The baudrate to set - between 1 and 8
* 1 = 300 baud
* 2 = 1200 baud
* 3 = 2400 baud
* 4 = 9600 baud
* 5 = 14400 baud
* 6 = 19200 baud
* 7 = 57600 baud
* 8 = 115200 baud
* If passed value is outside the boundaries
* this function will return ERROR
*
* @return ErrorStatus SUCCESS if initialisation was successful
* ERROR otherwise
*
* @todo
* -----------------------------------------------------------------------------
*/
extern ErrorStatus NHD0420_setRS232Baudrate(uint8_t baudrate);
/** ----------------------------------------------------------------------------
* NHD0420_setI2CAddress
* Sets the I2C address of the display
*
* @param address The address to set
* This command sets the I2C address. The
* address must be an even number (LSB = 0)
* and must not be 0xFF.
* The address change requires 20 us to
* take effect; therefore, the subsequent
* input must have an appropriate delay.
* The default I2C address can be
* restored if SPI or RS-232 is selected as
* the communication mode.
* Default: 0x50
*
*
* @return ErrorStatus SUCCESS if initialisation was successful
* ERROR otherwise
*
* @todo
* -----------------------------------------------------------------------------
*/
extern ErrorStatus NHD0420_setI2CAddress(uint8_t address);
/** ----------------------------------------------------------------------------
* NHD0420_SendCommand
* Send a command to the display
*
* @param command
*
* @return ErrorStatus SUCCESS if initialisation was successful
* ERROR otherwise
*
* @todo
* -----------------------------------------------------------------------------
*/
extern ErrorStatus NHD0420_sendCommand(uint8_t command);
extern ErrorStatus NHD0420_sendData(const uint8_t* buffer, size_t length);
#endif /* DISPLAY_INC_NHD0420_H_ */

View File

@@ -0,0 +1,241 @@
// -----------------------------------------------------------------------------
/// @file nhd0420.c
/// @brief Description
// -----------------------------------------------------------------------------
// Micro-Key bv
// Industrieweg 28, 9804 TG Noordhorn
// Postbus 92, 9800 AB Zuidhorn
// The Netherlands
// Tel: +31 594 503020
// Fax: +31 594 505825
// Email: support@microkey.nl
// Web: www.microkey.nl
// -----------------------------------------------------------------------------
/// $Revision: $
/// $Author: $
/// $Date: $
// (c) 2017 Micro-Key bv
// -----------------------------------------------------------------------------
/// @file nhd0420.c
/// @ingroup {group_name}
// -----------------------------------------------------------------------------
// Include files
// -----------------------------------------------------------------------------
#include <stdio.h>
#include "stm32f10x.h"
#include "nhd0420.h"
#include "spi.h"
// -----------------------------------------------------------------------------
// Constant and macro definitions
// -----------------------------------------------------------------------------
#define NHD0420_CURSOR_OFFSET_ROW1 (0x00)
#define NHD0420_CURSOR_OFFSET_ROW2 (0x40)
#define NHD0420_CURSOR_OFFSET_ROW3 (0x14)
#define NHD0420_CURSOR_OFFSET_ROW4 (0x54)
// -----------------------------------------------------------------------------
// Type definitions
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
// File-scope variables
// -----------------------------------------------------------------------------
static int nhd0420_cursorRowOffset[NHD0420_NUMBER_OF_ROWS] =
{
NHD0420_CURSOR_OFFSET_ROW1,
NHD0420_CURSOR_OFFSET_ROW2,
NHD0420_CURSOR_OFFSET_ROW3,
NHD0420_CURSOR_OFFSET_ROW4
};
// -----------------------------------------------------------------------------
// Function declarations
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
// Function definitions
// -----------------------------------------------------------------------------
static struct SpiDevice* nhd0420Interface;
ErrorStatus NHD0420_construct(void* interface)
{
ErrorStatus returnValue = SUCCESS;
nhd0420Interface = (struct SpiDevice*)interface;
return returnValue;
}
ErrorStatus NHD0420_setCursorToPosition(uint8_t row, uint8_t column)
{
ErrorStatus returnValue = SUCCESS;
// Setting cursor requires sending a command sequence with an additional
// address parameter representing the line/column
// Each line has a dedicated offset, the column is simply added to that offset
// Make sure to keep within boundaries to avoid glitches
row = row -1;
column = column - 1;
// Check the coordinates to avoid glitches
if ((row >= NHD0420_NUMBER_OF_ROWS) && (column >= NHD0420_NUMBER_OF_COLUMNS))
{
returnValue = ERROR;
}
if (returnValue == SUCCESS)
{
uint8_t address = nhd0420_cursorRowOffset[row] + column;
char buffer[3] = {NHD0420_CMD_PREFIX, NHD0420_CMD_CURSOR_SET, address};
returnValue = NHD0420_sendData(buffer, 3);
}
return returnValue;
}
ErrorStatus NHD0420_setContrast(uint8_t contrast)
{
ErrorStatus returnValue = SUCCESS;
// Setting contrast requires sending a command sequence with an additional
// parameter representing the contrast
// Contrast values must be between NHD0420_CONTRAST_MIN and
// NHD0420_CONTRAST_MAX. If boundaries are exceeded, this function will be
// left with an ERROR
if ((contrast < NHD0420_CONTRAST_MIN) || (contrast > NHD0420_CONTRAST_MAX))
{
returnValue = ERROR;
}
if (returnValue == SUCCESS)
{
char buffer[3] = {NHD0420_CMD_PREFIX, NHD0420_CMD_SET_CONTRAST, contrast};
returnValue = NHD0420_sendData(buffer, 3);
}
return returnValue;
}
ErrorStatus NHD0420_setBacklightBrightness(uint8_t brightness)
{
ErrorStatus returnValue = SUCCESS;
// Setting backlight brightness requires sending a command sequence with an
// additional parameter representing the brightness
// Brightness values must be between NHD0420_BRIGHTNESS_MIN and
// NHD0420_BRIGHTNESS_MAX. If boundaries are exceeded, this function will be
// left with an ERROR
if ((brightness < NHD0420_BRIGHTNESS_MIN) || (brightness > NHD0420_BRIGHTNESS_MAX))
{
returnValue = ERROR;
}
if (returnValue == SUCCESS)
{
char buffer[3] = {NHD0420_CMD_PREFIX, NHD0420_CMD_SET_BRIGHTNESS, brightness};
returnValue = NHD0420_sendData(buffer, 3);
}
return returnValue;
}
ErrorStatus NHD0420_setRS232Baudrate(uint8_t baudrate)
{
ErrorStatus returnValue = SUCCESS;
// Setting baudrate requires sending a command sequence with an
// additional parameter representing the baudrate
// Baudrate values must be between NHD0420_BAUDRATE_MIN and
// NHD0420_BAUDRATE_MAX. If boundaries are exceeded, this function will be
// left with an ERROR
if ((baudrate < NHD0420_BAUDRATE_MIN) || (baudrate > NHD0420_BAUDRATE_MAX))
{
returnValue = ERROR;
}
if (returnValue == SUCCESS)
{
char buffer[3] = {NHD0420_CMD_PREFIX, NHD0420_CMD_CHANGE_RS232_BR, baudrate};
returnValue = NHD0420_sendData(buffer, 3);
}
return returnValue;
}
ErrorStatus NHD0420_setI2CAddress(uint8_t address)
{
ErrorStatus returnValue = SUCCESS;
// Setting I2C requires sending a command sequence with an
// additional parameter representing the address
// Baudrate values must be between NHD0420_BAUDRATE_MIN and
// NHD0420_BAUDRATE_MAX. If boundaries are exeeded, this function will be
// left with an ERROR
if ((address | 0xFE) != 0xFE)
{
returnValue = ERROR;
}
if (returnValue == SUCCESS)
{
char buffer[3] = {NHD0420_CMD_PREFIX, NHD0420_CMD_CHANGE_I2C_ADDRSS, address};
returnValue = NHD0420_sendData(buffer, 3);
}
return returnValue;
}
/** ----------------------------------------------------------------------------
* NHD0420_SendCommand
* Send a command to the display
*
* @param command
*
* @return ErrorStatus SUCCESS if initialisation was successful
* ERROR otherwise
*
* @todo
* -----------------------------------------------------------------------------
*/
ErrorStatus NHD0420_sendCommand(uint8_t command)
{
ErrorStatus returnValue = SUCCESS;
uint8_t buffer[NHD0420_CMD_LENGTH] = {NHD0420_CMD_PREFIX, command};
returnValue = SPI_write(nhd0420Interface, buffer, NHD0420_CMD_LENGTH);
return returnValue;
}
ErrorStatus NHD0420_sendData(const uint8_t* buffer, size_t length)
{
ErrorStatus returnValue = SUCCESS;
returnValue = SPI_write(nhd0420Interface, buffer, length);
return returnValue;
}