arduino/optiboot
1
0
Fork 0
mirror of https://github.com/Optiboot/optiboot.git synced 2025-07-06 04:02:29 +03:00
Code Activity

Changes to allow pins_rs485.h to be used with both mega0/xTiny chips as well as older AVRs (PORTx vs VPORTx stuff.)

Browse Source 
Also adjust the build info included in the BIGBOOT image.
This commit is contained in:
WestfW
2021-06-27 19:20:01 -07:00
parent 084c69c6b8
commit bcc71438fe
2 changed files with 376 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
optiboot/bootloaders/optiboot/optiboot.c
View File

@ -797,11 +797,11 @@ int main(void) {
#endif // soft_uart #endif // soft_uart
#ifdef RS485 #ifdef RS485
RS485_DDR |= _BV(RS485); RS485_DDR |= _BV(RS485_BIT);
#ifdef RS485_INVERT #ifdef RS485_INVERT
RS485_PORT |= _BV(RS485); RS485_PORT |= _BV(RS485_BIT);
#else #else
RS485_PORT &= ~_BV(RS485); RS485_PORT &= ~_BV(RS485_BIT);
#endif #endif
#endif #endif
@ -1102,9 +1102,9 @@ void putch(char ch) {
UART_SRA = x; UART_SRA = x;
// put transceiver to output mode // put transceiver to output mode
# ifdef RS485_INVERT # ifdef RS485_INVERT
RS485_PORT &= ~_BV(RS485); RS485_PORT &= ~_BV(RS485_BIT);
# else # else
RS485_PORT |= _BV(RS485); RS485_PORT |= _BV(RS485_BIT);
# endif # endif
// put char // put char
UART_UDR = ch; UART_UDR = ch;
@ -1112,9 +1112,9 @@ void putch(char ch) {
while (!(UART_SRA & _BV(TXC0))) { /* Spin */ } while (!(UART_SRA & _BV(TXC0))) { /* Spin */ }
// put transceiver to input mode // put transceiver to input mode
# ifdef RS485_INVERT # ifdef RS485_INVERT
RS485_PORT |= _BV(RS485); RS485_PORT |= _BV(RS485_BIT);
# else # else
RS485_PORT &= ~_BV(RS485); RS485_PORT &= ~_BV(RS485_BIT);
# endif # endif
#else //not RS485 #else //not RS485
while (!(UART_SRA & _BV(UDRE0))) { /* Spin */ } while (!(UART_SRA & _BV(UDRE0))) { /* Spin */ }
@ -1130,9 +1130,9 @@ void putch(char ch) {
#ifdef RS485 #ifdef RS485
// put transceiver to output mode // put transceiver to output mode
#ifdef RS485_INVERT #ifdef RS485_INVERT
RS485_PORT &= ~_BV(RS485); RS485_PORT &= ~_BV(RS485_BIT);
#else #else
RS485_PORT |= _BV(RS485); RS485_PORT |= _BV(RS485_BIT);
#endif #endif
#endif #endif
__asm__ __volatile__ ( __asm__ __volatile__ (
@ -1161,9 +1161,9 @@ void putch(char ch) {
#ifdef RS485 #ifdef RS485
// put transceiver to input mode // put transceiver to input mode
#ifdef RS485_INVERT #ifdef RS485_INVERT
RS485_PORT |= _BV(RS485); RS485_PORT |= _BV(RS485_BIT);
#else #else
RS485_PORT &= ~_BV(RS485); RS485_PORT &= ~_BV(RS485_BIT);
#endif #endif
#endif #endif
#endif // SOFT_UART #endif // SOFT_UART
@ -1528,6 +1528,9 @@ static void do_spm(uint16_t address, uint8_t command, uint16_t data) {
*/ */
#define xstr(s) str(s) #define xstr(s) str(s)
#define str(s) #s #define str(s) #s
__attribute__((section(".fini9"))) const char f_delimit = 0xFF;
#define OPTFLASHSECT __attribute__((section(".fini8"))) #define OPTFLASHSECT __attribute__((section(".fini8")))
#define OPT2FLASH(o) OPTFLASHSECT const char f##o[] = #o "=" xstr(o) #define OPT2FLASH(o) OPTFLASHSECT const char f##o[] = #o "=" xstr(o)
@ -1548,6 +1551,10 @@ OPTFLASHSECT const char f_LED[] = "LED=" LED_NAME;
#if SUPPORT_EEPROM #if SUPPORT_EEPROM
OPT2FLASH(SUPPORT_EEPROM); OPT2FLASH(SUPPORT_EEPROM);
#endif #endif
#if defined(RS485)
OPTFLASHSECT const char f_rs485[] = "RS485=" RS485_NAME;
#endif
#if BAUD_RATE #if BAUD_RATE
OPT2FLASH(BAUD_RATE); OPT2FLASH(BAUD_RATE);
#endif #endif
@ -1567,7 +1574,7 @@ OPTFLASHSECT const char f_boot[] = "Virtual_Boot_Partition";
#endif #endif
OPT2FLASH(F_CPU); OPT2FLASH(F_CPU);
OPTFLASHSECT const char f_device[] = "Device=" xstr(__AVR_DEVICE_NAME__); OPTFLASHSECT const char f_device[] = "Device=" xstr(__AVR_DEVICE_NAME__);
#ifdef OPTIBOOT_CUSTOMVER #if OPTIBOOT_CUSTOMVER
OPT2FLASH(OPTIBOOT_CUSTOMVER); OPT2FLASH(OPTIBOOT_CUSTOMVER);
#endif #endif
OPTFLASHSECT const char f_version[] = "Version=" xstr(OPTIBOOT_MAJVER) "." xstr(OPTIBOOT_MINVER); OPTFLASHSECT const char f_version[] = "Version=" xstr(OPTIBOOT_MAJVER) "." xstr(OPTIBOOT_MINVER);

885
optiboot/bootloaders/optiboot/pins_rs485.h
View File

File diff suppressed because it is too large Load Diff