deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Uncrustify.

Browse source
This commit is contained in:
Dragos Bogdan 2014-01-04 17:27:51 -05:00 committed by Ian Martin
parent 97fb8b4a44
commit fb64cb5e4c
8 changed files with 757 additions and 826 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

143
Communication.c
View file

@ -43,8 +43,8 @@
/******************************************************************************/ /******************************************************************************/
/***************************** Include Files **********************************/ /***************************** Include Files **********************************/
/******************************************************************************/ /******************************************************************************/
#include "Communication.h" // Communication definitions #include "Communication.h" /* Communication definitions */
#include "RDKRL78G14.h" // RDKRL78G14 definitions #include "RDKRL78G14.h" /* RDKRL78G14 definitions */
char IICA0_Flag; char IICA0_Flag;
@ -58,11 +58,11 @@ char IICA0_Flag;
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
#pragma vector = INTIICA0_vect #pragma vector = INTIICA0_vect
__interrupt static void IICA0_Interrupt(void) __interrupt static void
IICA0_Interrupt(void)
{ {
IICA0_Flag = 1; IICA0_Flag = 1;
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Initializes the SPI communication peripheral. * @brief Initializes the SPI communication peripheral.
* *
@ -86,7 +86,8 @@ __interrupt static void IICA0_Interrupt(void)
* Example: 0 - if initialization was successful; * Example: 0 - if initialization was successful;
* -1 - if initialization was unsuccessful. * -1 - if initialization was unsuccessful.
*******************************************************************************/ *******************************************************************************/
char SPI_Init(char lsbFirst, char
SPI_Init(char lsbFirst,
long clockFreq, long clockFreq,
char clockPol, char clockPol,
char clockEdg) char clockEdg)
@ -122,8 +123,8 @@ char SPI_Init(char lsbFirst,
clockPol = 1 - clockPol; clockPol = 1 - clockPol;
SCR11 = (clockEdg << 13) | SCR11 = (clockEdg << 13) |
(clockPol << 12) | (clockPol << 12) |
0xC000 | // Operation mode: Transmission/reception. 0xC000 | /* Operation mode: Transmission/reception. */
0x0007; // 8-bit data length. 0x0007; /* 8-bit data length. */
/* clockFreq = mckFreq / (sdrValue * 2 + 2) */ /* clockFreq = mckFreq / (sdrValue * 2 + 2) */
sdrValue = mckFreq / (2 * clockFreq) - 1; sdrValue = mckFreq / (2 * clockFreq) - 1;
@ -146,8 +147,7 @@ char SPI_Init(char lsbFirst,
PM7 &= ~0x05; PM7 &= ~0x05;
/* Wait for the changes to take place. */ /* Wait for the changes to take place. */
for(delay = 0; delay < 50; delay++) for(delay = 0; delay < 50; delay++) {
{
NOP; NOP;
} }
@ -156,7 +156,6 @@ char SPI_Init(char lsbFirst,
return 0; return 0;
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Writes data to SPI. * @brief Writes data to SPI.
* *
@ -166,7 +165,8 @@ char SPI_Init(char lsbFirst,
* *
* @return Number of written bytes. * @return Number of written bytes.
*******************************************************************************/ *******************************************************************************/
char SPI_Write(char slaveDeviceId, char
SPI_Write(char slaveDeviceId,
unsigned char *data, unsigned char *data,
char bytesNumber) char bytesNumber)
{ {
@ -175,16 +175,13 @@ char SPI_Write(char slaveDeviceId,
unsigned short originalSCR = 0; unsigned short originalSCR = 0;
unsigned short originalSO1 = 0; unsigned short originalSO1 = 0;
if(slaveDeviceId == 1) if(slaveDeviceId == 1) {
{
PMOD1_CS_LOW; PMOD1_CS_LOW;
} }
if(slaveDeviceId == 2) if(slaveDeviceId == 2) {
{
PMOD2_CS_LOW; PMOD2_CS_LOW;
} }
if(slaveDeviceId == 3) if(slaveDeviceId == 3) {
{
ST1 |= 0x0002; ST1 |= 0x0002;
originalSO1 = SO1; originalSO1 = SO1;
originalSCR = SCR11; originalSCR = SCR11;
@ -193,23 +190,19 @@ char SPI_Write(char slaveDeviceId,
SS1 |= 0x0002; SS1 |= 0x0002;
ST7579_CS_LOW; ST7579_CS_LOW;
} }
for(byte = 0; byte < bytesNumber; byte++) for(byte = 0; byte < bytesNumber; byte++) {
{
SIO21 = data[byte]; SIO21 = data[byte];
NOP; NOP;
while(SSR11 & 0x0040) ; while(SSR11 & 0x0040) ;
read = SIO21; read = SIO21;
} }
if(slaveDeviceId == 1) if(slaveDeviceId == 1) {
{
PMOD1_CS_HIGH; PMOD1_CS_HIGH;
} }
if(slaveDeviceId == 2) if(slaveDeviceId == 2) {
{
PMOD2_CS_HIGH; PMOD2_CS_HIGH;
} }
if(slaveDeviceId == 3) if(slaveDeviceId == 3) {
{
ST7579_CS_HIGH; ST7579_CS_HIGH;
ST1 |= 0x0002; ST1 |= 0x0002;
SO1 = originalSO1; SO1 = originalSO1;
@ -219,7 +212,6 @@ char SPI_Write(char slaveDeviceId,
return bytesNumber; return bytesNumber;
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Reads data from SPI. * @brief Reads data from SPI.
* *
@ -230,7 +222,8 @@ char SPI_Write(char slaveDeviceId,
* *
* @return Number of read bytes. * @return Number of read bytes.
*******************************************************************************/ *******************************************************************************/
char SPI_Read(char slaveDeviceId, char
SPI_Read(char slaveDeviceId,
unsigned char *data, unsigned char *data,
char bytesNumber) char bytesNumber)
{ {
@ -238,16 +231,13 @@ char SPI_Read(char slaveDeviceId,
unsigned short originalSCR = 0; unsigned short originalSCR = 0;
unsigned short originalSO1 = 0; unsigned short originalSO1 = 0;
if(slaveDeviceId == 1) if(slaveDeviceId == 1) {
{
PMOD1_CS_LOW; PMOD1_CS_LOW;
} }
if(slaveDeviceId == 2) if(slaveDeviceId == 2) {
{
PMOD2_CS_LOW; PMOD2_CS_LOW;
} }
if(slaveDeviceId == 3) if(slaveDeviceId == 3) {
{
ST1 |= 0x0002; ST1 |= 0x0002;
originalSO1 = SO1; originalSO1 = SO1;
originalSCR = SCR11; originalSCR = SCR11;
@ -256,23 +246,19 @@ char SPI_Read(char slaveDeviceId,
SS1 |= 0x0002; SS1 |= 0x0002;
ST7579_CS_LOW; ST7579_CS_LOW;
} }
for(byte = 0; byte < bytesNumber; byte++) for(byte = 0; byte < bytesNumber; byte++) {
{
SIO21 = data[byte]; SIO21 = data[byte];
NOP; NOP;
while(SSR11 & 0x0040) ; while(SSR11 & 0x0040) ;
data[byte] = SIO21; data[byte] = SIO21;
} }
if(slaveDeviceId == 1) if(slaveDeviceId == 1) {
{
PMOD1_CS_HIGH; PMOD1_CS_HIGH;
} }
if(slaveDeviceId == 2) if(slaveDeviceId == 2) {
{
PMOD2_CS_HIGH; PMOD2_CS_HIGH;
} }
if(slaveDeviceId == 3) if(slaveDeviceId == 3) {
{
ST7579_CS_HIGH; ST7579_CS_HIGH;
ST1 |= 0x0002; ST1 |= 0x0002;
SO1 = originalSO1; SO1 = originalSO1;
@ -282,7 +268,6 @@ char SPI_Read(char slaveDeviceId,
return bytesNumber; return bytesNumber;
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Initializes the I2C communication peripheral. * @brief Initializes the I2C communication peripheral.
* *
@ -292,7 +277,8 @@ char SPI_Read(char slaveDeviceId,
* Example: 0 - if initialization was successful; * Example: 0 - if initialization was successful;
* -1 - if initialization was unsuccessful. * -1 - if initialization was unsuccessful.
*******************************************************************************/ *******************************************************************************/
char I2C_Init(long clockFreq) char
I2C_Init(long clockFreq)
{ {
long fckFreq = 32000000; long fckFreq = 32000000;
unsigned char wlValue = 0; unsigned char wlValue = 0;
@ -313,10 +299,10 @@ char I2C_Init(long clockFreq)
IICWL0 = wlValue; IICWL0 = wlValue;
IICWH0 = whValue; IICWH0 = whValue;
STCEN0 = 1; // After operation is enabled, enable generation of a start STCEN0 = 1; /* After operation is enabled, enable generation of a start */
// condition without detecting a stop condition. /* condition without detecting a stop condition. */
WTIM0 = 1; // Interrupt request is generated at the ninth clock’s WTIM0 = 1; /* Interrupt request is generated at the ninth clock’s */
// falling edge. /* falling edge. */
/* Enable I2C operation. */ /* Enable I2C operation. */
IICE0 = 1; IICE0 = 1;
@ -327,7 +313,6 @@ char I2C_Init(long clockFreq)
return 0; return 0;
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Writes data to a slave device. * @brief Writes data to a slave device.
* *
@ -341,7 +326,8 @@ char I2C_Init(long clockFreq)
* @return status - Number of read bytes or 0xFF if the slave address was * @return status - Number of read bytes or 0xFF if the slave address was
* not acknowledged by the device. * not acknowledged by the device.
*******************************************************************************/ *******************************************************************************/
char I2C_Write(char slaveAddress, char
I2C_Write(char slaveAddress,
unsigned char *dataBuffer, unsigned char *dataBuffer,
char bytesNumber, char bytesNumber,
char stopBit) char stopBit)
@ -349,39 +335,33 @@ char I2C_Write(char slaveAddress,
char byte = 0; char byte = 0;
char status = 0; char status = 0;
IICAMK0 = 1; // Interrupt servicing disabled. IICAMK0 = 1; /* Interrupt servicing disabled. */
STT0 = 1; // Generate a start condition. STT0 = 1; /* Generate a start condition. */
IICAMK0 = 0; // Interrupt servicing enabled. IICAMK0 = 0; /* Interrupt servicing enabled. */
/* Send the first byte. */ /* Send the first byte. */
IICA0_Flag = 0; IICA0_Flag = 0;
IICA0 = (slaveAddress << 1); IICA0 = (slaveAddress << 1);
while(IICA0_Flag == 0) ; while(IICA0_Flag == 0) ;
if(ACKD0) // Acknowledge was detected. if(ACKD0) { /* Acknowledge was detected. */
{ for(byte = 0; byte < bytesNumber; byte++) {
for(byte = 0; byte < bytesNumber; byte++)
{
IICA0_Flag = 0; IICA0_Flag = 0;
IICA0 = *dataBuffer; IICA0 = *dataBuffer;
while(IICA0_Flag == 0) ; while(IICA0_Flag == 0) ;
dataBuffer++; dataBuffer++;
} }
status = bytesNumber; status = bytesNumber;
} } else { /* Acknowledge was not detected. */
else // Acknowledge was not detected.
{
status = 0xFF; status = 0xFF;
} }
if(stopBit) if(stopBit) {
{ SPT0 = 1; /* Generate a stop condition. */
SPT0 = 1; // Generate a stop condition. while(IICBSY0) ; /* Wait until the I2C bus status flag is cleared. */
while(IICBSY0); // Wait until the I2C bus status flag is cleared.
} }
return status; return status;
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Reads data from a slave device. * @brief Reads data from a slave device.
* *
@ -395,7 +375,8 @@ char I2C_Write(char slaveAddress,
* @return status - Number of read bytes or 0xFF if the slave address was * @return status - Number of read bytes or 0xFF if the slave address was
* not acknowledged by the device. * not acknowledged by the device.
*******************************************************************************/ *******************************************************************************/
char I2C_Read(char slaveAddress, char
I2C_Read(char slaveAddress,
unsigned char *dataBuffer, unsigned char *dataBuffer,
char bytesNumber, char bytesNumber,
char stopBit) char stopBit)
@ -403,40 +384,34 @@ char I2C_Read(char slaveAddress,
char byte = 0; char byte = 0;
char status = 0; char status = 0;
IICAMK0 = 1; // Interrupt servicing disabled. IICAMK0 = 1; /* Interrupt servicing disabled. */
STT0 = 1; // Generate a start condition. STT0 = 1; /* Generate a start condition. */
IICAMK0 = 0; // Interrupt servicing enabled. IICAMK0 = 0; /* Interrupt servicing enabled. */
/* Send the first byte. */ /* Send the first byte. */
IICA0_Flag = 0; IICA0_Flag = 0;
IICA0 = (slaveAddress << 1) + 1; IICA0 = (slaveAddress << 1) + 1;
while(IICA0_Flag == 0) ; while(IICA0_Flag == 0) ;
if(ACKD0) // Acknowledge was detected. if(ACKD0) { /* Acknowledge was detected. */
{ ACKE0 = 1; /* Enable acknowledgment. */
ACKE0 = 1; // Enable acknowledgment. for(byte = 0; byte < bytesNumber; byte++) {
for(byte = 0; byte < bytesNumber; byte++) if(byte == (bytesNumber - 1)) {
{ ACKE0 = 0U; /* Disable acknowledgment. */
if(byte == (bytesNumber - 1))
{
ACKE0 = 0U; // Disable acknowledgment.
} }
WREL0 = 1U; // Cancel wait. WREL0 = 1U; /* Cancel wait. */
IICA0_Flag = 0; IICA0_Flag = 0;
while(IICA0_Flag == 0) ; while(IICA0_Flag == 0) ;
*dataBuffer = IICA0; *dataBuffer = IICA0;
dataBuffer++; dataBuffer++;
} }
status = bytesNumber; status = bytesNumber;
} } else { /* Acknowledge was not detected. */
else // Acknowledge was not detected.
{
status = 0xFF; status = 0xFF;
} }
if(stopBit) if(stopBit) {
{ SPT0 = 1; /* Generate a stop condition. */
SPT0 = 1; // Generate a stop condition. while(IICBSY0) ; /* Wait until the I2C bus status flag is cleared. */
while(IICBSY0); // Wait until the I2C bus status flag is cleared.
} }
return status; return status;

2
Communication.h
View file

@ -106,4 +106,4 @@ char I2C_Read(char slaveAddress,
char bytesNumber, char bytesNumber,
char stopBit); char stopBit);
#endif // __COMMUNICATION_H__ #endif /* __COMMUNICATION_H__ */

15
RDKRL78G14.c
View file

@ -43,7 +43,7 @@
/******************************************************************************/ /******************************************************************************/
/***************************** Include Files **********************************/ /***************************** Include Files **********************************/
/******************************************************************************/ /******************************************************************************/
#include "RDKRL78G14.h" // RDKRL78G14 definitions #include "RDKRL78G14.h" /* RDKRL78G14 definitions */
/******************************************************************************/ /******************************************************************************/
/************************ Functions Definitions *******************************/ /************************ Functions Definitions *******************************/
@ -54,18 +54,17 @@
* *
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
void RDKRL78G14_Reset(void) void
RDKRL78G14_Reset(void)
{ {
short delay = 0; short delay = 0;
EXTRST_HIGH; EXTRST_HIGH;
for(delay = 0; delay < 1000; delay++) for(delay = 0; delay < 1000; delay++) {
{
NOP; NOP;
} }
EXTRST_LOW; EXTRST_LOW;
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Initializes the RDKRL78G14. * @brief Initializes the RDKRL78G14.
* *
@ -73,13 +72,13 @@ void RDKRL78G14_Reset(void)
* Example: 0 - if initialization was successful; * Example: 0 - if initialization was successful;
* -1 - if initialization was unsuccessful. * -1 - if initialization was unsuccessful.
*******************************************************************************/ *******************************************************************************/
char RDKRL78G14_Init(void) char
RDKRL78G14_Init(void)
{ {
long delay = 0; long delay = 0;
char status = -1; char status = -1;
for(delay = 0; delay < 4000000; delay++) for(delay = 0; delay < 4000000; delay++) {
{
NOP; NOP;
} }
RDKRL78G14_Reset(); RDKRL78G14_Reset();

14
RDKRL78G14.h
View file

@ -47,17 +47,17 @@
/***************************** Include Files **********************************/ /***************************** Include Files **********************************/
/******************************************************************************/ /******************************************************************************/
#include <ior5f104pj.h> // R5F104PJ definitions #include <ior5f104pj.h> /* R5F104PJ definitions */
#include <ior5f104pj_ext.h> // Declarations of extended SFR registers #include <ior5f104pj_ext.h> /* Declarations of extended SFR registers */
#include <intrinsics.h> // Declarations of intrinsic functions #include <intrinsics.h> /* Declarations of intrinsic functions */
/******************************************************************************/ /******************************************************************************/
/************************* Operations Definitions *****************************/ /************************* Operations Definitions *****************************/
/******************************************************************************/ /******************************************************************************/
#define NOP __no_operation(); // No operation #define NOP __no_operation(); /* No operation */
#define EI __enable_interrupt(); // Enable interrupts #define EI __enable_interrupt(); /* Enable interrupts */
#define DI __disable_interrupt(); // Disable interrupts #define DI __disable_interrupt(); /* Disable interrupts */
/******************************************************************************/ /******************************************************************************/
/**************************** GPIO Definitions ********************************/ /**************************** GPIO Definitions ********************************/
@ -130,4 +130,4 @@ void RDKRL78G14_Reset(void);
/*! Initializes the RDKRL78G14. */ /*! Initializes the RDKRL78G14. */
char RDKRL78G14_Init(void); char RDKRL78G14_Init(void);
#endif // __RDKRL78G14_H__ #endif /* __RDKRL78G14_H__ */

358
ST7579.c
View file

@ -43,9 +43,9 @@
/******************************************************************************/ /******************************************************************************/
/***************************** Include Files **********************************/ /***************************** Include Files **********************************/
/******************************************************************************/ /******************************************************************************/
#include "ST7579.h" // ST7579 definitions #include "ST7579.h" /* ST7579 definitions */
#include "RDKRL78G14.h" // YRDKRL78G14 definitions #include "RDKRL78G14.h" /* YRDKRL78G14 definitions */
#include "Communication.h" // Communication definitions #include "Communication.h" /* Communication definitions */
/******************************************************************************/ /******************************************************************************/
/************************* Variables Definitions ******************************/ /************************* Variables Definitions ******************************/
@ -53,101 +53,101 @@
const unsigned char st7579Font[95][5] = const unsigned char st7579Font[95][5] =
{ {
{0x00, 0x00, 0x00, 0x00, 0x00}, // sp { 0x00, 0x00, 0x00, 0x00, 0x00 }, /* sp */
{0x00, 0x00, 0x2f, 0x00, 0x00}, // ! { 0x00, 0x00, 0x2f, 0x00, 0x00 }, /* ! */
{0x00, 0x07, 0x00, 0x07, 0x00}, // " { 0x00, 0x07, 0x00, 0x07, 0x00 }, /* " */
{0x14, 0x7f, 0x14, 0x7f, 0x14}, // # { 0x14, 0x7f, 0x14, 0x7f, 0x14 }, /* # */
{0x24, 0x2a, 0x7f, 0x2a, 0x12}, // $ { 0x24, 0x2a, 0x7f, 0x2a, 0x12 }, /* $ */
{0xc4, 0xc8, 0x10, 0x26, 0x46}, // % { 0xc4, 0xc8, 0x10, 0x26, 0x46 }, /* % */
{0x36, 0x49, 0x55, 0x22, 0x50}, // & { 0x36, 0x49, 0x55, 0x22, 0x50 }, /* & */
{0x00, 0x05, 0x03, 0x00, 0x00}, // ' { 0x00, 0x05, 0x03, 0x00, 0x00 }, /* ' */
{0x00, 0x1c, 0x22, 0x41, 0x00}, // ( { 0x00, 0x1c, 0x22, 0x41, 0x00 }, /* ( */
{0x00, 0x41, 0x22, 0x1c, 0x00}, // ) { 0x00, 0x41, 0x22, 0x1c, 0x00 }, /* ) */
{0x14, 0x08, 0x3E, 0x08, 0x14}, // * { 0x14, 0x08, 0x3E, 0x08, 0x14 }, /* * */
{0x08, 0x08, 0x3E, 0x08, 0x08}, // + { 0x08, 0x08, 0x3E, 0x08, 0x08 }, /* + */
{0x00, 0x00, 0x50, 0x30, 0x00}, // , { 0x00, 0x00, 0x50, 0x30, 0x00 }, /* , */
{0x10, 0x10, 0x10, 0x10, 0x10}, // - { 0x10, 0x10, 0x10, 0x10, 0x10 }, /* - */
{0x00, 0x60, 0x60, 0x00, 0x00}, // . { 0x00, 0x60, 0x60, 0x00, 0x00 }, /* . */
{0x20, 0x10, 0x08, 0x04, 0x02}, // / { 0x20, 0x10, 0x08, 0x04, 0x02 }, /* / */
{0x3E, 0x51, 0x49, 0x45, 0x3E}, // 0 { 0x3E, 0x51, 0x49, 0x45, 0x3E }, /* 0 */
{0x00, 0x42, 0x7F, 0x40, 0x00}, // 1 { 0x00, 0x42, 0x7F, 0x40, 0x00 }, /* 1 */
{0x42, 0x61, 0x51, 0x49, 0x46}, // 2 { 0x42, 0x61, 0x51, 0x49, 0x46 }, /* 2 */
{0x21, 0x41, 0x45, 0x4B, 0x31}, // 3 { 0x21, 0x41, 0x45, 0x4B, 0x31 }, /* 3 */
{0x18, 0x14, 0x12, 0x7F, 0x10}, // 4 { 0x18, 0x14, 0x12, 0x7F, 0x10 }, /* 4 */
{0x27, 0x45, 0x45, 0x45, 0x39}, // 5 { 0x27, 0x45, 0x45, 0x45, 0x39 }, /* 5 */
{0x3C, 0x4A, 0x49, 0x49, 0x30}, // 6 { 0x3C, 0x4A, 0x49, 0x49, 0x30 }, /* 6 */
{0x01, 0x71, 0x09, 0x05, 0x03}, // 7 { 0x01, 0x71, 0x09, 0x05, 0x03 }, /* 7 */
{0x36, 0x49, 0x49, 0x49, 0x36}, // 8 { 0x36, 0x49, 0x49, 0x49, 0x36 }, /* 8 */
{0x06, 0x49, 0x49, 0x29, 0x1E}, // 9 { 0x06, 0x49, 0x49, 0x29, 0x1E }, /* 9 */
{0x00, 0x36, 0x36, 0x00, 0x00}, // : { 0x00, 0x36, 0x36, 0x00, 0x00 }, /* : */
{0x00, 0x56, 0x36, 0x00, 0x00}, // ; { 0x00, 0x56, 0x36, 0x00, 0x00 }, /* ; */
{0x08, 0x14, 0x22, 0x41, 0x00}, // < { 0x08, 0x14, 0x22, 0x41, 0x00 }, /* < */
{0x14, 0x14, 0x14, 0x14, 0x14}, // = { 0x14, 0x14, 0x14, 0x14, 0x14 }, /* = */
{0x00, 0x41, 0x22, 0x14, 0x08}, // > { 0x00, 0x41, 0x22, 0x14, 0x08 }, /* > */
{0x02, 0x01, 0x51, 0x09, 0x06}, // ? { 0x02, 0x01, 0x51, 0x09, 0x06 }, /* ? */
{0x32, 0x49, 0x59, 0x51, 0x3E}, // @ { 0x32, 0x49, 0x59, 0x51, 0x3E }, /* @ */
{0x7E, 0x11, 0x11, 0x11, 0x7E}, // A { 0x7E, 0x11, 0x11, 0x11, 0x7E }, /* A */
{0x7F, 0x49, 0x49, 0x49, 0x36}, // B { 0x7F, 0x49, 0x49, 0x49, 0x36 }, /* B */
{0x3E, 0x41, 0x41, 0x41, 0x22}, // C { 0x3E, 0x41, 0x41, 0x41, 0x22 }, /* C */
{0x7F, 0x41, 0x41, 0x22, 0x1C}, // D { 0x7F, 0x41, 0x41, 0x22, 0x1C }, /* D */
{0x7F, 0x49, 0x49, 0x49, 0x41}, // E { 0x7F, 0x49, 0x49, 0x49, 0x41 }, /* E */
{0x7F, 0x09, 0x09, 0x09, 0x01}, // F { 0x7F, 0x09, 0x09, 0x09, 0x01 }, /* F */
{0x3E, 0x41, 0x49, 0x49, 0x7A}, // G { 0x3E, 0x41, 0x49, 0x49, 0x7A }, /* G */
{0x7F, 0x08, 0x08, 0x08, 0x7F}, // H { 0x7F, 0x08, 0x08, 0x08, 0x7F }, /* H */
{0x00, 0x41, 0x7F, 0x41, 0x00}, // I { 0x00, 0x41, 0x7F, 0x41, 0x00 }, /* I */
{0x20, 0x40, 0x41, 0x3F, 0x01}, // J { 0x20, 0x40, 0x41, 0x3F, 0x01 }, /* J */
{0x7F, 0x08, 0x14, 0x22, 0x41}, // K { 0x7F, 0x08, 0x14, 0x22, 0x41 }, /* K */
{0x7F, 0x40, 0x40, 0x40, 0x40}, // L { 0x7F, 0x40, 0x40, 0x40, 0x40 }, /* L */
{0x7F, 0x02, 0x0C, 0x02, 0x7F}, // M { 0x7F, 0x02, 0x0C, 0x02, 0x7F }, /* M */
{0x7F, 0x04, 0x08, 0x10, 0x7F}, // N { 0x7F, 0x04, 0x08, 0x10, 0x7F }, /* N */
{0x3E, 0x41, 0x41, 0x41, 0x3E}, // O { 0x3E, 0x41, 0x41, 0x41, 0x3E }, /* O */
{0x7F, 0x09, 0x09, 0x09, 0x06}, // P { 0x7F, 0x09, 0x09, 0x09, 0x06 }, /* P */
{0x3E, 0x41, 0x51, 0x21, 0x5E}, // Q { 0x3E, 0x41, 0x51, 0x21, 0x5E }, /* Q */
{0x7F, 0x09, 0x19, 0x29, 0x46}, // R { 0x7F, 0x09, 0x19, 0x29, 0x46 }, /* R */
{0x46, 0x49, 0x49, 0x49, 0x31}, // S { 0x46, 0x49, 0x49, 0x49, 0x31 }, /* S */
{0x01, 0x01, 0x7F, 0x01, 0x01}, // T { 0x01, 0x01, 0x7F, 0x01, 0x01 }, /* T */
{0x3F, 0x40, 0x40, 0x40, 0x3F}, // U { 0x3F, 0x40, 0x40, 0x40, 0x3F }, /* U */
{0x1F, 0x20, 0x40, 0x20, 0x1F}, // V { 0x1F, 0x20, 0x40, 0x20, 0x1F }, /* V */
{0x3F, 0x40, 0x38, 0x40, 0x3F}, // W { 0x3F, 0x40, 0x38, 0x40, 0x3F }, /* W */
{0x63, 0x14, 0x08, 0x14, 0x63}, // X { 0x63, 0x14, 0x08, 0x14, 0x63 }, /* X */
{0x07, 0x08, 0x70, 0x08, 0x07}, // Y { 0x07, 0x08, 0x70, 0x08, 0x07 }, /* Y */
{0x61, 0x51, 0x49, 0x45, 0x43}, // Z { 0x61, 0x51, 0x49, 0x45, 0x43 }, /* Z */
{0x00, 0x7F, 0x41, 0x41, 0x00}, // [ { 0x00, 0x7F, 0x41, 0x41, 0x00 }, /* [ */
{0x55, 0x2A, 0x55, 0x2A, 0x55}, // / { 0x55, 0x2A, 0x55, 0x2A, 0x55 }, /* / */
{0x00, 0x41, 0x41, 0x7F, 0x00}, // ] { 0x00, 0x41, 0x41, 0x7F, 0x00 }, /* ] */
{0x04, 0x02, 0x01, 0x02, 0x04}, // ^ { 0x04, 0x02, 0x01, 0x02, 0x04 }, /* ^ */
{0x40, 0x40, 0x40, 0x40, 0x40}, // _ { 0x40, 0x40, 0x40, 0x40, 0x40 }, /* _ */
{0x00, 0x01, 0x02, 0x04, 0x00}, // ' { 0x00, 0x01, 0x02, 0x04, 0x00 }, /* ' */
{0x20, 0x54, 0x54, 0x54, 0x78}, // a { 0x20, 0x54, 0x54, 0x54, 0x78 }, /* a */
{0x7F, 0x48, 0x44, 0x44, 0x38}, // b { 0x7F, 0x48, 0x44, 0x44, 0x38 }, /* b */
{0x38, 0x44, 0x44, 0x44, 0x20}, // c { 0x38, 0x44, 0x44, 0x44, 0x20 }, /* c */
{0x38, 0x44, 0x44, 0x48, 0x7F}, // d { 0x38, 0x44, 0x44, 0x48, 0x7F }, /* d */
{0x38, 0x54, 0x54, 0x54, 0x18}, // e { 0x38, 0x54, 0x54, 0x54, 0x18 }, /* e */
{0x08, 0x7E, 0x09, 0x01, 0x02}, // f { 0x08, 0x7E, 0x09, 0x01, 0x02 }, /* f */
{0x0C, 0x52, 0x52, 0x52, 0x3E}, // g { 0x0C, 0x52, 0x52, 0x52, 0x3E }, /* g */
{0x7F, 0x08, 0x04, 0x04, 0x78}, // h { 0x7F, 0x08, 0x04, 0x04, 0x78 }, /* h */
{0x00, 0x44, 0x7D, 0x40, 0x00}, // i { 0x00, 0x44, 0x7D, 0x40, 0x00 }, /* i */
{0x20, 0x40, 0x44, 0x3D, 0x00}, // j { 0x20, 0x40, 0x44, 0x3D, 0x00 }, /* j */
{0x7F, 0x10, 0x28, 0x44, 0x00}, // k { 0x7F, 0x10, 0x28, 0x44, 0x00 }, /* k */
{0x00, 0x41, 0x7F, 0x40, 0x00}, // l { 0x00, 0x41, 0x7F, 0x40, 0x00 }, /* l */
{0x7C, 0x04, 0x18, 0x04, 0x78}, // m { 0x7C, 0x04, 0x18, 0x04, 0x78 }, /* m */
{0x7C, 0x08, 0x04, 0x04, 0x78}, // n { 0x7C, 0x08, 0x04, 0x04, 0x78 }, /* n */
{0x38, 0x44, 0x44, 0x44, 0x38}, // o { 0x38, 0x44, 0x44, 0x44, 0x38 }, /* o */
{0x7C, 0x14, 0x14, 0x14, 0x08}, // p { 0x7C, 0x14, 0x14, 0x14, 0x08 }, /* p */
{0x08, 0x14, 0x14, 0x18, 0x7C}, // q { 0x08, 0x14, 0x14, 0x18, 0x7C }, /* q */
{0x7C, 0x08, 0x04, 0x04, 0x08}, // r { 0x7C, 0x08, 0x04, 0x04, 0x08 }, /* r */
{0x48, 0x54, 0x54, 0x54, 0x20}, // s { 0x48, 0x54, 0x54, 0x54, 0x20 }, /* s */
{0x04, 0x3F, 0x44, 0x40, 0x20}, // t { 0x04, 0x3F, 0x44, 0x40, 0x20 }, /* t */
{0x3C, 0x40, 0x40, 0x20, 0x7C}, // u { 0x3C, 0x40, 0x40, 0x20, 0x7C }, /* u */
{0x1C, 0x20, 0x40, 0x20, 0x1C}, // v { 0x1C, 0x20, 0x40, 0x20, 0x1C }, /* v */
{0x3C, 0x40, 0x30, 0x40, 0x3C}, // w { 0x3C, 0x40, 0x30, 0x40, 0x3C }, /* w */
{0x44, 0x28, 0x10, 0x28, 0x44}, // x { 0x44, 0x28, 0x10, 0x28, 0x44 }, /* x */
{0x0C, 0x50, 0x50, 0x50, 0x3C}, // y { 0x0C, 0x50, 0x50, 0x50, 0x3C }, /* y */
{0x44, 0x64, 0x54, 0x4C, 0x44}, // z { 0x44, 0x64, 0x54, 0x4C, 0x44 }, /* z */
{0x08, 0x3e, 0x41, 0x41, 0x00}, // { { 0x08, 0x3e, 0x41, 0x41, 0x00 }, /* { */
{0x00, 0x00, 0x77, 0x00, 0x00}, // | { 0x00, 0x00, 0x77, 0x00, 0x00 }, /* | */
{0x00, 0x41, 0x41, 0x3e, 0x08}, // } { 0x00, 0x41, 0x41, 0x3e, 0x08 }, /* } */
{0x02, 0x01, 0x02, 0x01, 0x00} // ~ { 0x02, 0x01, 0x02, 0x01, 0x00 } /* ~ */
}; };
/******************************************************************************/ /******************************************************************************/
@ -161,13 +161,13 @@ const unsigned char st7579Font[95][5] =
* *
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
void ST7579_WriteByte(unsigned char data) void
ST7579_WriteByte(unsigned char data)
{ {
SPI_Write(3, // The ID of the selected slave device. SPI_Write(3, /* The ID of the selected slave device. */
&data, // Write buffer. &data, /* Write buffer. */
1); // Number of bytes to write. 1); /* Number of bytes to write. */
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Sets X and Y adress of RAM. * @brief Sets X and Y adress of RAM.
* *
@ -176,7 +176,8 @@ void ST7579_WriteByte(unsigned char data)
* *
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
void ST7579_GoTo(unsigned char yPosition, void
ST7579_GoTo(unsigned char yPosition,
unsigned char xPosition) unsigned char xPosition)
{ {
ST7579_RS_LOW; ST7579_RS_LOW;
@ -188,21 +189,19 @@ void ST7579_GoTo(unsigned char yPosition,
ST7579_WriteByte(0x40 + yPosition); ST7579_WriteByte(0x40 + yPosition);
ST7579_RS_HIGH; ST7579_RS_HIGH;
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Clears ST7579 RAM. * @brief Clears ST7579 RAM.
* *
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
void ST7579_Clear(void) void
ST7579_Clear(void)
{ {
unsigned short clearPosition = 0; unsigned short clearPosition = 0;
unsigned char yPosition = 0; unsigned char yPosition = 0;
for(clearPosition = 0; clearPosition < (8 * 96); clearPosition++) for(clearPosition = 0; clearPosition < (8 * 96); clearPosition++) {
{ if(!(clearPosition % 96)) {
if(!(clearPosition % 96))
{
/* Set the X and Y address of RAM. */ /* Set the X and Y address of RAM. */
ST7579_GoTo(yPosition, 0); ST7579_GoTo(yPosition, 0);
yPosition++; yPosition++;
@ -210,7 +209,6 @@ void ST7579_Clear(void)
ST7579_WriteByte(0x00); ST7579_WriteByte(0x00);
} }
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Initializes the ST7579 controller. * @brief Initializes the ST7579 controller.
* *
@ -218,17 +216,17 @@ void ST7579_Clear(void)
* Example: 0 - if initialization was successful; * Example: 0 - if initialization was successful;
* -1 - if initialization was unsuccessful. * -1 - if initialization was unsuccessful.
*******************************************************************************/ *******************************************************************************/
char ST7579_Init(void) char
ST7579_Init(void)
{ {
char status = -1; char status = -1;
unsigned short delay = 0; unsigned short delay = 0;
status = SPI_Init(0, // Transfer format. status = SPI_Init(0, /* Transfer format. */
1000000, // SPI clock frequency. 1000000, /* SPI clock frequency. */
0, // SPI clock polarity. 0, /* SPI clock polarity. */
1); // SPI clock edge. 1); /* SPI clock edge. */
if(status != 0) if(status != 0) {
{
return status; return status;
} }
ST7579_RS_OUT; ST7579_RS_OUT;
@ -243,8 +241,7 @@ char ST7579_Init(void)
ST7579_WriteByte(0x20); ST7579_WriteByte(0x20);
ST7579_WriteByte(0x04); ST7579_WriteByte(0x04);
/* 50 ms delay is recommended. */ /* 50 ms delay is recommended. */
for(delay = 0; delay < 1000; delay++) for(delay = 0; delay < 1000; delay++) {
{
asm ("NOP"); asm ("NOP");
} }
/* Set the frame frequency */ /* Set the frame frequency */
@ -262,7 +259,6 @@ char ST7579_Init(void)
return status; return status;
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Sends a character to ST7579 controller. * @brief Sends a character to ST7579 controller.
* *
@ -273,7 +269,8 @@ char ST7579_Init(void)
* *
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
void ST7579_Char(unsigned char yPosition, void
ST7579_Char(unsigned char yPosition,
unsigned char xPosition, unsigned char xPosition,
unsigned char character, unsigned char character,
unsigned char bigFont) unsigned char bigFont)
@ -281,13 +278,11 @@ void ST7579_Char(unsigned char yPosition,
unsigned char column = 0; unsigned char column = 0;
unsigned char data = 0; unsigned char data = 0;
if(bigFont) if(bigFont) {
{
/* Set the X and Y address of RAM. */ /* Set the X and Y address of RAM. */
ST7579_GoTo(yPosition, xPosition); ST7579_GoTo(yPosition, xPosition);
/* Send character data. */ /* Send character data. */
for(column = 0; column < 5; column++) for(column = 0; column < 5; column++) {
{
data = st7579Font[character - 32][column]; data = st7579Font[character - 32][column];
data = ((data & 0x01) ? 0x03 : 0) | data = ((data & 0x01) ? 0x03 : 0) |
((data & 0x02) ? 0x0C : 0) | ((data & 0x02) ? 0x0C : 0) |
@ -304,8 +299,7 @@ void ST7579_Char(unsigned char yPosition,
/* Set the X and Y address of RAM. */ /* Set the X and Y address of RAM. */
ST7579_GoTo(yPosition, xPosition); ST7579_GoTo(yPosition, xPosition);
/* Send character data. */ /* Send character data. */
for(column = 0; column < 5; column++) for(column = 0; column < 5; column++) {
{
data = st7579Font[character - 32][column]; data = st7579Font[character - 32][column];
data = ((data & 0x10) ? 0x03 : 0) | data = ((data & 0x10) ? 0x03 : 0) |
((data & 0x20) ? 0x0C : 0) | ((data & 0x20) ? 0x0C : 0) |
@ -318,20 +312,16 @@ void ST7579_Char(unsigned char yPosition,
ST7579_WriteByte(0); ST7579_WriteByte(0);
ST7579_WriteByte(0); ST7579_WriteByte(0);
ST7579_WriteByte(0); ST7579_WriteByte(0);
} } else {
else
{
/* Set the X and Y address of RAM. */ /* Set the X and Y address of RAM. */
ST7579_GoTo(yPosition, xPosition); ST7579_GoTo(yPosition, xPosition);
/* Send character data. */ /* Send character data. */
for(column = 0; column < 5; column++) for(column = 0; column < 5; column++) {
{
ST7579_WriteByte(st7579Font[character - 32][column] << 1); ST7579_WriteByte(st7579Font[character - 32][column] << 1);
} }
ST7579_WriteByte(0x00); ST7579_WriteByte(0x00);
} }
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Sends a string to ST7579 controller. * @brief Sends a string to ST7579 controller.
* *
@ -342,19 +332,18 @@ void ST7579_Char(unsigned char yPosition,
* *
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
void ST7579_String(unsigned char yPosition, void
ST7579_String(unsigned char yPosition,
unsigned char xPosition, unsigned char xPosition,
unsigned char *string, unsigned char *string,
unsigned char bigFont) unsigned char bigFont)
{ {
while(*string) while(*string) {
{
/* Send each character of the string. */ /* Send each character of the string. */
ST7579_Char(yPosition, xPosition, *string++, bigFont); ST7579_Char(yPosition, xPosition, *string++, bigFont);
xPosition += 6 + (bigFont * 12); xPosition += 6 + (bigFont * 12);
} }
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Sends an integer number to ST7579 controller. * @brief Sends an integer number to ST7579 controller.
* *
@ -365,7 +354,8 @@ void ST7579_String(unsigned char yPosition,
* *
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
void ST7579_Number(unsigned char yPosition, void
ST7579_Number(unsigned char yPosition,
unsigned char xPosition, unsigned char xPosition,
long number, long number,
unsigned char bigFont) unsigned char bigFont)
@ -374,37 +364,28 @@ void ST7579_Number(unsigned char yPosition,
unsigned char chNumber = 10; unsigned char chNumber = 10;
unsigned char chIndex = 0; unsigned char chIndex = 0;
if(number < 0) if(number < 0) {
{
ST7579_Char(yPosition, xPosition, '-', bigFont); ST7579_Char(yPosition, xPosition, '-', bigFont);
xPosition += 6 + (bigFont * 12); xPosition += 6 + (bigFont * 12);
number *= -1; number *= -1;
} } else {
else if(number == 0) {
{
if(number == 0)
{
ST7579_String(yPosition, xPosition, " 0", bigFont); ST7579_String(yPosition, xPosition, " 0", bigFont);
} } else {
else
{
ST7579_Char(yPosition, xPosition, '+', bigFont); ST7579_Char(yPosition, xPosition, '+', bigFont);
xPosition += 6 + (bigFont * 12); xPosition += 6 + (bigFont * 12);
} }
} }
while(mask > number) while(mask > number) {
{
mask /= 10; mask /= 10;
chNumber--; chNumber--;
} }
for(chIndex = 0; chIndex < chNumber; chIndex++) for(chIndex = 0; chIndex < chNumber; chIndex++) {
{
ST7579_Char(yPosition, xPosition, ((number / mask) % 10) + 0x30, bigFont); ST7579_Char(yPosition, xPosition, ((number / mask) % 10) + 0x30, bigFont);
mask /= 10; mask /= 10;
xPosition += 6 + (bigFont * 12); xPosition += 6 + (bigFont * 12);
} }
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Sends a float number to ST7579 controller. * @brief Sends a float number to ST7579 controller.
* *
@ -416,7 +397,8 @@ void ST7579_Number(unsigned char yPosition,
* *
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
void ST7579_FloatNumber(unsigned char yPosition, void
ST7579_FloatNumber(unsigned char yPosition,
unsigned char xPosition, unsigned char xPosition,
float number, float number,
unsigned char resolution, unsigned char resolution,
@ -428,66 +410,51 @@ void ST7579_FloatNumber(unsigned char yPosition,
long display = 1; long display = 1;
long multiplication = 1; long multiplication = 1;
for(index = 0; index < resolution; index++) {
for(index = 0; index < resolution; index++)
{
multiplication *= 10; multiplication *= 10;
} }
display = (long)(number * multiplication); display = (long)(number * multiplication);
if(display < 0) if(display < 0) {
{
ST7579_Char(yPosition, xPosition, '-', bigFont); ST7579_Char(yPosition, xPosition, '-', bigFont);
xPosition += 6 + (bigFont * 12); xPosition += 6 + (bigFont * 12);
display *= -1; display *= -1;
} } else {
else if(display == 0) {
{
if(display == 0)
{
xPosition += 6 + (bigFont * 12); xPosition += 6 + (bigFont * 12);
ST7579_Char(yPosition, xPosition, '0', bigFont); ST7579_Char(yPosition, xPosition, '0', bigFont);
xPosition += 6 + (bigFont * 12); xPosition += 6 + (bigFont * 12);
if(resolution) if(resolution) {
{
ST7579_Char(yPosition, xPosition, '.', bigFont); ST7579_Char(yPosition, xPosition, '.', bigFont);
xPosition += 6 + (bigFont * 12); xPosition += 6 + (bigFont * 12);
} }
for(index = 0; index < resolution; index++) for(index = 0; index < resolution; index++) {
{
ST7579_Char(yPosition, xPosition, '0', bigFont); ST7579_Char(yPosition, xPosition, '0', bigFont);
xPosition += 6 + (bigFont * 12); xPosition += 6 + (bigFont * 12);
} }
return; return;
} } else {
else
{
ST7579_Char(yPosition, xPosition, '+', bigFont); ST7579_Char(yPosition, xPosition, '+', bigFont);
xPosition += 6 + (bigFont * 12); xPosition += 6 + (bigFont * 12);
} }
} }
while((mask > display) && (chNumber > resolution)) while((mask > display) && (chNumber > resolution)) {
{
mask /= 10; mask /= 10;
chNumber--; chNumber--;
} }
if((display > 0) && (display < multiplication)) if((display > 0) && (display < multiplication)) {
{
ST7579_String(yPosition, xPosition, "0.", bigFont); ST7579_String(yPosition, xPosition, "0.", bigFont);
xPosition += 12 + (bigFont * 24); xPosition += 12 + (bigFont * 24);
} }
for(index = 0; index < chNumber; index++) for(index = 0; index < chNumber; index++) {
{
ST7579_Char(yPosition, xPosition, ((display / mask) % 10) + 0x30, bigFont); ST7579_Char(yPosition, xPosition, ((display / mask) % 10) + 0x30, bigFont);
mask /= 10; mask /= 10;
xPosition += 6 + (bigFont * 12); xPosition += 6 + (bigFont * 12);
if((multiplication != 1) && (mask == (multiplication / 10))) if((multiplication != 1) && (mask == (multiplication / 10))) {
{
ST7579_Char(yPosition, xPosition, '.', bigFont); ST7579_Char(yPosition, xPosition, '.', bigFont);
xPosition += 6 + (bigFont * 12); xPosition += 6 + (bigFont * 12);
} }
} }
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Sends an integer number in Hexa format to ST7579 controller. * @brief Sends an integer number in Hexa format to ST7579 controller.
* *
@ -498,7 +465,8 @@ void ST7579_FloatNumber(unsigned char yPosition,
* *
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
void ST7579_HexNumber(unsigned char yPosition, void
ST7579_HexNumber(unsigned char yPosition,
unsigned char xPosition, unsigned char xPosition,
long number, long number,
unsigned char bigFont) unsigned char bigFont)
@ -510,32 +478,25 @@ void ST7579_HexNumber(unsigned char yPosition,
ST7579_String(yPosition, xPosition, "0x", bigFont); ST7579_String(yPosition, xPosition, "0x", bigFont);
xPosition += (6 + (bigFont * 12)) * 2; xPosition += (6 + (bigFont * 12)) * 2;
if(number == 0) if(number == 0) {
{
ST7579_Char(yPosition, xPosition, '0', bigFont); ST7579_Char(yPosition, xPosition, '0', bigFont);
} }
while(mask > number) while(mask > number) {
{
mask /= 16; mask /= 16;
chNumber--; chNumber--;
} }
for(chIndex = 0; chIndex < chNumber; chIndex++) for(chIndex = 0; chIndex < chNumber; chIndex++) {
{
display = (number / mask) % 16; display = (number / mask) % 16;
mask /= 16; mask /= 16;
if(display <= 9) if(display <= 9) {
{
display += 0x30; display += 0x30;
} } else {
else
{
display += 0x37; display += 0x37;
} }
ST7579_Char(yPosition, xPosition, display, bigFont); ST7579_Char(yPosition, xPosition, display, bigFont);
xPosition += 6 + (bigFont * 12); xPosition += 6 + (bigFont * 12);
} }
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Sends an image array to ST7579 controller. * @brief Sends an image array to ST7579 controller.
* *
@ -547,7 +508,8 @@ void ST7579_HexNumber(unsigned char yPosition,
* *
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
void ST7579_Image(unsigned char yPosition, void
ST7579_Image(unsigned char yPosition,
unsigned char xPosition, unsigned char xPosition,
const unsigned char image[], const unsigned char image[],
unsigned char width, unsigned char width,
@ -555,10 +517,8 @@ void ST7579_Image(unsigned char yPosition,
{ {
unsigned short index = 0; unsigned short index = 0;
for(index = 0; index < (width * height / 8); index++) for(index = 0; index < (width * height / 8); index++) {
{ if(!(index % width)) {
if(!(index % width))
{
/* Set the X and Y address of RAM. */ /* Set the X and Y address of RAM. */
ST7579_GoTo(yPosition, xPosition); ST7579_GoTo(yPosition, xPosition);
yPosition++; yPosition++;

2
ST7579.h
View file

@ -97,4 +97,4 @@ void ST7579_Image(unsigned char yPosition,
unsigned char width, unsigned char width,
unsigned char height); unsigned char height);
#endif // __ST7579_H__ #endif /* __ST7579_H__ */

73
TIME.c
View file

@ -43,8 +43,8 @@
/******************************************************************************/ /******************************************************************************/
/***************************** Include Files **********************************/ /***************************** Include Files **********************************/
/******************************************************************************/ /******************************************************************************/
#include "RDKRL78G14.h" // RDKRL78G14 definitions. #include "RDKRL78G14.h" /* RDKRL78G14 definitions. */
#include "TIME.h" // TIME definitions. #include "TIME.h" /* TIME definitions. */
/*****************************************************************************/ /*****************************************************************************/
/************************** Macros Definitions *******************************/ /************************** Macros Definitions *******************************/
@ -66,11 +66,11 @@ unsigned short overflowCounter = 0;
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
#pragma vector = INTTM00_vect #pragma vector = INTTM00_vect
__interrupt static void Timer0InterruptHandler(void) __interrupt static void
Timer0InterruptHandler(void)
{ {
overflowCounter++; overflowCounter++;
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Initializes the timer used in this driver. * @brief Initializes the timer used in this driver.
* *
@ -78,90 +78,87 @@ __interrupt static void Timer0InterruptHandler(void)
* Example: 0 - if initialization was successful; * Example: 0 - if initialization was successful;
* -1 - if initialization was unsuccessful. * -1 - if initialization was unsuccessful.
*******************************************************************************/ *******************************************************************************/
char TIME_Init(void) char
TIME_Init(void)
{ {
PER0 |= 0x0001; // Enable Supply for Unit 0 that contains timers 0..7. PER0 |= 0x0001; /* Enable Supply for Unit 0 that contains timers 0..7. */
TT0 |= 0x0001; // Stop channel 0(Timer 0). TT0 |= 0x0001; /* Stop channel 0(Timer 0). */
TPS0 = 0x0005; // CK00 = FCLK / 32. TPS0 = 0x0005; /* CK00 = FCLK / 32. */
TMR00 |= 0x0000; // CK00 input clock for channel 0. TMR00 |= 0x0000; /* CK00 input clock for channel 0. */
TMMK00 = 1; // Disable INTTM00 interrupt. TMMK00 = 1; /* Disable INTTM00 interrupt. */
TMIF00 = 0; // Clear INTM00 interrupt flag. TMIF00 = 0; /* Clear INTM00 interrupt flag. */
/* Set INTTM00 low priority */ /* Set INTTM00 low priority */
TMPR100 = 1; TMPR100 = 1;
TMPR000 = 1; TMPR000 = 1;
/* Configure channel 0 as a interval timer. */ /* Configure channel 0 as a interval timer. */
TMR00 |= 0x0000; // Interval timer mode. TMR00 |= 0x0000; /* Interval timer mode. */
TO0 &= ~0x0001; // Timer 0 output value is "0". TO0 &= ~0x0001; /* Timer 0 output value is "0". */
TOE0 &= ~0x0001; // Disable output of timer 0. TOE0 &= ~0x0001; /* Disable output of timer 0. */
TMMK00 = 0; // Enable INTTM00 interrupt. TMMK00 = 0; /* Enable INTTM00 interrupt. */
return 0; return 0;
} }
/***************************************************************************//** /***************************************************************************//**
* @brief The timer begins to count in steps of microseconds(us) until the user * @brief The timer begins to count in steps of microseconds(us) until the user
* calls a stop measurement function. * calls a stop measurement function.
* *
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
void TIME_StartMeasure(void) void
TIME_StartMeasure(void)
{ {
TDR00 = 0xFFFF; TDR00 = 0xFFFF;
overflowCounter = 0; overflowCounter = 0;
TS0 |= 0x0001; // Start timer 0. TS0 |= 0x0001; /* Start timer 0. */
TMIF00 = 0; // Clear INTM00 interrupt flag. TMIF00 = 0; /* Clear INTM00 interrupt flag. */
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Stops the measurement process when the functions is called. * @brief Stops the measurement process when the functions is called.
* *
* @return Time(in microseconds) elapsed since the measurement began. * @return Time(in microseconds) elapsed since the measurement began.
*******************************************************************************/ *******************************************************************************/
unsigned long TIME_StopMeasure(void) unsigned long
TIME_StopMeasure(void)
{ {
unsigned long elapsedUs = 0; unsigned long elapsedUs = 0;
unsigned short timerCnt = 0; unsigned short timerCnt = 0;
timerCnt = TCR00; timerCnt = TCR00;
TT0 |= 0x0001; // Stop Timer 0. TT0 |= 0x0001; /* Stop Timer 0. */
TMIF00 = 0; // Clear INTM00 interrupt flag. TMIF00 = 0; /* Clear INTM00 interrupt flag. */
overflowCounter = 0; overflowCounter = 0;
elapsedUs = ((unsigned long)overflowCounter * TIMER_CNT_INTERVAL) + elapsedUs = ((unsigned long)overflowCounter * TIMER_CNT_INTERVAL) +
(0xFFFF - timerCnt); (0xFFFF - timerCnt);
return elapsedUs; return elapsedUs;
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Creates a delay of microseconds. * @brief Creates a delay of microseconds.
* *
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
void TIME_DelayUs(unsigned short usUnits) void
TIME_DelayUs(unsigned short usUnits)
{ {
TDR00 = usUnits; TDR00 = usUnits;
TS0 |= 0x0001; // Start timer 0. TS0 |= 0x0001; /* Start timer 0. */
while(!overflowCounter) while(!overflowCounter) {
{
;
} }
overflowCounter = 0; overflowCounter = 0;
TT0 |= 0x0001; // Stop Timer 0. TT0 |= 0x0001; /* Stop Timer 0. */
} }
/***************************************************************************//** /***************************************************************************//**
* @brief Creates a delay of milliseconds. * @brief Creates a delay of milliseconds.
* *
* @return None. * @return None.
*******************************************************************************/ *******************************************************************************/
void TIME_DelayMs(unsigned short msUnits) void
TIME_DelayMs(unsigned short msUnits)
{ {
TDR00 = 0x3E7; // 0x3E7 = 999(decimal). Timer will count down to 0. TDR00 = 0x3E7; /* 0x3E7 = 999(decimal). Timer will count down to 0. */
TS0 |= 0x0001; // Start timer 0. TS0 |= 0x0001; /* Start timer 0. */
while(overflowCounter < msUnits) while(overflowCounter < msUnits) {
{
;
} }
overflowCounter = 0; overflowCounter = 0;
TT0 |= 0x0001; // Stop Timer 0. TT0 |= 0x0001; /* Stop Timer 0. */
} }