ejung/xmega-modbus-pt100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

progress on xmega port

Browse Source
This commit is contained in:
Eggert Jung
2020-08-20 15:38:49 +02:00
parent 11e93273e6
commit 3056c3fd11
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
newcode/yaMBSiavr.c
View File

@@ -199,7 +199,6 @@ ISR(UART_RECEIVE_INTERRUPT)
} }
} }
//TODO
ISR(UART_TRANSMIT_INTERRUPT) ISR(UART_TRANSMIT_INTERRUPT)
{ {
BusState&=~(1<<TransmitRequested); BusState&=~(1<<TransmitRequested);
@@ -207,7 +206,11 @@ ISR(UART_TRANSMIT_INTERRUPT)
UART_DATA=rxbuffer[DataPos]; UART_DATA=rxbuffer[DataPos];
DataPos++; DataPos++;
if (DataPos==(PacketTopIndex+1)) { if (DataPos==(PacketTopIndex+1)) {
#ifndef __AVR_ATxmega32A4__
UART_CONTROL&=~(1<<UART_UDRIE); UART_CONTROL&=~(1<<UART_UDRIE);
#else
USARTD0_CTRLA &= ~(USART_DREINTLVL_gm);
#endif
} }
} }
@@ -222,13 +225,14 @@ ISR(UART_TRANSMIT_COMPLETE_INTERRUPT)
//TODO //TODO
void modbusInit(void) void modbusInit(void)
{ {
#ifndef __AVR_ATxmega32A4__
UBRRH = (unsigned char)((UBRR) >> 8); UBRRH = (unsigned char)((UBRR) >> 8);
UBRRL = (unsigned char) UBRR; UBRRL = (unsigned char) UBRR;
UART_STATUS = (1<<U2X); //double speed mode. UART_STATUS = (1<<U2X); //double speed mode.
#ifdef URSEL // if UBRRH and UCSRC share the same I/O location , e.g. ATmega8 #ifdef URSEL // if UBRRH and UCSRC share the same I/O location , e.g. ATmega8
UCSRC = (1<<URSEL)|(3<<UCSZ0); //Frame Size UCSRC = (1<<URSEL)|(3<<UCSZ0); //Frame Size
#else #else
UCSRC = (3<<UCSZ0); //Frame Size UCSRC = (3<<UCSZ0); //Frame Size
#endif #endif
UART_CONTROL = (1<<TXCIE)|(1<<RXCIE)|(1<<RXEN)|(1<<TXEN); // USART receiver and transmitter and receive complete interrupt UART_CONTROL = (1<<TXCIE)|(1<<RXCIE)|(1<<RXEN)|(1<<TXEN); // USART receiver and transmitter and receive complete interrupt
#if PHYSICAL_TYPE == 485 #if PHYSICAL_TYPE == 485
@@ -236,6 +240,13 @@ void modbusInit(void)
transceiver_rxen(); transceiver_rxen();
#endif #endif
BusState=(1<<TimerActive); BusState=(1<<TimerActive);
#elif
//BRR
//RX, TX enable
//Interrupt enable (levels)
//Physical type
//Busstate
#endif
} }
/* @brief: Sends a response. /* @brief: Sends a response.
@@ -243,7 +254,6 @@ void modbusInit(void)
* Arguments: - packtop: Position of the last byte containing data. * Arguments: - packtop: Position of the last byte containing data.
* modbusSendException is a good usage example. * modbusSendException is a good usage example.
*/ */
//TODO
void modbusSendMessage(unsigned char packtop) void modbusSendMessage(unsigned char packtop)
{ {
PacketTopIndex=packtop+2; PacketTopIndex=packtop+2;
@@ -253,7 +263,13 @@ void modbusSendMessage(unsigned char packtop)
#if PHYSICAL_TYPE == 485 #if PHYSICAL_TYPE == 485
transceiver_txen(); transceiver_txen();
#endif #endif
UART_CONTROL|=(1<<UART_UDRIE);
#ifndef __AVR_ATxmega32A4__
UART_CONTROL|=(1<<UART_UDRIE);
#else
USARTD0_CTRLA |= USART_DREINTLVL_HI_gc;
#endif
BusState&=~(1<<ReceiveCompleted); BusState&=~(1<<ReceiveCompleted);
} }