projects
/
labortage2013badge.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dcc28b1
)
minor optimiztion
author
bg
<daniel.otte@rub.de>
Sat, 19 Oct 2013 03:58:04 +0000
(
05:58
+0200)
committer
bg
<daniel.otte@rub.de>
Sat, 19 Oct 2013 03:58:04 +0000
(
05:58
+0200)
firmware/main.c
patch
|
blob
|
history
diff --git
a/firmware/main.c
b/firmware/main.c
index f0fd1bf9b2d8f8e958d3326fb672a488eb9a14bc..54476a0e7a1ad143a0f53c42392f12421fa41d08 100644
(file)
--- a/
firmware/main.c
+++ b/
firmware/main.c
@@
-279,6
+279,7
@@
usbMsgLen_t usbFunctionSetup(uchar data[8])
}
if ((rq->bmRequestType & USBRQ_TYPE_MASK) == USBRQ_TYPE_VENDOR) {
current_command = rq->bRequest;
}
if ((rq->bmRequestType & USBRQ_TYPE_MASK) == USBRQ_TYPE_VENDOR) {
current_command = rq->bRequest;
+ usbMsgPtr = uni_buffer.w8;
switch(rq->bRequest)
{
case CUSTOM_RQ_SET_SECRET:
switch(rq->bRequest)
{
case CUSTOM_RQ_SET_SECRET:
@@
-298,7
+299,6
@@
usbMsgLen_t usbFunctionSetup(uchar data[8])
#else
uni_buffer.w32[0] = percnt_get(0);
#endif
#else
uni_buffer.w32[0] = percnt_get(0);
#endif
- usbMsgPtr = (usbMsgPtr_t)uni_buffer.w32;
return 4;
case CUSTOM_RQ_RESET_COUNTER:
counter_reset();
return 4;
case CUSTOM_RQ_RESET_COUNTER:
counter_reset();
@@
-306,7
+306,6
@@
usbMsgLen_t usbFunctionSetup(uchar data[8])
case CUSTOM_RQ_GET_RESET_COUNTER:
eeprom_busy_wait();
uni_buffer.w8[0] = eeprom_read_byte(&reset_counter_ee);
case CUSTOM_RQ_GET_RESET_COUNTER:
eeprom_busy_wait();
uni_buffer.w8[0] = eeprom_read_byte(&reset_counter_ee);
- usbMsgPtr = uni_buffer.w8;
return 1;
case CUSTOM_RQ_SET_DIGITS:
if (rq->wValue.bytes[0] > 9) {
return 1;
case CUSTOM_RQ_SET_DIGITS:
if (rq->wValue.bytes[0] > 9) {
@@
-318,13
+317,11
@@
usbMsgLen_t usbFunctionSetup(uchar data[8])
case CUSTOM_RQ_GET_DIGITS:
eeprom_busy_wait();
uni_buffer.w8[0] = eeprom_read_byte(&digits_ee);
case CUSTOM_RQ_GET_DIGITS:
eeprom_busy_wait();
uni_buffer.w8[0] = eeprom_read_byte(&digits_ee);
- usbMsgPtr = uni_buffer.w8;
return 1;
case CUSTOM_RQ_GET_TOKEN:
token_generate();
usbMsgPtr = (usbMsgPtr_t)token;
return strlen(token);
return 1;
case CUSTOM_RQ_GET_TOKEN:
token_generate();
usbMsgPtr = (usbMsgPtr_t)token;
return strlen(token);
-
case CUSTOM_RQ_PRESS_BUTTON:
key_state = STATE_SEND_KEY;
return 0;
case CUSTOM_RQ_PRESS_BUTTON:
key_state = STATE_SEND_KEY;
return 0;
@@
-346,7
+343,6
@@
usbMsgLen_t usbFunctionSetup(uchar data[8])
break;
case CUSTOM_RQ_READ_BUTTON:
uni_buffer.w8[0] = button_get_debounced(25);
break;
case CUSTOM_RQ_READ_BUTTON:
uni_buffer.w8[0] = button_get_debounced(25);
- usbMsgPtr = uni_buffer.w8;
return 1;
}
}
return 1;
}
}