andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Detab some HAL files

pull/1/head
Scott Lahteine 7 years ago
parent
1c41de16d4
commit
3319765034
2 changed files with 64 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 70
      Marlin/src/HAL/HAL_LPC1768/HardwareSerial.cpp
  2. 58
      Marlin/src/HAL/HAL_STM32F1/persistent_store_impl.cpp

70
Marlin/src/HAL/HAL_LPC1768/HardwareSerial.cpp
View File

@ -89,25 +89,25 @@ void HardwareSerial::begin(uint32_t baudrate) {
PINSEL_ConfigPin(&PinCfg);
}
/* Initialize UART Configuration parameter structure to default state:
* Baudrate = 9600bps
* 8 data bit
* 1 Stop bit
* None parity
*/
UART_ConfigStructInit(&UARTConfigStruct);
// Re-configure baudrate
UARTConfigStruct.Baud_rate = baudrate;
// Initialize eripheral with given to corresponding parameter
/* Initialize UART Configuration parameter structure to default state:
* Baudrate = 9600bps
* 8 data bit
* 1 Stop bit
* None parity
*/
UART_ConfigStructInit(&UARTConfigStruct);
// Re-configure baudrate
UARTConfigStruct.Baud_rate = baudrate;
// Initialize eripheral with given to corresponding parameter
UART_Init(UARTx, &UARTConfigStruct);
// Enable and reset the TX and RX FIFOs
UART_FIFOConfigStructInit(&FIFOConfig);
UART_FIFOConfig(UARTx, &FIFOConfig);
// Enable UART Transmit
// Enable UART Transmit
UART_TxCmd(UARTx, ENABLE);
// Configure Interrupts
@ -234,9 +234,9 @@ void HardwareSerial::IRQHandler() {
uint8_t LSRValue, byte;
IIRValue = UART_GetIntId(UARTx);
IIRValue &= UART_IIR_INTID_MASK; /* check bit 1~3, interrupt identification */
IIRValue &= UART_IIR_INTID_MASK; /* check bit 1~3, interrupt identification */
if ( IIRValue == UART_IIR_INTID_RLS ) /* Receive Line Status */
if ( IIRValue == UART_IIR_INTID_RLS ) /* Receive Line Status */
{
LSRValue = UART_GetLineStatus(UARTx);
@ -246,13 +246,13 @@ void HardwareSerial::IRQHandler() {
/* There are errors or break interrupt */
/* Read LSR will clear the interrupt */
Status = LSRValue;
byte = UART_ReceiveByte(UARTx); /* Dummy read on RX to clear
byte = UART_ReceiveByte(UARTx); /* Dummy read on RX to clear
interrupt, then bail out */
return;
}
}
if ( IIRValue == UART_IIR_INTID_RDA ) /* Receive Data Available */
if ( IIRValue == UART_IIR_INTID_RDA ) /* Receive Data Available */
{
/* Clear the FIFO */
while ( UART_Receive(UARTx, &byte, 1, NONE_BLOCKING) ) {
@ -265,10 +265,10 @@ void HardwareSerial::IRQHandler() {
break;
}
}
else if ( IIRValue == UART_IIR_INTID_CTI ) /* Character timeout indicator */
else if ( IIRValue == UART_IIR_INTID_CTI ) /* Character timeout indicator */
{
/* Character Time-out indicator */
Status |= 0x100; /* Bit 9 as the CTI error */
Status |= 0x100; /* Bit 9 as the CTI error */
}
#if TX_BUFFER_SIZE > 0
@ -302,12 +302,12 @@ extern "C" {
#endif
/*****************************************************************************
** Function name: UART0_IRQHandler
** Function name: UART0_IRQHandler
**
** Descriptions: UART0 interrupt handler
** Descriptions: UART0 interrupt handler
**
** parameters: None
** Returned value: None
** parameters: None
** Returned value: None
**
*****************************************************************************/
void UART0_IRQHandler (void)
@ -316,12 +316,12 @@ void UART0_IRQHandler (void)
}
/*****************************************************************************
** Function name: UART1_IRQHandler
** Function name: UART1_IRQHandler
**
** Descriptions: UART1 interrupt handler
** Descriptions: UART1 interrupt handler
**
** parameters: None
** Returned value: None
** parameters: None
** Returned value: None
**
*****************************************************************************/
void UART1_IRQHandler (void)
@ -330,12 +330,12 @@ void UART1_IRQHandler (void)
}
/*****************************************************************************
** Function name: UART2_IRQHandler
** Function name: UART2_IRQHandler
**
** Descriptions: UART2 interrupt handler
** Descriptions: UART2 interrupt handler
**
** parameters: None
** Returned value: None
** parameters: None
** Returned value: None
**
*****************************************************************************/
void UART2_IRQHandler (void)
@ -344,12 +344,12 @@ void UART2_IRQHandler (void)
}
/*****************************************************************************
** Function name: UART3_IRQHandler
** Function name: UART3_IRQHandler
**
** Descriptions: UART3 interrupt handler
** Descriptions: UART3 interrupt handler
**
** parameters: None
** Returned value: None
** parameters: None
** Returned value: None
**
*****************************************************************************/
void UART3_IRQHandler (void)

58
Marlin/src/HAL/HAL_STM32F1/persistent_store_impl.cpp
View File

@ -49,45 +49,45 @@ namespace PersistentStore {
char HAL_STM32F1_eeprom_content[HAL_STM32F1_EEPROM_SIZE];
bool access_start() {
if (!card.cardOK) return false;
int16_t bytes_read = 0;
const char eeprom_zero = 0xFF;
card.openFile((char *)CONFIG_FILE_NAME,true);
bytes_read = card.read (HAL_STM32F1_eeprom_content, HAL_STM32F1_EEPROM_SIZE);
if (bytes_read == -1) return false;
for (; bytes_read < HAL_STM32F1_EEPROM_SIZE; bytes_read++) {
HAL_STM32F1_eeprom_content[bytes_read] = eeprom_zero;
}
card.closefile();
return true;
if (!card.cardOK) return false;
int16_t bytes_read = 0;
const char eeprom_zero = 0xFF;
card.openFile((char *)CONFIG_FILE_NAME,true);
bytes_read = card.read (HAL_STM32F1_eeprom_content, HAL_STM32F1_EEPROM_SIZE);
if (bytes_read == -1) return false;
for (; bytes_read < HAL_STM32F1_EEPROM_SIZE; bytes_read++) {
HAL_STM32F1_eeprom_content[bytes_read] = eeprom_zero;
}
card.closefile();
return true;
}
bool access_finish(){
if (!card.cardOK) return false;
int16_t bytes_written = 0;
card.openFile((char *)CONFIG_FILE_NAME,true);
bytes_written = card.write (HAL_STM32F1_eeprom_content, HAL_STM32F1_EEPROM_SIZE);
card.closefile();
return (bytes_written == HAL_STM32F1_EEPROM_SIZE);
if (!card.cardOK) return false;
int16_t bytes_written = 0;
card.openFile((char *)CONFIG_FILE_NAME,true);
bytes_written = card.write (HAL_STM32F1_eeprom_content, HAL_STM32F1_EEPROM_SIZE);
card.closefile();
return (bytes_written == HAL_STM32F1_EEPROM_SIZE);
}
bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) {
for (int i = 0; i < size; i++) {
HAL_STM32F1_eeprom_content [pos + i] = value[i];
}
crc16(crc, value, size);
pos += size;
return false;
for (int i = 0; i < size; i++) {
HAL_STM32F1_eeprom_content [pos + i] = value[i];
}
crc16(crc, value, size);
pos += size;
return false;
}
bool read_data(int &pos, uint8_t* value, uint16_t size, uint16_t *crc) {
for (int i = 0; i < size; i++) {
value[i] = HAL_STM32F1_eeprom_content [pos + i];
}
crc16(crc, value, size);
pos += size;
return false;
for (int i = 0; i < size; i++) {
value[i] = HAL_STM32F1_eeprom_content [pos + i];
}
crc16(crc, value, size);
pos += size;
return false;
}
} // PersistentStore::

Write Preview
Loading…
Cancel
Save