Skip to content

Commit

Permalink
First working version
Browse files Browse the repository at this point in the history 
Programs device but reported CRC is wrong.
  • Loading branch information
@kuro68k
kuro68k committed Apr 28, 2015
1 parent 556b321 commit 3c0dfca
Show file tree
Hide file tree
Showing 14 changed files with 17,441 additions and 130 deletions.
16,901 changes: 16,901 additions & 0 deletions Document.hex
View file

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions firmware/hid_bootloader/hid_bootloader.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,32 +128,32 @@ void HID_set_feature_report_out(uint8_t *report)
case CMD_RESET_POINTER:
page_ptr = 0;
return;

/*
// read from RAM page buffer
case CMD_READ_BUFFER:
memcpy(response, &page_buffer[page_ptr], UDI_HID_REPORT_OUT_SIZE);
page_ptr += UDI_HID_REPORT_OUT_SIZE;
page_ptr &= APP_SECTION_PAGE_SIZE-1;
break;
*/
// erase entire application section
case CMD_ERASE_APP_SECTION:
SP_WaitForSPM();
SP_EraseApplicationSection();
return;

// calculate application and bootloader section CRCs
case CMD_READ_FLASH_CRCS:
SP_WaitForSPM();
calc_fw_crcs((uint32_t *)&response[3], (uint32_t *)&response[7]);
break;

// read MCU IDs
case CMD_READ_MCU_IDS:
report[3] = MCU.DEVID0;
report[3] = MCU.DEVID1;
report[3] = MCU.DEVID2;
report[3] = MCU.REVID;
response[3] = MCU.DEVID0;
response[4] = MCU.DEVID1;
response[5] = MCU.DEVID2;
response[6] = MCU.REVID;
break;

// read fuses
Expand All @@ -177,8 +177,9 @@ void HID_set_feature_report_out(uint8_t *report)
SP_WaitForSPM();
SP_LoadFlashPage(page_buffer);
SP_WriteApplicationPage(APP_SECTION_START + ((uint32_t)addr * APP_SECTION_PAGE_SIZE));
page_ptr = 0;
break;

/*
// read application page to RAM buffer and return first 32 bytes
case CMD_READ_PAGE:
if (addr > (APP_SECTION_SIZE / APP_SECTION_PAGE_SIZE)) // out of range
Expand Down Expand Up @@ -221,7 +222,7 @@ void HID_set_feature_report_out(uint8_t *report)
page_ptr = 0;
}
break;

*/
case CMD_READ_SERIAL:
{
uint8_t i;
Expand Down
160 changes: 80 additions & 80 deletions firmware/hid_bootloader/hid_bootloader.cproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
</ListValues>
</avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
<avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
<avrgcc.compiler.optimization.OtherFlags>-fdata-sections -fno-jump-tables</avrgcc.compiler.optimization.OtherFlags>
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcc.compiler.optimization.DebugLevel>Maximum (-g3)</avrgcc.compiler.optimization.DebugLevel>
Expand Down Expand Up @@ -203,85 +203,85 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<ToolchainSettings>
<AvrGcc>
<avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
<avrgcc.compiler.symbols.DefSymbols>
<ListValues>
<Value>DEBUG</Value>
<Value>BOARD=USER_BOARD</Value>
</ListValues>
</avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.directories.IncludePaths>
<ListValues>
<Value>../common/applications/user_application/user_board/config</Value>
<Value>../src/ASF/xmega/utils</Value>
<Value>../src/config</Value>
<Value>../src/ASF/common/boards</Value>
<Value>../src/ASF/xmega/utils/preprocessor</Value>
<Value>../src/ASF/common/utils</Value>
<Value>../src</Value>
<Value>../src/ASF/common/boards/user_board</Value>
<Value>../src/ASF/xmega/drivers/cpu</Value>
<Value>../src/ASF/xmega/drivers/nvm</Value>
<Value>../src/ASF/xmega/drivers/sleep</Value>
<Value>../src/ASF/common/services/clock</Value>
<Value>../src/ASF/common/services/sleepmgr</Value>
<Value>../src/ASF/common/services/usb</Value>
<Value>../src/ASF/common/services/usb/class/hid</Value>
<Value>../src/ASF/common/services/usb/class/hid/device</Value>
<Value>../src/ASF/common/services/usb/class/hid/device/generic</Value>
<Value>../src/ASF/common/services/usb/udc</Value>
<Value>../src/ASF/xmega/drivers/usb</Value>
</ListValues>
</avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
<avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcc.compiler.optimization.DebugLevel>Maximum (-g3)</avrgcc.compiler.optimization.DebugLevel>
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
<avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
<avrgcc.linker.libraries.Libraries>
<ListValues>
<Value>libm</Value>
</ListValues>
</avrgcc.linker.libraries.Libraries>
<avrgcc.linker.memorysettings.Flash>
<ListValues>
<Value>.text=0x10000</Value>
</ListValues>
</avrgcc.linker.memorysettings.Flash>
<avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax</avrgcc.linker.miscellaneous.LinkerFlags>
<avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=USER_BOARD</avrgcc.assembler.general.AssemblerFlags>
<avrgcc.assembler.general.IncludePaths>
<ListValues>
<Value>../common/applications/user_application/user_board/config</Value>
<Value>../src/ASF/xmega/utils</Value>
<Value>../src/config</Value>
<Value>../src/ASF/common/boards</Value>
<Value>../src/ASF/xmega/utils/preprocessor</Value>
<Value>../src/ASF/common/utils</Value>
<Value>../src</Value>
<Value>../src/ASF/common/boards/user_board</Value>
<Value>../src/ASF/xmega/drivers/cpu</Value>
<Value>../src/ASF/xmega/drivers/nvm</Value>
<Value>../src/ASF/xmega/drivers/sleep</Value>
<Value>../src/ASF/common/services/clock</Value>
<Value>../src/ASF/common/services/sleepmgr</Value>
<Value>../src/ASF/common/services/usb</Value>
<Value>../src/ASF/common/services/usb/class/hid</Value>
<Value>../src/ASF/common/services/usb/class/hid/device</Value>
<Value>../src/ASF/common/services/usb/class/hid/device/generic</Value>
<Value>../src/ASF/common/services/usb/udc</Value>
<Value>../src/ASF/xmega/drivers/usb</Value>
</ListValues>
</avrgcc.assembler.general.IncludePaths>
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
</AvrGcc>
<avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
<avrgcc.compiler.symbols.DefSymbols>
<ListValues>
<Value>DEBUG</Value>
<Value>BOARD=USER_BOARD</Value>
</ListValues>
</avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.directories.IncludePaths>
<ListValues>
<Value>../common/applications/user_application/user_board/config</Value>
<Value>../src/ASF/xmega/utils</Value>
<Value>../src/config</Value>
<Value>../src/ASF/common/boards</Value>
<Value>../src/ASF/xmega/utils/preprocessor</Value>
<Value>../src/ASF/common/utils</Value>
<Value>../src</Value>
<Value>../src/ASF/common/boards/user_board</Value>
<Value>../src/ASF/xmega/drivers/cpu</Value>
<Value>../src/ASF/xmega/drivers/nvm</Value>
<Value>../src/ASF/xmega/drivers/sleep</Value>
<Value>../src/ASF/common/services/clock</Value>
<Value>../src/ASF/common/services/sleepmgr</Value>
<Value>../src/ASF/common/services/usb</Value>
<Value>../src/ASF/common/services/usb/class/hid</Value>
<Value>../src/ASF/common/services/usb/class/hid/device</Value>
<Value>../src/ASF/common/services/usb/class/hid/device/generic</Value>
<Value>../src/ASF/common/services/usb/udc</Value>
<Value>../src/ASF/xmega/drivers/usb</Value>
</ListValues>
</avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
<avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcc.compiler.optimization.DebugLevel>Maximum (-g3)</avrgcc.compiler.optimization.DebugLevel>
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
<avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
<avrgcc.linker.libraries.Libraries>
<ListValues>
<Value>libm</Value>
</ListValues>
</avrgcc.linker.libraries.Libraries>
<avrgcc.linker.memorysettings.Flash>
<ListValues>
<Value>.text=0x10000</Value>
</ListValues>
</avrgcc.linker.memorysettings.Flash>
<avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax</avrgcc.linker.miscellaneous.LinkerFlags>
<avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=USER_BOARD</avrgcc.assembler.general.AssemblerFlags>
<avrgcc.assembler.general.IncludePaths>
<ListValues>
<Value>../common/applications/user_application/user_board/config</Value>
<Value>../src/ASF/xmega/utils</Value>
<Value>../src/config</Value>
<Value>../src/ASF/common/boards</Value>
<Value>../src/ASF/xmega/utils/preprocessor</Value>
<Value>../src/ASF/common/utils</Value>
<Value>../src</Value>
<Value>../src/ASF/common/boards/user_board</Value>
<Value>../src/ASF/xmega/drivers/cpu</Value>
<Value>../src/ASF/xmega/drivers/nvm</Value>
<Value>../src/ASF/xmega/drivers/sleep</Value>
<Value>../src/ASF/common/services/clock</Value>
<Value>../src/ASF/common/services/sleepmgr</Value>
<Value>../src/ASF/common/services/usb</Value>
<Value>../src/ASF/common/services/usb/class/hid</Value>
<Value>../src/ASF/common/services/usb/class/hid/device</Value>
<Value>../src/ASF/common/services/usb/class/hid/device/generic</Value>
<Value>../src/ASF/common/services/usb/udc</Value>
<Value>../src/ASF/xmega/drivers/usb</Value>
</ListValues>
</avrgcc.assembler.general.IncludePaths>
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
</AvrGcc>
</ToolchainSettings>
</PropertyGroup>
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions firmware/hid_bootloader/protocol.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#define CMD_WRITE_USER_SIG_ROW 0x0A
#define CMD_READ_USER_SIG_ROW 0x0B
#define CMD_READ_SERIAL 0x0C
#define CMD_READ_BOOTLOADER_VERSION 0x0D


#endif /* PROTOCOL_H_ */
4 changes: 3 additions & 1 deletion firmware/hid_bootloader/src/config/conf_usb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
//! Interface callback definition
#define UDI_HID_GENERIC_ENABLE_EXT() true
#define UDI_HID_GENERIC_DISABLE_EXT()
#define UDI_HID_GENERIC_REPORT_OUT(ptr)
//#define UDI_HID_GENERIC_REPORT_OUT(ptr)
//#define UDI_HID_GENERIC_SET_FEATURE(f)
/*
* #define UDI_HID_GENERIC_ENABLE_EXT() my_callback_generic_enable()
Expand All @@ -139,6 +139,8 @@
* #define UDI_HID_GENERIC_SET_FEATURE(f) my_callback_generic_set_feature(f)
* extern void my_callback_generic_set_feature(uint8_t *report_feature);
*/
#define UDI_HID_GENERIC_REPORT_OUT(ptr) HID_report_out(ptr)
extern void HID_report_out(uint8_t *report);
#define UDI_HID_GENERIC_SET_FEATURE(f) HID_set_feature_report_out(f)
extern void HID_set_feature_report_out(uint8_t *report);

Expand Down
30 changes: 16 additions & 14 deletions pc/hid_bootloader/bootloader.h
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
// bootloader.h

#define CMD_NOP 0x00
#define CMD_WRITE_BUFFER 0x01
#define CMD_READ_BUFFER 0x02
#define CMD_ERASE_APP_SECTION 0x03
#define CMD_READ_FLASH_CRCS 0x04
#define CMD_READ_MCU_IDS 0x05
#define CMD_READ_FUSES 0x06
#define CMD_WRITE_PAGE 0x07
#define CMD_READ_PAGE 0x08
#define CMD_ERASE_USER_SIG_ROW 0x09
#define CMD_WRITE_USER_SIG_ROW 0x0A
#define CMD_READ_USER_SIG_ROW 0x0B
#define CMD_NOP 0x00
#define CMD_RESET_POINTER 0x01
#define CMD_READ_BUFFER 0x02
#define CMD_ERASE_APP_SECTION 0x03
#define CMD_READ_FLASH_CRCS 0x04
#define CMD_READ_MCU_IDS 0x05
#define CMD_READ_FUSES 0x06
#define CMD_WRITE_PAGE 0x07
#define CMD_READ_PAGE 0x08
#define CMD_ERASE_USER_SIG_ROW 0x09
#define CMD_WRITE_USER_SIG_ROW 0x0A
#define CMD_READ_USER_SIG_ROW 0x0B
#define CMD_READ_SERIAL 0x0C
#define CMD_READ_BOOTLOADER_VERSION 0x0D


#define APP_SECTION_ERASE_TIMEOUT_MS 2000
#define APP_SECTION_ERASE_TIMEOUT_MS 100
#define APP_SECTION_NUM_PAGES 256
#define APP_SECTION_PAGE_SIZE 512
#define READ_FLASH_CRCS_TIMEOUT_MS 5000


#define HID_DATA_BYTES 32
#define HID_DATA_BYTES 64
61 changes: 60 additions & 1 deletion pc/hid_bootloader/crc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,63 @@ uint32_t crc32(uint8_t *buffer, uint32_t buffer_length)
}

return reverse(~crc);
}
}

/*
// lookup table for CRC32
const uint32_t crc32_table[256] = {
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F,
0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106,
0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D,
0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7,
0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA,
0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84,
0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55,
0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28,
0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69,
0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693,
0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
};
uint32_t crc32(uint8_t *buffer, uint32_t buffer_length)
{
uint32_t crc = 0xFFFFFFFF;
for (uint32_t i = 0; i < buffer_length; i++)
crc = ((crc >> 8) & 0x00FFFFFF) ^ crc32_table[(crc ^ buffer[i]) & 0xFF];
return (crc ^ 0xFFFFFFFF);
}
*/
Loading

0 comments on commit 3c0dfca

Please sign in to comment.