Move extra NOP generation into macro

Author: nqtronix

main.c

@@ -16,15 +16,15 @@
 // Functions
 //////////////////////////////////////////////////////////////////////////
 
+// Demo code to check if selected baud rate works on device
 int main(void)
 {
 	// initializes IO
 	tinyuart_init();
-	
-	_delay_us(40);
+	_delay_us(10);
 	// toggle pattern test: after every bit delay the TX pin is toggled
-// 	tinyuart_send_uint8(0b01010101);
-//  	_delay_us(10);
+	tinyuart_send_uint8(0b01010101);
+ 	_delay_us(10);
 
 	// every character test: verify that your receiver can read all chars at the chosen baud rate
 	// cheap UART-USB converts often have an issue with 0x00
@@ -34,6 +34,7 @@ int main(void)
 		_delay_us(10);
 	}
 
+	// Test 0x00 to catch any glitches
 	while(1)
 	{
 		tinyuart_send_uint8(0);

tinyuart.cproj

@@ -43,8 +43,9 @@
         </DebugFile>
       </AAFDebugFiles>
     </AAFDebugger>
-    <avrtool>com.atmel.avrdbg.tool.avrdragon</avrtool>
-    <avrtoolserialnumber>00A200050668</avrtoolserialnumber>
+    <avrtool>com.atmel.avrdbg.tool.simulator</avrtool>
+    <avrtoolserialnumber>
+    </avrtoolserialnumber>
     <avrdeviceexpectedsignature>0x1E9007</avrdeviceexpectedsignature>
     <com_atmel_avrdbg_tool_simulator>
       <ToolOptions>
@@ -70,7 +71,8 @@
         </dependencies>
       </framework-data>
     </AsfFrameworkConfig>
-    <avrtoolinterface>ISP</avrtoolinterface>
+    <avrtoolinterface>
+    </avrtoolinterface>
     <com_atmel_avrdbg_tool_avrdragon>
       <ToolOptions>
         <InterfaceProperties>

tinyuart/tinyuart.c

@@ -46,9 +46,11 @@
 
 // convert additional delay into NOPs
 #if   CYCLES_EXTRA == 2			
-	#define _cycle_nop()		"nop\n\t nop\n\t"
+	#define cycle_nop		"nop \n\t nop \n\t"
 #elif CYCLES_EXTRA == 1
-	#define _cycle_nop()		"nop\n\t"
+	#define cycle_nop		"nop \n\t"
+#else
+	#define cycle_nop		/*empty*/
 #endif
 
 
@@ -114,12 +116,7 @@ void tinyuart_send_uint8(uint8_t data)
 		"send_bit:"
 			"mov	__tmp_reg__,	%[loops]	\n\t"	// bit delay loop
 
-			#if   CYCLES_EXTRA == 2						// insert nops for cycle-accurate delays
-			"nop								\n\t"
-			"nop								\n\t"
-			#elif CYCLES_EXTRA == 1
-			"nop								\n\t"
-			#endif
+			cycle_nop									// insert nops for cycle-accurate delays
 
 		"send_bit_delay:"
 			"dec	__tmp_reg__					\n\t"

tinyuart/tinyuart.h

@@ -21,7 +21,7 @@
 #define TINYUART_F_CPU				9600000
 
 // select a baud rate
-#define TINYUART_BAUD				500000
+#define TINYUART_BAUD				115200
 
 // specify pins used
 #define TINYUART_PORT				PORTB