Merge branch 'master' of https://github.com/smasher816/controller into smasher816...

[kiibohd-controller.git] / Scan / SonyNEWS / scan_loop.c

diff --git a/Scan/SonyNEWS/scan_loop.c b/Scan/SonyNEWS/scan_loop.c
index 71f35450517d055f523f57075d01abdaa15a969b..fd8e3b15e4d10736b4d227b7598da65997204c8d 100644 (file)
--- a/Scan/SonyNEWS/scan_loop.c
+++ b/Scan/SonyNEWS/scan_loop.c
@@ -1,15 +1,15 @@
-/* Copyright (C) 2011 by Jacob Alexander
- * 
+/* Copyright (C) 2011,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,20 +36,17 @@
 // ----- Defines -----
 
 // Pinout Defines
-#define RESET_PORT PORTB
-#define RESET_DDR   DDRD
-#define RESET_PIN      0
+#define SPKR_PORT PORTD
+#define SPKR_DDR   DDRD
+#define SPKR_POS      1
 
+#define POWR_PORT PORTC
+#define POWR_DDR   DDRC
+#define POWR_POS      7
 
-// ----- Macros -----
 
-// Make sure we haven't overflowed the buffer
-#define bufferAdd(byte) \
-               if ( KeyIndex_BufferUsed < KEYBOARD_BUFFER ) \
-                       KeyIndex_Buffer[KeyIndex_BufferUsed++] = byte
 
-#define UNSET_RESET()   RESET_DDR &= ~(1 << RESET_PIN)
-#define   SET_RESET()   RESET_DDR |=  (1 << RESET_PIN)
+// ----- Macros -----
 
 
 
@@ -66,10 +61,10 @@ volatile uint8_t KeyIndex_BufferUsed;
 // ----- Functions -----
 
 // Setup
-inline void scan_setup()
+inline void Scan_setup()
 {
        // Setup the the USART interface for keyboard data input
-       
+
        // Setup baud rate
        // 16 MHz / ( 16 * Baud ) = UBRR
        // Baud <- 0.10450 ms per bit, thus 1000 / 0.10450 = 9569.4
@@ -89,14 +84,23 @@ inline void scan_setup()
        // Asynchrounous USART mode
        UCSR1C = 0x06;
 
+       // Set Speaker Pin to Pull-Up gives a low-volume click (XXX no other setting does, why?)
+       SPKR_DDR  &= ~(1 << SPKR_POS);
+       SPKR_PORT |= (1 << SPKR_POS);
+
+       // Set Power Pin (I've traced this back to the "Power On" Switch, but I don't really know what it's for)
+       // Configured as a Pull-up Input - This pin "can" be read as well, it will go to GND when the "Power On" switch is pressed, and will read ~5V otherwise
+       // XXX Currently not used by the controller
+       POWR_DDR  &= ~(1 << POWR_POS);
+       POWR_PORT |= (1 << POWR_POS);
+
        // Reset the keyboard before scanning, we might be in a wierd state
        scan_resetKeyboard();
 }
 
-
 // Main Detection Loop
 // Not needed for the Sony NEWS, this is just a busy loop
-inline uint8_t scan_loop()
+inline uint8_t Scan_loop()
 {
        return 0;
 }
@@ -140,7 +144,7 @@ void processKeyValue( uint8_t keyValue )
                        erro_dPrint( "Could not find key to release: ", tmpStr );
                }
        }
-       // Press or Repeat Rate
+       // Press or Repeated Key
        else
        {
                // Make sure the key isn't already in the buffer
@@ -149,7 +153,7 @@ void processKeyValue( uint8_t keyValue )
                        // Key isn't in the buffer yet
                        if ( c == KeyIndex_BufferUsed )
                        {
-                               bufferAdd( keyValue );
+                               Macro_bufferAdd( keyValue );
                                break;
                        }
 
@@ -178,21 +182,13 @@ ISR(USART1_RX_vect)
 
        // Process the scancode
        if ( keyValue != 0x00 )
-       processKeyValue( keyValue );
+               processKeyValue( keyValue );
 
        sei(); // Re-enable Interrupts
 }
 
-// Send data TODO
-//
-// Keyboard Input Guide for Micro Switch 8304
-// 0xBX is for LED F1,F2,Over Type,Lock
-// 0xAX is for LED F3,F8,F9,F10
-// 0x92 resets keyboard (LED off, echo scancode mode off)
-// 0x9E sets echo scancode mode from (0x81 to 0xFF; translates to 0x01 to 0x7F)
-// Other echos: 0x15~0x19 send 0x15~0x19, 0x40 sends 0x40 (as well as 0x44,0x45, 0x80)
-// 0x8C Acks the keyboard and gets 0x70 sent back (delayed)
-uint8_t scan_sendData( uint8_t dataPayload )
+// Send data to keyboard
+uint8_t Scan_sendData( uint8_t dataPayload )
 {
        // Debug
        char tmpStr[6];
@@ -205,31 +201,30 @@ uint8_t scan_sendData( uint8_t dataPayload )
 
 // Signal KeyIndex_Buffer that it has been properly read
 // Not needed as a signal is sent to remove key-presses
-void scan_finishedWithBuffer( void )
+void Scan_finishedWithBuffer( uint8_t sentKeys )
 {
        return;
 }
 
 // Reset/Hold keyboard TODO
 // Warning! This will cause the keyboard to not send any data, so you can't disable with a keypress
-// The Micro Switch 8304 has a dedicated reset line
-void scan_lockKeyboard( void )
+void Scan_lockKeyboard( void )
 {
-       //UNSET_RESET();
 }
 
-void scan_unlockKeyboard( void )
+void Scan_unlockKeyboard( void )
 {
-       //SET_RESET();
 }
 
-// Reset Keyboard TODO
-void scan_resetKeyboard( void )
+// Reset Keyboard
+void Scan_resetKeyboard( void )
 {
-       // Reset command for the 8304
-       //scan_sendData( 0x92 );
-
        // Empty buffer, now that keyboard has been reset
        KeyIndex_BufferUsed = 0;
 }
 
+void Scan_finishedWithUSBBuffer( uint8_t sentKeys )
+{
+       return;
+}
+