Skip to content

Commit

Permalink
libraries defines template was not included
Browse files Browse the repository at this point in the history
  • Loading branch information
@jlbirccyn
jlbirccyn committed Feb 29, 2024
1 parent 4bf5af4 commit 34b178c
Show file tree
Hide file tree
Showing 5 changed files with 112 additions and 106 deletions.
0 ...tm32f303/tpl_library_defines.goilTemplate → ...32f303/tpl_library_defines_h.goilTemplate
View file
File renamed without changes.
0 ...tm32l432/tpl_library_defines.goilTemplate → ...32l432/tpl_library_defines_h.goilTemplate
View file
File renamed without changes.
1 change: 1 addition & 0 deletions goil/templates/code/tpl_app_define_h.goilTemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ if OS::STATUS == "EXTENDED" then%
*/
#define TPL_OPTIMIZE_TICKS % !yesNo(exists OS::OPTIMIZETICKS default (false)) %
%
template if exists tpl_library_defines_h
template if exists custom_app_define_h
%
/* End of file TPL_APP_DEFINE_H */
Expand Down
6 changes: 3 additions & 3 deletions goil/templates/config/cortex-m/armv7em/stm32f303/config.oil
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ CPU stm32f303 {

PLATFORM_FILES stm32f303_trace {
PATH = "cortex-m/armv7em/stm32f303";
CFILE = "tpl_trace.c";
CFILE = "tpl_trace.c";
};

PLATFORM_FILES stm32f303_cmsis {
Expand All @@ -464,8 +464,8 @@ CPU stm32f303 {

LIBRARY serial {
PATH = "cortex-m/armv7em/stm32f303/lib";
CHEADER = "serial.h";
CFILE = "serial.c";
CHEADER = "serial.h";
CFILE = "serial.c";
};

POSTBUILD all {
Expand Down
211 changes: 108 additions & 103 deletions machines/cortex-m/armv7em/stm32l432/lib/serial.c
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#include "pinAccess.h"
#include "serial.h"
#include "tpl_app_define.h" /* buffer sizes */

#ifndef SERIAL_TX_BUFFER_SIZE
#define SERIAL_TX_BUFFER_SIZE 16
#endif
#include "pinAccess.h"
#include "tpl_app_define.h" /* buffer sizes */

/* TX FIFO buffer
* updated in interrupt handler
Expand All @@ -26,126 +22,135 @@ extern uint32_t SystemCoreClock;

void tpl_serial_begin()
{
tpl_serial_TXbufHead = 0;
tpl_serial_TXbufTail = 0;

pinAlt(GPIOA,2,7); // PA2 (TX) => alternative config 7

RCC->APB1ENR1 |= RCC_APB1ENR1_USART2EN;
__asm("nop");
RCC->APB1RSTR1 |= RCC_APB1RSTR1_USART2RST;
RCC->APB1RSTR1 &= ~RCC_APB1RSTR1_USART2RST;
__asm("nop");
//PCLK1 is the default clock
const uint32_t PCLK = SystemCoreClock;
USART2->BRR = PCLK/115200; //115200 bauds

USART2->CR2 = 0; //default
USART2->CR3 = 0; //default
USART2->CR1 = USART_CR1_TE | USART_CR1_RE | USART_CR1_UE;
NVIC_EnableIRQ(USART2_IRQn);
NVIC_SetPriority(USART2_IRQn,1);
tpl_serial_TXbufHead = 0;
tpl_serial_TXbufTail = 0;

pinAlt(GPIOA, 2, 7); // PA2 (TX) => alternative config 7

RCC->APB1ENR1 |= RCC_APB1ENR1_USART2EN;
__asm("nop");
RCC->APB1RSTR1 |= RCC_APB1RSTR1_USART2RST;
RCC->APB1RSTR1 &= ~RCC_APB1RSTR1_USART2RST;
__asm("nop");
// PCLK1 is the default clock
const uint32_t PCLK = SystemCoreClock;
USART2->BRR = PCLK / 115200; // 115200 bauds

USART2->CR2 = 0; // default
USART2->CR3 = 0; // default
USART2->CR1 = USART_CR1_TE | USART_CR1_RE | USART_CR1_UE;
NVIC_EnableIRQ(USART2_IRQn);
NVIC_SetPriority(USART2_IRQn, 1);
}

//void USART2_Handler()
// void USART2_Handler()
void itUsart()
{
//interrupt updates tpl_serial_TXbufTail index!!

//only "TX Empty interrupt" is enabled
char c = tpl_serial_TXbuf[tpl_serial_TXbufTail];
tpl_serial_TXbufTail = (tpl_serial_TXbufTail+1)%SERIAL_TX_BUFFER_SIZE;
if(tpl_serial_TXbufTail == tpl_serial_TXbufHead) { //empty
USART2->CR1 &= ~USART_CR1_TXEIE; //remove the interrupt.
}
//send
USART2->TDR = c;
// interrupt updates tpl_serial_TXbufTail index!!

// only "TX Empty interrupt" is enabled
char c = tpl_serial_TXbuf[tpl_serial_TXbufTail];
tpl_serial_TXbufTail = (tpl_serial_TXbufTail + 1) % SERIAL_TX_BUFFER_SIZE;
if (tpl_serial_TXbufTail == tpl_serial_TXbufHead)
{ // empty
USART2->CR1 &= ~USART_CR1_TXEIE; // remove the interrupt.
}
// send
USART2->TDR = c;
}

int tpl_serial_putchar(char c)
{
int overflow = 0;
// update: we SHOULD not add extra character:
// it is not compatible with the trace toolkit!
// => no more LF preceeded by CR
//if(c == '\n') overflow |= tpl_serial_putchar('\r');

//routine updates tpl_serial_TXbufHead index
const int next=(tpl_serial_TXbufHead+1) % SERIAL_TX_BUFFER_SIZE;
overflow |= (next == tpl_serial_TXbufTail); //TX buffer full?
if(!overflow) {
tpl_serial_TXbuf[tpl_serial_TXbufHead] = c;
tpl_serial_TXbufHead = next;
USART2->CR1 |= USART_CR1_TXEIE; //TX empty interrupt
}
return overflow;
int overflow = 0;
// update: we SHOULD not add extra character:
// it is not compatible with the trace toolkit!
// => no more LF preceeded by CR
// if(c == '\n') overflow |= tpl_serial_putchar('\r');

// routine updates tpl_serial_TXbufHead index
const int next = (tpl_serial_TXbufHead + 1) % SERIAL_TX_BUFFER_SIZE;
overflow |= (next == tpl_serial_TXbufTail); // TX buffer full?
if (!overflow)
{
tpl_serial_TXbuf[tpl_serial_TXbufHead] = c;
tpl_serial_TXbufHead = next;
USART2->CR1 |= USART_CR1_TXEIE; // TX empty interrupt
}
return overflow;
}

int tpl_serial_print_string(const char* str)
int tpl_serial_print_string(const char *str)
{
int overflow = 0;
while(*str && !overflow) {
overflow |= tpl_serial_putchar(*str++);
}
return overflow;
int overflow = 0;
while (*str && !overflow)
{
overflow |= tpl_serial_putchar(*str++);
}
return overflow;
}

int tpl_serial_print_int(int32_t val, int base, int fieldWidth)
{
int overflow = 0;
if(base != 10 && base != 16)
{
return tpl_serial_print_string("<base error>");
}

char negative = 0;
char buffer[11]; /* min val: -2 000 000 000 => 11 chars */
int index = 0;

if (val < 0)
{
negative = 1;
val = -val;
}
if (val == 0) buffer[index++] = '0';
else
{
while (val != 0)
{
char digit;
int remaining = val % base;
if(remaining<10) digit = (char)(remaining + (int)'0');
else digit=(char)(remaining-10+(int)'A');
buffer[index++] = digit;
val = val / base;
}
}
if (negative) buffer[index++] = '-';
int i;
for (i = index; i < fieldWidth && !overflow; i++) {
overflow |= tpl_serial_putchar(' ');
}
for (i = index - 1; i >= 0 && !overflow; i--)
int overflow = 0;
if (base != 10 && base != 16)
{
return tpl_serial_print_string("<base error>");
}

char negative = 0;
char buffer[11]; /* min val: -2 000 000 000 => 11 chars */
int index = 0;

if (val < 0)
{
negative = 1;
val = -val;
}
if (val == 0)
buffer[index++] = '0';
else
{
while (val != 0)
{
overflow |= tpl_serial_putchar(buffer[i]);
char digit;
int remaining = val % base;
if (remaining < 10)
digit = (char)(remaining + (int)'0');
else
digit = (char)(remaining - 10 + (int)'A');
buffer[index++] = digit;
val = val / base;
}
return overflow;
}
if (negative)
buffer[index++] = '-';
int i;
for (i = index; i < fieldWidth && !overflow; i++)
{
overflow |= tpl_serial_putchar(' ');
}
for (i = index - 1; i >= 0 && !overflow; i--)
{
overflow |= tpl_serial_putchar(buffer[i]);
}
return overflow;
}

void tpl_serial_tx_fifo_discard()
{
//the current transmitting byte is sent, but
//won't generate any interrupt.
USART2->CR1 &= ~USART_CR1_TXEIE; //remove the interrupt.
//reinit TX fifo.
tpl_serial_TXbufHead = 0;
tpl_serial_TXbufTail = 0;
// the current transmitting byte is sent, but
// won't generate any interrupt.
USART2->CR1 &= ~USART_CR1_TXEIE; // remove the interrupt.
// reinit TX fifo.
tpl_serial_TXbufHead = 0;
tpl_serial_TXbufTail = 0;
}

void tpl_serial_wait_for_tx_complete()
{
/* The TX Interrupt is disabled when the TX buffer
* is empty.
*/
while(USART2->CR1 & USART_CR1_TXEIE);
/* The TX Interrupt is disabled when the TX buffer
* is empty.
*/
while (USART2->CR1 & USART_CR1_TXEIE)
;
}

0 comments on commit 34b178c

Please sign in to comment.