/* Name: main.c
- * Project: hid-custom-rq example
- * Author: Christian Starkjohann
- * Creation Date: 2008-04-07
+ * Project: labortage-2013-badge
+ * Author: bg (bg@das-labor.org)
+ * Creation Date: 2013-10-16
* Tabsize: 4
- * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
+ * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH, (c) Daniel Otte
+ * License: GNU GPL v3
* This Revision: $Id: main.c 692 2008-11-07 15:07:40Z cs $
*/
hardware resources except INT0 are used. You may have to change usbconfig.h for
different I/O pins for USB. Please note that USB D+ must be the INT0 pin, or
at least be connected to INT0 as well.
-We assume that an LED is connected to port B bit 0. If you connect it to a
-different port or bit, change the macros below:
*/
-#define BUTTON_PIN 4
+#define BUTTON_PIN 5
+#define DEBOUNCE_DELAY 50
#define SIMPLE_COUNTER 1
+#define NO_CHECK 1
+#define ALLOW_SECRET_READ 0
#include <stdint.h>
#include <string.h>
#include <avr/pgmspace.h> /* required by usbdrv.h */
#include "usbdrv.h"
-#include "oddebug.h" /* This is also an example for using debug macros */
#include "requests.h" /* The custom request numbers we use */
#include "hotp.h"
+#include "special_functions.h"
#if !SIMPLE_COUNTER
#include "percnt2.h"
#endif
#define STATE_RELEASE_KEY 2
#define STATE_NEXT 3
+#define MIN(a, b) (((a) < (b)) ? (a) : (b))
+
PROGMEM const char usbHidReportDescriptor[USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH] = {
0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */
0x09, 0x06, /* USAGE (Keyboard) */
static uint8_t current_command;
-typedef struct {
+typedef struct __attribute__((packed)) {
uint8_t modifier;
uint8_t reserved;
uint8_t keycode[6];
secret_length_b = 0;
}
-#define NO_CHECK 1
-
static
uint8_t secret_set(void){
#if !NO_CHECK
static
void token_generate(void) {
+ uint16_t s_length_b;
+ uint8_t digits;
counter_inc();
eeprom_busy_wait();
eeprom_read_block(secret, secret_ee, 32);
eeprom_busy_wait();
+ s_length_b = eeprom_read_word(&secret_length_ee);
+ if (s_length_b > 256) {
+ s_length_b = 256;
+ }
+ eeprom_busy_wait();
+ digits = eeprom_read_byte(&digits_ee);
#if SIMPLE_COUNTER
- hotp(token, secret, eeprom_read_word(&secret_length_ee), eeprom_read_dword(&counter_ee), eeprom_read_byte(&digits_ee));
+ eeprom_busy_wait();
+ hotp(token, secret, s_length_b, eeprom_read_dword(&counter_ee) - 1, digits);
#else
- hotp(token, secret, eeprom_read_word(&secret_length_ee), percnt_get(0), eeprom_read_byte(&digits_ee));
+ hotp(token, secret, s_length_b, percnt_get(0) - 1, digits);
#endif
memory_clean();
}
static
void buildReport(uchar send_key) {
keyboard_report.modifier = 0;
-
switch (send_key) {
case '1' ... '9':
keyboard_report.keycode[0] = KEY_1 + (send_key-'1');
}
static
-int8_t button_get_debounced(volatile uint8_t debounce_count) {
+int8_t button_get_debounced(volatile int8_t debounce_count) {
uint8_t v;
v = PINB & _BV(BUTTON_PIN);
- while (debounce_count-- && v == (PINB & _BV(BUTTON_PIN))) {
+ while (debounce_count-- && (v == (PINB & _BV(BUTTON_PIN)))) {
;
}
- if (debounce_count) {
+ if (debounce_count != -1) {
return -1;
}
return v ? 0 : 1;
uni_buffer.w8[0] = eeprom_read_byte(&reset_counter_ee);
return 1;
case CUSTOM_RQ_SET_DIGITS:
+ if (rq->wValue.bytes[0] < 6) {
+ rq->wValue.bytes[0] = 6;
+ }
if (rq->wValue.bytes[0] > 9) {
rq->wValue.bytes[0] = 9;
}
return 0;
case CUSTOM_RQ_SET_DBG:
return USB_NO_MSG;
- case CUSTOM_RQ_GET_DBG:{
- usbMsgLen_t len = 8;
- if(len > rq->wLength.word){
- len = rq->wLength.word;
- }
+ case CUSTOM_RQ_GET_DBG:
usbMsgPtr = dbg_buffer;
- return len;
- }
+ return MIN(8, rq->wLength.word);
case CUSTOM_RQ_RESET:
soft_reset((uint8_t)(rq->wValue.word));
break;
case CUSTOM_RQ_READ_BUTTON:
- uni_buffer.w8[0] = button_get_debounced(25);
+ uni_buffer.w8[0] = button_get_debounced(DEBOUNCE_DELAY);
return 1;
+#if ALLOW_SECRET_READ
+ case CUSTOM_RQ_GET_SECRET:
+ uni_buffer.w8[0] = 0;
+ return USB_NO_MSG;
+#else
+#endif
+ default:
+ return 0;
}
}
len = sizeof(dbg_buffer);
}
memcpy(dbg_buffer, data, len);
- return 1;
- default:
- return 1;
}
- return 0;
+ return 1;
}
+
uchar usbFunctionRead(uchar *data, uchar len){
- return 0;
+#if ALLOW_SECRET_READ || 1
+ uchar r;
+ uint8_t s_length_B;
+ switch(current_command){
+ case CUSTOM_RQ_GET_SECRET:
+ eeprom_busy_wait();
+ s_length_B = (eeprom_read_word(&secret_length_ee) + 7) / 8;
+ r = MIN(len, s_length_B - uni_buffer.w8[0]);
+ eeprom_busy_wait();
+ eeprom_read_block(data, secret_ee + uni_buffer.w8[0], r);
+ uni_buffer.w8[0] += r;
+ return r;
+ }
+#endif
+ return 0;
}
static void calibrateOscillator(void)
* additional hardware initialization.
*/
- DDRB &= ~_BV(BUTTON_PIN); /* make button pin input */
- PORTB |= _BV(BUTTON_PIN); /* turn on pull-up resistor */
counter_init();
usbInit();
usbDeviceDisconnect(); /* enforce re-enumeration, do this while interrupts are disabled! */
usbDeviceConnect();
sei();
+ DDRB &= ~_BV(BUTTON_PIN); /* make button pin input */
+ PORTB |= _BV(BUTTON_PIN); /* turn on pull-up resistor */
for(;;){ /* main event loop */
wdt_reset();
usbPoll();
- i = button_get_debounced(25);
+ i = button_get_debounced(DEBOUNCE_DELAY);
if (i != -1) {
if (last_stable_button_state == 0 && i == 1) {
+ token_generate();
key_state = STATE_SEND_KEY;
}
last_stable_button_state = i;
projects / labortage2013badge.git / blobdiff