Correction of some minor bugs

git-svn-id: svn://mikrocontroller.net/transistortester@788 6ebdd44f-5a7e-449c-b779-36259138d2c7

Author: kubi48

bootloaders/ee_test/pin_defs.h

@@ -43,7 +43,7 @@
  #define UART_TX p
 #endif
 
-#if defined(UDR)
+#if defined(UDR) && !defined(UDRE0)
   //Name conversion R.Wiersma
   #undef UDR0		/* probably was Bit 0 of UDR before */
   #define UDR0 		UDR
@@ -54,14 +54,13 @@
   #define U2X0		U2X
   #define RXEN0		RXEN
   #define TXEN0		TXEN
-#else
- #if defined(UDR1)
-  #define UDR0 		UDR1
-  #define UDRE0 	UDRE1
-  #define RXC0		RXC1
-  #define FE0           FE1
- #endif
 #endif		/* defined(UDR)  ... */
+#if !defined(UDR0) && defined(UDR1)
+ #define UDR0 		UDR1
+ #define UDRE0 	UDRE1
+ #define RXC0		RXC1
+ #define FE0           FE1
+#endif
 
 #if (!defined(UDR0)) && defined(LINDAT)
   // ATtiny87 and ATtiny167 has a LIN/UART controller
@@ -991,6 +990,10 @@
  // use a uniform version for the 2 Stop Bit transmission option bit
  #if !defined(USBS0) && defined(USBS)
   #define USBS0 USBS
+ #else
+  #if !defined(USBS0) && defined(USBS1)
+   #define USBS0 USBS1
+  #endif
  #endif
 
 #endif		/* SOFT_UART > 0 */

bootloaders/optiboot/baudcheck.S

@@ -210,11 +210,11 @@ delay_mul=$(( DelayMul ))
 clocks=$(( (CLOCKS_PER_BIT / DelayMul) ))
 UartDelay=$(( (((RCALL_TICS*2) + (CLOCKS_PER_BIT/DelayMul)) * DelayMul) + LOOP_TICS ))
  #if BAUD_RATE > 10000
-$ECHO_CMD "BAUD RATE CHECK: Desired: $bps,  SoftUART_Real: `$ECHO_CMD "scale=0;($fcpu / $UartDelay)" | $BC_CMD`, Delay: $clocks*$delay_mul, Error=`$ECHO_CMD "scale=2;(100*(($fcpu / $UartDelay)- $bps) ) / $bps"| $BC_CMD`\%"
+$ECHO_CMD "BAUD RATE CHECK: Desired: $bps,  SoftUART_Real: `$ECHO_CMD "scale=0;($fcpu / $UartDelay)" | $BC_CMD`, Delay: $clocks*$delay_mul, Error=`$ECHO_CMD "scale=2;(100*(($fcpu / $UartDelay)- $bps) ) / $bps"| $BC_CMD`%"
  #elif BAUD_RATE > 1000
-$ECHO_CMD "BAUD RATE CHECK: Desired: $bps,  SoftUART_Real: `$ECHO_CMD "scale=1;($fcpu / $UartDelay)" | $BC_CMD`, Delay: $clocks*$delay_mul, Error=`$ECHO_CMD "scale=2;(100*(($fcpu / $UartDelay)- $bps) ) / $bps"| $BC_CMD`\%"
+$ECHO_CMD "BAUD RATE CHECK: Desired: $bps,  SoftUART_Real: `$ECHO_CMD "scale=1;($fcpu / $UartDelay)" | $BC_CMD`, Delay: $clocks*$delay_mul, Error=`$ECHO_CMD "scale=2;(100*(($fcpu / $UartDelay)- $bps) ) / $bps"| $BC_CMD`%"
  #else
-$ECHO_CMD "BAUD RATE CHECK: Desired: $bps,  SoftUART_Real: `$ECHO_CMD "scale=2;($fcpu / $UartDelay)" | $BC_CMD`, Delay: $clocks*$delay_mul, Error=`$ECHO_CMD "scale=2;(100*(($fcpu / $UartDelay)- $bps) ) / $bps"| $BC_CMD`\%"
+$ECHO_CMD "BAUD RATE CHECK: Desired: $bps,  SoftUART_Real: `$ECHO_CMD "scale=2;($fcpu / $UartDelay)" | $BC_CMD`, Delay: $clocks*$delay_mul, Error=`$ECHO_CMD "scale=2;(100*(($fcpu / $UartDelay)- $bps) ) / $bps"| $BC_CMD`%"
  #endif
 #else
 // for hardware UART
@@ -246,11 +246,11 @@ UartDelay=$(( (8 * ((BAUD_SETTING) +1)) ))
  * Print a nice message containing the info we've calculated
  */
  #if BAUD_RATE > 10000
-$ECHO_CMD "BAUD RATE CHECK: Desired: $bps,  Real: `$ECHO_CMD "scale=0;($fcpu / $UartDelay)" | $BC_CMD`, UBRR = $BAUD_SETTING, Error=`$ECHO_CMD "scale=2;(100*(($fcpu / $UartDelay) - $bps) ) / $bps"| $BC_CMD`\%"
+$ECHO_CMD "BAUD RATE CHECK: Desired: $bps,  Real: `$ECHO_CMD "scale=0;($fcpu / $UartDelay)" | $BC_CMD`, UBRR = $BAUD_SETTING, Error=`$ECHO_CMD "scale=2;(100*(($fcpu / $UartDelay) - $bps) ) / $bps"| $BC_CMD`%"
  #elif BAUD_RATE > 1000
-$ECHO_CMD "BAUD RATE CHECK: Desired: $bps,  Real: `$ECHO_CMD "scale=1;($fcpu / $UartDelay)" | $BC_CMD`, UBRR = $BAUD_SETTING, Error=`$ECHO_CMD "scale=2;(100*(($fcpu / $UartDelay) - $bps) ) / $bps"| $BC_CMD`\%"
+$ECHO_CMD "BAUD RATE CHECK: Desired: $bps,  Real: `$ECHO_CMD "scale=1;($fcpu / $UartDelay)" | $BC_CMD`, UBRR = $BAUD_SETTING, Error=`$ECHO_CMD "scale=2;(100*(($fcpu / $UartDelay) - $bps) ) / $bps"| $BC_CMD`%"
  #else
-$ECHO_CMD "BAUD RATE CHECK: Desired: $bps,  Real: `$ECHO_CMD "scale=2;($fcpu / $UartDelay)" | $BC_CMD`, UBRR = $BAUD_SETTING, Error=`$ECHO_CMD "scale=2;(100*(($fcpu / $UartDelay) - $bps) ) / $bps"| $BC_CMD`\%"
+$ECHO_CMD "BAUD RATE CHECK: Desired: $bps,  Real: `$ECHO_CMD "scale=2;($fcpu / $UartDelay)" | $BC_CMD`, UBRR = $BAUD_SETTING, Error=`$ECHO_CMD "scale=2;(100*(($fcpu / $UartDelay) - $bps) ) / $bps"| $BC_CMD`%"
  #endif
 #endif	/* SOFT_UART */
 #endif	/* BAUD_RATE < 100 */

bootloaders/optiboot/led_defs.h

@@ -268,7 +268,7 @@
 
  #if (LED == p) && ((LED_DATA_FLASH > 0) || (LED_START_FLASHES != 0))
   #ifndef NO_WARNING
-   #warning "LED bit is set to default C6"
+   #warning "LED bit is set to default B5"
   #endif
   #define LEDX           pB5	/* coded Port B Bit 5 */
  #else