Changeset c7cc629 in avrstuff

Timestamp:

Jul 31, 2014, 5:58:50 PM (10 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

ea32107

Parents:

d31c2f5

Message:

Move the ASCII keymap out of ps2_keyboard.c.

It is used only by the serial converter, so save some flashspace for other projects.

git-svn-id: ​svn://pulkomandy.tk/avrstuff@112 c6672c3c-f6b6-47f9-9001-1fd6b12fecbe

Files:

• kbd/ps2toserial/code/main.c (modified) (1 diff)
• libs/ps2_keyboard/keymap.h (modified) (1 diff)
• libs/ps2_keyboard/ps2_keyboard.c (modified) (6 diffs)
• libs/ps2_keyboard/ps2_keyboard.h (modified) (1 diff)

kbd/ps2toserial/code/main.c

@@ -2 +2 @@
 
 #include "../../../libs/ps2_keyboard/ps2_keyboard.h"
+#include "../../../libs/ps2_keyboard/keymap.h"
 #include "../../../libs/usart/usart.h"
+
+
+char render_scan_code(uint8_t data){
+  char to_ret = pgm_read_byte(&(keymap[data])); //grab character from array
+  if(shift) to_ret -= 0x20;
+  return to_ret;
+}
+
 
 int main() {

libs/ps2_keyboard/keymap.h

@@ +1 @@
+
+#include <avr/pgmspace.h>
+
+// TODO move to a .c file.
 const char keymap[128] PROGMEM = {
 //   0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F

libs/ps2_keyboard/ps2_keyboard.c

@@ -1 @@
-// keyboard.c
-// ps/2 keyboard decoder on ATMega8
-// copyright 2010, Adrien Destugues <pulkomandy@pulkomandy.ath.cx>
-// MIT Licence
+// ps/2 keyboard decoder on ATMega8, ATMega48
+// Copyright 2010-2014, Adrien Destugues <pulkomandy@pulkomandy.tk>
+// This file is distributed under the terms of the MIT Licence.
 
 // Parts borrowed from :
@@ -8 +7 @@
 // for NerdKits with ATmega168
 // hevans@nerdkits.com
-//
-// Designed for use with the USB NerdKit running with ATMega168. Datasheet page
-// numbers refer to ATMega168 datasheet.
-
-#define F_CPU 16000000UL
 
 #include <avr/io.h>
 #include <avr/interrupt.h>
-#include <avr/pgmspace.h>
-#include <util/delay.h>
-
-#include "keymap.h"
 
 
@@ -29 +19 @@
 
 //PIN configuration
+#define PS2_PORT PIND
 #define PS2_CLK PD3 /* Also INT1 */
-#define PS2_PORT PIND
 #define PS2_DATA PD4
 
@@ -37 +27 @@
 static uint8_t started;
 static uint8_t bit_count;
-static uint8_t shift;
 static uint8_t caps_lock;
 static uint8_t extended;
+
+uint8_t shift;
 uint8_t release;
 
@@ -103 +94 @@
 
 
-char render_scan_code(uint8_t data){
-  char to_ret = pgm_read_byte(&(keymap[data])); //grab character from array
-  if(shift) to_ret -= 0x20;
-  return to_ret;
-}
-
-
 uint8_t read_char(){
   while(!char_waiting);
@@ -127 +111 @@
   PS2_PORT |= (1<<PS2_CLK);
 
- // PCMSK |= (1<<PIND3);
+  // FIXME we can use the "pin change" interrupt rather than INT0/INT1 when not
+  // on the old clumsy ATMega8. This would allow for any pin to be used.
+  // PCMSK |= (1<<PIND3);
   MCUCR |= (1<<ISC11); // Falling edge
   MCUCR &= ~(1<<ISC10);
 #ifdef __AVR_ATmega48P__
   EIMSK |= (1<<INT1);
-#else
+#else // ATmega8
   GIMSK |= (1<<INT1);
 #endif

libs/ps2_keyboard/ps2_keyboard.h

@@ -9 +9 @@
         // Convert a keycode to a printable ASCII char
 
+extern uint8_t shift;
 extern uint8_t release;