Merge branch 'master' of epagris.com:epagris/flatUSB
This commit is contained in:
		
						commit
						a977b32471
					
				@ -3,8 +3,6 @@
 | 
			
		||||
#include <stdint.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
 | 
			
		||||
#include "stm32f4xx_hal.h"
 | 
			
		||||
 | 
			
		||||
#include "flatUSB_config.h"
 | 
			
		||||
#include "usb_driver_common.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -3,12 +3,12 @@
 | 
			
		||||
  "subclass": "0x00",
 | 
			
		||||
  "protocol_code": "0x00",
 | 
			
		||||
  "max_ep0_packet_size": 64,
 | 
			
		||||
  "vendor_id": "0x0925",
 | 
			
		||||
  "product_id": "0x9050",
 | 
			
		||||
  "vendor_id": "0x0000",
 | 
			
		||||
  "product_id": "0x0001",
 | 
			
		||||
  "device_release_bcd": "0x0100",
 | 
			
		||||
  "vendor_string": "Epagris",
 | 
			
		||||
  "product_string": "Testdevice",
 | 
			
		||||
  "serial_number": "1552",
 | 
			
		||||
  "vendor_string": "<Vendor>",
 | 
			
		||||
  "product_string": "<Product name>",
 | 
			
		||||
  "serial_number": "0000000000000",
 | 
			
		||||
  "configurations": [
 | 
			
		||||
    {
 | 
			
		||||
      "id": 1,
 | 
			
		||||
 | 
			
		||||
@ -3,12 +3,12 @@
 | 
			
		||||
  "subclass": "0x00",
 | 
			
		||||
  "protocol_code": "0x00",
 | 
			
		||||
  "max_ep0_packet_size": 64,
 | 
			
		||||
  "vendor_id": "0x0925",
 | 
			
		||||
  "product_id": "0x9050",
 | 
			
		||||
  "vendor_id": "0x0000",
 | 
			
		||||
  "product_id": "0x0001",
 | 
			
		||||
  "device_release_bcd": "0x0100",
 | 
			
		||||
  "vendor_string": "Epagris",
 | 
			
		||||
  "product_string": "Testdevice",
 | 
			
		||||
  "serial_number": "1552",
 | 
			
		||||
  "vendor_string": "<Vendor>",
 | 
			
		||||
  "product_string": "<Product name>",
 | 
			
		||||
  "serial_number": "0000000000000",
 | 
			
		||||
  "configurations": [
 | 
			
		||||
    {
 | 
			
		||||
      "id": 1,
 | 
			
		||||
@ -3,12 +3,12 @@
 | 
			
		||||
  "subclass": "0x00",
 | 
			
		||||
  "protocol_code": "0x00",
 | 
			
		||||
  "max_ep0_packet_size": 64,
 | 
			
		||||
  "vendor_id": "0x0925",
 | 
			
		||||
  "product_id": "0x9050",
 | 
			
		||||
  "vendor_id": "0x0000",
 | 
			
		||||
  "product_id": "0x0001",
 | 
			
		||||
  "device_release_bcd": "0x0100",
 | 
			
		||||
  "vendor_string": "Epagris",
 | 
			
		||||
  "product_string": "Testdevice",
 | 
			
		||||
  "serial_number": "1552",
 | 
			
		||||
  "vendor_string": "<Vendor>",
 | 
			
		||||
  "product_string": "<Product name>",
 | 
			
		||||
  "serial_number": "0000000000000",
 | 
			
		||||
  "configurations": [
 | 
			
		||||
    {
 | 
			
		||||
      "id": 1,
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user