Final SonyNEWS commit before sending device back

diff --git a/Macro/buffer/macro.c b/Macro/buffer/macro.c
index 109fbfbbe5e60d4e6552a73aaa5a59a68c64b14f..2d031542450e2ef8927c70c7dc08838221302ea9 100644 (file)
--- a/Macro/buffer/macro.c
+++ b/Macro/buffer/macro.c
@@ -54,6 +54,7 @@ static uint8_t Bootloader_ConditionSequence[] = {1,16,6,11};
 
 inline void macro_finishedWithBuffer(void)
 {
+       /* BudKeypad
        // Boot loader sequence state handler
        switch ( KeyIndex_BufferUsed )
        {
@@ -72,6 +73,7 @@ inline void macro_finishedWithBuffer(void)
        }
 
        Bootloader_KeyDetected = 0;
+       */
 }
 
 void jumpToBootloader(void)
@@ -213,6 +215,7 @@ int scancodeMacro( uint8_t scanCode )
        }
        return 1;
        */
+       /* BudKeypad
        // Is this a bootloader sequence key?
        if ( !Bootloader_KeyDetected
           && Bootloader_NextPositionReady
@@ -226,8 +229,8 @@ int scancodeMacro( uint8_t scanCode )
        {
                Bootloader_KeyDetected = 1;
        }
-
-       return 1;
+       */
+       return 0;
 }
 
 uint8_t sendCode = 0;
@@ -346,7 +349,7 @@ inline void process_macros(void)
        keyPressBufferRead( MODIFIER_MASK, sizeof(MODIFIER_MASK), KEYINDEX_MASK );
 
        // Check for bootloader condition
-       if ( Bootloader_ConditionState == sizeof( Bootloader_ConditionSequence ) )
-               jumpToBootloader();
+       //if ( Bootloader_ConditionState == sizeof( Bootloader_ConditionSequence ) )
+       //      jumpToBootloader();
 }
 

diff --git a/Scan/SonyNEWS/scan_loop.c b/Scan/SonyNEWS/scan_loop.c
index 71f35450517d055f523f57075d01abdaa15a969b..ca4d0bbb33716c9974e5871b43247d9f94a678bb 100644 (file)
--- a/Scan/SonyNEWS/scan_loop.c
+++ b/Scan/SonyNEWS/scan_loop.c
@@ -38,9 +38,14 @@
 // ----- 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 -----
@@ -50,9 +55,6 @@
                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)
-
 
 
 // ----- Variables -----
@@ -89,11 +91,20 @@ 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()
@@ -140,7 +151,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
@@ -178,20 +189,12 @@ 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)
+// Send data to keyboard
 uint8_t scan_sendData( uint8_t dataPayload )
 {
        // Debug
@@ -212,24 +215,23 @@ void scan_finishedWithBuffer( void )
 
 // 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 )
 {
-       //UNSET_RESET();
 }
 
 void scan_unlockKeyboard( void )
 {
-       //SET_RESET();
 }
 
-// Reset Keyboard TODO
+// 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( void )
+{
+       return;
+}
+

diff --git a/Scan/SonyNEWS/scan_loop.h b/Scan/SonyNEWS/scan_loop.h
index d4da30679b1927ad2444eb3ea9e6731a25c66667..f3b14666b4ed7d00ed96ead206d3f572f55b33e0 100644 (file)
--- a/Scan/SonyNEWS/scan_loop.h
+++ b/Scan/SonyNEWS/scan_loop.h
@@ -55,6 +55,7 @@ uint8_t scan_loop( void );
 // Functions available to macro.c
 uint8_t scan_sendData( uint8_t dataPayload );
 
+void scan_finishedWithUSBBuffer( void );
 void scan_finishedWithBuffer( void );
 void scan_lockKeyboard( void );
 void scan_unlockKeyboard( void );

diff --git a/Scan/SonyNEWS/setup.cmake b/Scan/SonyNEWS/setup.cmake
index ffc338417998a6281f3c0baa95a0594c5e222600..c5f67971962d63b0c071eaacef85c8e9b1d0069d 100644 (file)
--- a/Scan/SonyNEWS/setup.cmake
+++ b/Scan/SonyNEWS/setup.cmake
@@ -42,7 +42,7 @@ add_definitions( -I${HEAD_DIR}/Keymap )
 #| Keymap Settings
 add_definitions(
        -DMODIFIER_MASK=sonynews_ModifierMask
-       -DKEYINDEX_MASK=sonynews_ColemakMap
-       #-DKEYINDEX_MASK=sonynews_DefaultMap
+       #-DKEYINDEX_MASK=sonynews_ColemakMap
+       -DKEYINDEX_MASK=sonynews_DefaultMap
 )
 

diff --git a/setup.cmake b/setup.cmake
index c3eb2a25c06d88048833bebe0e775db06cab1b73..39a50bfff0c3d79f0cbeba3f6effa1cd43f2b7e5 100644 (file)
--- a/setup.cmake
+++ b/setup.cmake
@@ -20,7 +20,7 @@
 #| Please the {Scan,Macro,USB,Debug}/module.txt for information on the modules and how to create new ones
 
 ##| Deals with acquiring the keypress information and turning it into a key index
-set(  ScanModule  "BudKeypad" )
+set(  ScanModule  "SonyNEWS" )
 
 ##| Uses the key index and potentially applies special conditions to it, mapping it to a usb key code
 set( MacroModule  "buffer"  )