nebukadneza
/
thermocouple
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed doc a bit, trying to add usb->spi interface

Browse Source
master
Dario Ernst 15 years ago
parent bf0a2de1b8
commit d0020aac14
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File

4
documentation/SPI-Proto
Unescape View File

@ -6,7 +6,7 @@
Where following values are Valid: Where following values are Valid:
|--------------------------------------------------------------------------------------------------------------------------| |--------------------------------------------------------------------------------------------------------------------------|
| Binary Hex Name Address ValueL ValueH Reply Description| | Decimal Hex Name Address ValueL ValueH Reply Description|
|--------------------------------------------------------------------------------------------------------------------------| |--------------------------------------------------------------------------------------------------------------------------|
| 0000001 0x01 Read-Temp Number of zeroes/Rand zeroes/Rand A 16Bit Value Reads the | | 0000001 0x01 Read-Temp Number of zeroes/Rand zeroes/Rand A 16Bit Value Reads the |
| Thermometer Representing Temperature| | Thermometer Representing Temperature|
@ -24,7 +24,7 @@ Where following values are Valid:
| 0000005 0x05 Write-Var16 Number of the Value of Var Value of Var zeroes/Rand Writes 16 | | 0000005 0x05 Write-Var16 Number of the Value of Var Value of Var zeroes/Rand Writes 16 |
| var-DEFINE to write (HIGH) to write (LOW) Bit Var | | var-DEFINE to write (HIGH) to write (LOW) Bit Var |
|--------------------------------------------------------------------------------------------------------------------------| |--------------------------------------------------------------------------------------------------------------------------|
| 0000006 0x07 Call-Func Number of the zeroes/Rand zeroes/Rand zeroes/Rand Calls a | | 0000006 0x06 Call-Func Number of the zeroes/Rand zeroes/Rand zeroes/Rand Calls a |
| func-DEFINE remote | | func-DEFINE remote |
function | function |
|--------------------------------------------------------------------------------------------------------------------------| |--------------------------------------------------------------------------------------------------------------------------|

18
firmware/masterchip/usb.c
Unescape View File

@ -11,15 +11,27 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) {
dataBuffer[3] = thermoData [1] & 0x00ff; dataBuffer[3] = thermoData [1] & 0x00ff;
usbMsgPtr = dataBuffer; usbMsgPtr = dataBuffer;
return 4; return 4;
} } else if(rq->bRequest == 2) {
if(rq->bRequest == 2){
dataBuffer[0] = (thermoData [2] & 0xff00)>>8; dataBuffer[0] = (thermoData [2] & 0xff00)>>8;
dataBuffer[1] = thermoData [2] & 0x00ff; dataBuffer[1] = thermoData [2] & 0x00ff;
dataBuffer[2] = (thermoData [3] & 0xff00)>>8; dataBuffer[2] = (thermoData [3] & 0xff00)>>8;
dataBuffer[3] = thermoData [3] & 0x00ff; dataBuffer[3] = thermoData [3] & 0x00ff;
usbMsgPtr = dataBuffer; usbMsgPtr = dataBuffer;
return 4; return 4;
} else {
uint8_t opcode = (rq->bRequest & 0xff00)>>8;
uint8_t addr = (rq->wValue & 0xff00)>>8;
uint8_t valH = rq->wIndex & 0x00ff;
uint8_t valL = (rq->wIndex & 0xff00)>>8;
// uint16_t reply = do_spi_stuff(opcode, addr, valH, valL);
dataBuffer[0] = (reply & 0xff00)>>8;
dataBuffer[1] = reply & 0x00ff;
dataBuffer[2] = 0x0000;
dataBuffer[3] = 0x0000;
usbMsgPtr = dataBuffer;
return 4;
} }
return 0; return 0;

Write Preview
Loading…
Cancel
Save