X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Scan%2FBETKB%2Fscan_loop.c;h=9a145949e4c2008c31f6d21c35866eb22e768201;hb=1fd19c48eac0d7fd8834aa91783385c2844dca9a;hp=80eba169bd62a44aa2836bbfaec0e8da74619657;hpb=1877dcfa01d5f547647aefdc71368281e664ab33;p=kiibohd-controller.git

diff --git a/Scan/BETKB/scan_loop.c b/Scan/BETKB/scan_loop.c
index 80eba16..9a14594 100644
--- a/Scan/BETKB/scan_loop.c
+++ b/Scan/BETKB/scan_loop.c
@@ -1,15 +1,15 @@
-/* Copyright (C) 2012 by Jacob Alexander
- * 
+/* Copyright (C) 2012,2014 by Jacob Alexander
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,10 +21,8 @@
 
 // ----- Includes -----
 
-// AVR Includes
-#include <avr/interrupt.h>
-#include <avr/io.h>
-#include <util/delay.h>
+// Compiler Includes
+#include <Lib/ScanLib.h>
 
 // Project Includes
 #include <led.h>
@@ -38,18 +36,13 @@
 // ----- Defines -----
 
 // Pinout Defines
-#define RESET_PORT PORTB
-#define RESET_DDR   DDRD
-#define RESET_PIN      0
+#define HOLD_PORT PORTD
+#define HOLD_DDR   DDRD
+#define HOLD_PIN      3
 
 
 // ----- Macros -----
 
-// Make sure we haven't overflowed the buffer
-#define bufferAdd(byte) \
-		if ( KeyIndex_BufferUsed < KEYBOARD_BUFFER ) \
-			KeyIndex_Buffer[KeyIndex_BufferUsed++] = byte
-
 
 
 // ----- Variables -----
@@ -57,6 +50,7 @@
 // Buffer used to inform the macro processing module which keys have been detected as pressed
 volatile uint8_t KeyIndex_Buffer[KEYBOARD_BUFFER];
 volatile uint8_t KeyIndex_BufferUsed;
+volatile uint8_t KeyIndex_Add_InputSignal; // Used to pass the (click/input value) to the keyboard for the clicker
 
 
 // Buffer Signals
@@ -133,8 +127,13 @@ inline void scan_setup()
 	UBRR1H = (uint8_t)(baud >> 8);
 	UBRR1L = (uint8_t)baud;
 
-	// Enable the receiver, transitter, and RX Complete Interrupt as well as 9 bit data
-	UCSR1B = 0x9C;
+	// Enable the receiver, and RX Complete Interrupt as well as 9 bit data
+	UCSR1B = 0x94;
+
+	// The transmitter is only to be enabled when needed
+	// Set the pin to be pull-up otherwise (use the lowered voltage inverter in order to sink)
+	HOLD_DDR  &= ~(1 << HOLD_PIN);
+	HOLD_PORT |=  (1 << HOLD_PIN);
 
 	// Set frame format: 9 data, 1 stop bit, no parity
 	// Asynchrounous USART mode
@@ -143,6 +142,9 @@ inline void scan_setup()
 	// Initially buffer doesn't need to be cleared (it's empty...)
 	BufferReadyToClear = 0;
 
+	// InputSignal is off by default
+	KeyIndex_Add_InputSignal = 0x00;
+
 	// Reset the keyboard before scanning, we might be in a wierd state
 	scan_resetKeyboard();
 }
@@ -155,12 +157,13 @@ inline uint8_t scan_loop()
 	return 0;
 }
 
-// TODO
 void processKeyValue( uint8_t keyValue )
 {
 	// Interpret scan code
 	switch ( keyValue )
 	{
+	case 0x00: // Break code from input?
+		break;
 	default:
 		// Make sure the key isn't already in the buffer
 		for ( uint8_t c = 0; c < KeyIndex_BufferUsed + 1; c++ )
@@ -168,7 +171,11 @@ void processKeyValue( uint8_t keyValue )
 			// Key isn't in the buffer yet
 			if ( c == KeyIndex_BufferUsed )
 			{
-				bufferAdd( keyValue );
+				Macro_bufferAdd( keyValue );
+
+				// Only send data if enabled
+				if ( KeyIndex_Add_InputSignal )
+					scan_sendData( KeyIndex_Add_InputSignal );
 				break;
 			}
 
@@ -210,23 +217,35 @@ void removeKeyValue( uint8_t keyValue )
 	}
 }
 
-// Send data 
+// Send data
 uint8_t scan_sendData( uint8_t dataPayload )
 {
+	// Enable the USART Transmitter
+	UCSR1B |=  (1 << 3);
+
+	// Debug
+	char tmpStr[6];
+	hexToStr( dataPayload, tmpStr );
+	info_dPrint( "Sending - ", tmpStr );
+
 	UDR1 = dataPayload;
+
+	// Wait for the payload
+	_delay_us( 800 );
+
+	// Disable the USART Transmitter
+	UCSR1B &= ~(1 << 3);
+
 	return 0;
 }
 
 // Signal KeyIndex_Buffer that it has been properly read
-// TODO
-void scan_finishedWithBuffer( void )
+void Scan_finishedWithBuffer( uint8_t sentKeys )
 {
-	return;
 }
 
 // Signal that the keys have been properly sent over USB
-// TODO
-void scan_finishedWithUSBBuffer( void )
+void Scan_finishedWithUSBBuffer( uint8_t sentKeys )
 {
 }
 
@@ -242,19 +261,9 @@ void scan_unlockKeyboard( void )
 }
 
 // Reset Keyboard
-// TODO?
-// - Holds the input read line high to flush the buffer
-// - This does not actually reset the keyboard, but always seems brings it to a sane state
-// - Won't work fully if keys are being pressed done at the same time
 void scan_resetKeyboard( void )
 {
-	// Initiate data request line, but don't read the incoming data
-	//REQUEST_DATA(); TODO
-
 	// Not a calculated valued...
 	_delay_ms( 50 );
-
-	// Stop request line
-	//STOP_DATA(); TODO
 }