Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						daa5afcf1d
					
				
					 21 changed files with 789 additions and 150 deletions
				
			
		| 
						 | 
				
			
			@ -1,89 +1,89 @@
 | 
			
		|||
{
 | 
			
		||||
    "development_board": {
 | 
			
		||||
        "promicro": {
 | 
			
		||||
            "processor": "atmega32u4",
 | 
			
		||||
            "bootloader": "caterina",
 | 
			
		||||
            "pin_compatible": "promicro"
 | 
			
		||||
        },
 | 
			
		||||
        "elite_c": {
 | 
			
		||||
            "processor": "atmega32u4",
 | 
			
		||||
            "bootloader": "atmel-dfu",
 | 
			
		||||
            "pin_compatible": "promicro"
 | 
			
		||||
        },
 | 
			
		||||
        "elite_pi": {
 | 
			
		||||
            "processor": "RP2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "board": "QMK_PM2040"
 | 
			
		||||
        },
 | 
			
		||||
        "proton_c": {
 | 
			
		||||
            "processor": "STM32F303",
 | 
			
		||||
            "bootloader": "stm32-dfu",
 | 
			
		||||
            "board": "QMK_PROTON_C"
 | 
			
		||||
        },
 | 
			
		||||
        "kb2040": {
 | 
			
		||||
            "processor": "RP2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "board": "QMK_PM2040"
 | 
			
		||||
        },
 | 
			
		||||
        "promicro_rp2040": {
 | 
			
		||||
            "processor": "RP2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "board": "QMK_PM2040"
 | 
			
		||||
        },
 | 
			
		||||
        "blok": {
 | 
			
		||||
            "processor": "RP2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "board": "QMK_BLOK"
 | 
			
		||||
        },
 | 
			
		||||
        "michi": {
 | 
			
		||||
            "processor": "RP2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "board": "QMK_PM2040"
 | 
			
		||||
        },
 | 
			
		||||
        "bit_c_pro": {
 | 
			
		||||
            "processor": "RP2040",
 | 
			
		||||
            "board": "QMK_PM2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "board": "QMK_PM2040"
 | 
			
		||||
        },
 | 
			
		||||
        "bluepill": {
 | 
			
		||||
            "processor": "STM32F103",
 | 
			
		||||
            "bootloader": "stm32duino",
 | 
			
		||||
            "board": "STM32_F103_STM32DUINO"
 | 
			
		||||
            "processor": "RP2040"
 | 
			
		||||
        },
 | 
			
		||||
        "blackpill_f401": {
 | 
			
		||||
            "processor": "STM32F401",
 | 
			
		||||
            "board": "BLACKPILL_STM32_F401",
 | 
			
		||||
            "bootloader": "stm32-dfu",
 | 
			
		||||
            "board": "BLACKPILL_STM32_F401"
 | 
			
		||||
            "processor": "STM32F401"
 | 
			
		||||
        },
 | 
			
		||||
        "blackpill_f411": {
 | 
			
		||||
            "processor": "STM32F411",
 | 
			
		||||
            "board": "BLACKPILL_STM32_F411",
 | 
			
		||||
            "bootloader": "stm32-dfu",
 | 
			
		||||
            "board": "BLACKPILL_STM32_F411"
 | 
			
		||||
            "processor": "STM32F411"
 | 
			
		||||
        },
 | 
			
		||||
        "stemcell": {
 | 
			
		||||
            "processor": "STM32F411",
 | 
			
		||||
            "bootloader": "tinyuf2",
 | 
			
		||||
            "board": "STEMCELL"
 | 
			
		||||
        "blok": {
 | 
			
		||||
            "board": "QMK_BLOK",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "processor": "RP2040"
 | 
			
		||||
        },
 | 
			
		||||
        "bluepill": {
 | 
			
		||||
            "board": "STM32_F103_STM32DUINO",
 | 
			
		||||
            "bootloader": "stm32duino",
 | 
			
		||||
            "processor": "STM32F103"
 | 
			
		||||
        },
 | 
			
		||||
        "bonsai_c4": {
 | 
			
		||||
            "processor": "STM32F411",
 | 
			
		||||
            "board": "BONSAI_C4",
 | 
			
		||||
            "bootloader": "stm32-dfu",
 | 
			
		||||
            "board": "BONSAI_C4"
 | 
			
		||||
            "processor": "STM32F411"
 | 
			
		||||
        },
 | 
			
		||||
        "elite_c": {
 | 
			
		||||
            "bootloader": "atmel-dfu",
 | 
			
		||||
            "pin_compatible": "promicro",
 | 
			
		||||
            "processor": "atmega32u4"
 | 
			
		||||
        },
 | 
			
		||||
        "elite_pi": {
 | 
			
		||||
            "board": "QMK_PM2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "processor": "RP2040"
 | 
			
		||||
        },
 | 
			
		||||
        "helios": {
 | 
			
		||||
            "processor": "RP2040",
 | 
			
		||||
            "board": "QMK_PM2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "board": "QMK_PM2040"
 | 
			
		||||
        },
 | 
			
		||||
        "liatris": {
 | 
			
		||||
            "processor": "RP2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "board": "QMK_PM2040"
 | 
			
		||||
            "processor": "RP2040"
 | 
			
		||||
        },
 | 
			
		||||
        "imera": {
 | 
			
		||||
            "processor": "RP2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "board": "QMK_PM2040"
 | 
			
		||||
        },
 | 
			
		||||
        "kb2040": {
 | 
			
		||||
            "board": "QMK_PM2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "processor": "RP2040"
 | 
			
		||||
        },
 | 
			
		||||
        "liatris": {
 | 
			
		||||
            "board": "QMK_PM2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "processor": "RP2040"
 | 
			
		||||
        },
 | 
			
		||||
        "michi": {
 | 
			
		||||
            "board": "QMK_PM2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "processor": "RP2040"
 | 
			
		||||
        },
 | 
			
		||||
        "promicro": {
 | 
			
		||||
            "bootloader": "caterina",
 | 
			
		||||
            "pin_compatible": "promicro",
 | 
			
		||||
            "processor": "atmega32u4"
 | 
			
		||||
        },
 | 
			
		||||
        "promicro_rp2040": {
 | 
			
		||||
            "board": "QMK_PM2040",
 | 
			
		||||
            "bootloader": "rp2040",
 | 
			
		||||
            "processor": "RP2040"
 | 
			
		||||
        },
 | 
			
		||||
        "proton_c": {
 | 
			
		||||
            "board": "QMK_PROTON_C",
 | 
			
		||||
            "bootloader": "stm32-dfu",
 | 
			
		||||
            "processor": "STM32F303"
 | 
			
		||||
        },
 | 
			
		||||
        "stemcell": {
 | 
			
		||||
            "board": "STEMCELL",
 | 
			
		||||
            "bootloader": "tinyuf2",
 | 
			
		||||
            "processor": "STM32F411"
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue