fixed clion mess

UsbKeyboard.h

@@ -18,6 +18,13 @@
 
 typedef uint8_t byte;
 
+#define WAIT_USB do {           \
+  UsbKeyboard.update();         \
+  if (!usbInterruptIsReady())   \
+  {                             \
+    return;                     \
+  }                             \
+} while(0)
 
 #define BUFFER_SIZE 4 // Minimum of 2: 1 for modifiers + 1 for keystroke 
 
@@ -25,243 +32,46 @@ typedef uint8_t byte;
 static uchar    idleRate;           // in 4 ms units 
 
 
-/* We use a simplifed keyboard report descriptor which does not support the
- * boot protocol. We don't allow setting status LEDs and but we do allow
- * simultaneous key presses. 
- * The report descriptor has been created with usb.org's "HID Descriptor Tool"
- * which can be downloaded from http://www.usb.org/developers/hidpage/.
- * Redundant entries (such as LOGICAL_MINIMUM and USAGE_PAGE) have been omitted
- * for the second INPUT item.
- */
-PROGMEM const char usbHidReportDescriptor[35] = { /* USB report descriptor */
-  0x05, 0x01,                    // USAGE_PAGE (Generic Desktop) 
-  0x09, 0x06,                    // USAGE (Keyboard) 
-  0xa1, 0x01,                    // COLLECTION (Application) 
-  0x05, 0x07,                    //   USAGE_PAGE (Keyboard) 
-  0x19, 0xe0,                    //   USAGE_MINIMUM (Keyboard LeftControl) 
-  0x29, 0xe7,                    //   USAGE_MAXIMUM (Keyboard Right GUI) 
-  0x15, 0x00,                    //   LOGICAL_MINIMUM (0) 
-  0x25, 0x01,                    //   LOGICAL_MAXIMUM (1) 
-  0x75, 0x01,                    //   REPORT_SIZE (1) 
-  0x95, 0x08,                    //   REPORT_COUNT (8) 
-  0x81, 0x02,                    //   INPUT (Data,Var,Abs) 
-  0x95, BUFFER_SIZE-1,           //   REPORT_COUNT (simultaneous keystrokes) 
-  0x75, 0x08,                    //   REPORT_SIZE (8) 
-  0x25, 0x65,                    //   LOGICAL_MAXIMUM (101) 
-  0x19, 0x00,                    //   USAGE_MINIMUM (Reserved (no event indicated)) 
-  0x29, 0x65,                    //   USAGE_MAXIMUM (Keyboard Application) 
-  0x81, 0x00,                    //   INPUT (Data,Ary,Abs) 
-  0xc0                           // END_COLLECTION 
-};
-
-
-
-/* Keyboard usage values, see usb.org's HID-usage-tables document, chapter
- * 10 Keyboard/Keypad Page for more codes.
- */
-#define MOD_CONTROL_LEFT    (1<<0)
-#define MOD_SHIFT_LEFT      (1<<1)
-#define MOD_ALT_LEFT        (1<<2)
-#define MOD_GUI_LEFT        (1<<3)
-#define MOD_CONTROL_RIGHT   (1<<4)
-#define MOD_SHIFT_RIGHT     (1<<5)
-#define MOD_ALT_RIGHT       (1<<6)
-#define MOD_GUI_RIGHT       (1<<7)
-
-#define KEY_A       4
-#define KEY_B       5
-#define KEY_C       6
-#define KEY_D       7
-#define KEY_E       8
-#define KEY_F       9
-#define KEY_G       10
-#define KEY_H       11
-#define KEY_I       12
-#define KEY_J       13
-#define KEY_K       14
-#define KEY_L       15
-#define KEY_M       16
-#define KEY_N       17
-#define KEY_O       18
-#define KEY_P       19
-#define KEY_Q       20
-#define KEY_R       21
-#define KEY_S       22
-#define KEY_T       23
-#define KEY_U       24
-#define KEY_V       25
-#define KEY_W       26
-#define KEY_X       27
-#define KEY_Y       28
-#define KEY_Z       29
-#define KEY_1       30
-#define KEY_2       31
-#define KEY_3       32
-#define KEY_4       33
-#define KEY_5       34
-#define KEY_6       35
-#define KEY_7       36
-#define KEY_8       37
-#define KEY_9       38
-#define KEY_0       39
-
-#define KEY_ENTER   40
-#define KEY_ESCAPE  41
-#define KEY_BSPACE  42
-#define KEY_TAB     43
-#define KEY_SPACE   44
-
-
-#define KEY_HYPHEN    45
-#define KEY_EQUAL     46
-#define KEY_LBRACKET  47
-#define KEY_RBRACKET  48
-#define KEY_BSLASH    49
-#define KEY_HASHTAG   50
-#define KEY_SEMICOLON 51
-#define KEY_QUOTE    52
-#define KEY_TILDE     53
-#define KEY_COMMA     54
-#define KEY_DOT       55
-#define KEY_SLASH     56
-#define KEY_CAPSLOCK  57
-
-#define KEY_F1      58
-#define KEY_F2      59
-#define KEY_F3      60
-#define KEY_F4      61
-#define KEY_F5      62
-#define KEY_F6      63
-#define KEY_F7      64
-#define KEY_F8      65
-#define KEY_F9      66
-#define KEY_F10     67
-#define KEY_F11     68
-#define KEY_F12     69
-
-#define KEY_PRINTSCREEN 70
-#define KEY_SCROLLLOCK  71
-#define KEY_PAUSE       72
-#define KEY_INSERT      73
-#define KEY_HOME        74
-#define KEY_PAGEUP      75
-#define KEY_DELETE      76
-#define KEY_END         77
-#define KEY_PAGEDOWN    78
-
-#define KEY_ARROW_RIGHT 79
-#define KEY_ARROW_LEFT  80
-#define KEY_ARROW_DOWN  81
-#define KEY_ARROW_UP    82
-
-
-#define KEY_NUMLOCK     83
-#define KEYP_SLASH      84
-#define KEYP_STAR       85
-#define KEYP_MINUS      86
-#define KEYP_PLUS       87
-#define KEYP_ENTER      88
-
-
-#define KEYP_NUS_BSLASH 100
+#include "keycodes.h"
 
 class UsbKeyboardDevice {
  public:
-  UsbKeyboardDevice () {
-    PORTD = 0; // TODO: Only for USB pins?
-    DDRD |= ~USBMASK;
-
-    cli();
-    usbDeviceDisconnect();
-    usbDeviceConnect();
+  UsbKeyboardDevice (const char* layout);
 
+  void setLayout(const char* layout);
 
-    usbInit();
-      
-    sei();
-
-    // TODO: Remove the next two lines once we fix
-    //       missing first keystroke bug properly.
-    memset(reportBuffer, 0, sizeof(reportBuffer));      
-    usbSetInterrupt(reportBuffer, sizeof(reportBuffer));
-  }
+  bool isUsbReady();
     
   void update() {
     usbPoll();
   }
-    
+
+  void sendKeyStrokes(const char* str);
+
   void sendKeyStroke(byte keyStroke) {
     sendKeyStroke(keyStroke, 0);
   }
 
-  void sendKeyStroke(byte keyStroke, byte modifiers) {
-      
-    while (!usbInterruptIsReady()) {
-      // Note: We wait until we can send keystroke
-      //       so we know the previous keystroke was
-      //       sent.
-    }
-      
-    memset(reportBuffer, 0, sizeof(reportBuffer));
+  void sendKeyStroke(byte keyStroke, byte modifiers);
 
-    reportBuffer[0] = modifiers;
-    reportBuffer[1] = keyStroke;
-        
-    usbSetInterrupt(reportBuffer, sizeof(reportBuffer));
-
-    while (!usbInterruptIsReady()) {
-      // Note: We wait until we can send keystroke
-      //       so we know the previous keystroke was
-      //       sent.
-    }
-      
-    // This stops endlessly repeating keystrokes:
-    memset(reportBuffer, 0, sizeof(reportBuffer));      
-    usbSetInterrupt(reportBuffer, sizeof(reportBuffer));
+#ifdef ARD_USBKBD_AZERTY
+  static int charToKeyAzerty(int, int*);
+#endif
 
-  }
+#ifdef ARD_USBKBD_QWERTY
+  static int charToKeyQwerty(int, int*);
+#endif
     
   //private: TODO: Make friend?
   uchar    reportBuffer[4];    // buffer for HID reports [ 1 modifier byte + (len-1) key strokes]
 
-};
-
-UsbKeyboardDevice UsbKeyboard = UsbKeyboardDevice();
-
-#ifdef __cplusplus
-extern "C"{
-#endif 
-  // USB_PUBLIC uchar usbFunctionSetup
-uchar usbFunctionSetup(uchar data[8]) 
-  {
-    usbRequest_t    *rq = (usbRequest_t *)((void *)data);
-
-    usbMsgPtr = UsbKeyboard.reportBuffer; //
-    if((rq->bmRequestType & USBRQ_TYPE_MASK) == USBRQ_TYPE_CLASS){
-      /* class request type */
-
-      if(rq->bRequest == USBRQ_HID_GET_REPORT){
-	/* wValue: ReportType (highbyte), ReportID (lowbyte) */
+private:
+  char* _layout;
+  static int charModAltGr(char, int*);
+  static int charModShift(char, int*);
 
-	/* we only have one report type, so don't look at wValue */
-        // TODO: Ensure it's okay not to return anything here?    
-	return 0;
-
-      }else if(rq->bRequest == USBRQ_HID_GET_IDLE){
-	//            usbMsgPtr = &idleRate;
-	//            return 1;
-	return 0;
-      }else if(rq->bRequest == USBRQ_HID_SET_IDLE){
-	idleRate = rq->wValue.bytes[1];
-      }
-    }else{
-      /* no vendor specific requests implemented */
-    }
-    return 0;
-  }
-#ifdef __cplusplus
-} // extern "C"
-#endif
+};
 
+#include "UsbKeyboard.hxx"
 
 #endif // __UsbKeyboard_h__

UsbKeyboard.hxx

@@ -210,7 +210,7 @@ int UsbKeyboardDevice::charToKeyAzerty(int c, int* modifier)
 }
 #endif
 
-#ifdef ARD_USBKBD_AZERTY
+#ifdef ARD_USBKBD_QWERTY
 int UsbKeyboardDevice::charToKeyQwerty(int c, int* modifier)
 {
     *modifier = 0;