add board yehuo-f103-znz

Author: hitsmaxft

Makefile

@@ -130,6 +130,7 @@ generic-pe5: begin clean gccversion build_generic-pe5 sizeafter finished  copy_g
 generic-pe5-button-pa0: begin clean gccversion build_generic-pe5-button-pa0 sizeafter finished  copy_generic-pe5-button-pa0 end
 generic-pb7: begin clean gccversion build_generic-pb7 sizeafter finished  copy_generic-pb7 end
 generic-pb0: begin clean gccversion build_generic-pb0 sizeafter finished  copy_generic-pb0 end
+yehuo-znz: begin clean gccversion build_yehuo-znz sizeafter finished  copy_yehuo-znz end
 stbee :  begin clean gccversion build_stbee sizeafter finished  copy_stbee end
 naze32: begin clean gccversion build_naze32 sizeafter finished  copy_naze32 end
 generic-pb12: begin clean gccversion build_generic-pb12 sizeafter finished  copy_generic-pb12 end
@@ -329,6 +330,17 @@ copy_generic-pb7:
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pb7.bin
 	@echo
 
+build_yehuo-znz: TARGETFLAGS= -DTARGET_YEHUO_F103_ZNZ $(DEFINES)
+# Set the linker script
+build_yehuo-znz: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
+build_yehuo-znz: elf bin lss sym
+copy_yehuo-znz:
+	@echo
+	@echo "Copying to binaries folder"
+	@echo
+	cp $(TARGET).bin bootloader_only_binaries/yehuo_boot20_znz.bin
+	@echo
+
 build_generic-pb0: TARGETFLAGS= -DTARGET_GENERIC_F103_PB0 $(DEFINES)
 # Set the linker script
 build_generic-pb0: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld

bootloader_only_binaries/yehuo_boot20_znz.bin

@@ -34,6 +34,7 @@
 #define __CONFIG_H
 
 #include "common.h"
+#include <stdint.h>
 
 
 
@@ -97,7 +98,7 @@
     #define HAS_MAPLE_HARDWARE 1
 
     #define LED_BANK         GPIOB
-    #define LED_PIN          1
+    #define LED_PIN          0
     #define LED_ON_STATE     1
 
     /* On the Mini, BUT is PB8 */
@@ -159,7 +160,7 @@
     #define BUTTON_BANK GPIOB
     #define BUTTON_PIN 2
     #define BUTTON_PRESSED_STATE 1
-	
+
 #elif defined TARGET_GENERIC_F103_PC13_FASTBOOT
 
 
@@ -284,11 +285,21 @@
 
 #elif defined TARGET_GENERIC_F103_PB0
 
-    #define LED_BANK            GPIOB
-    #define LED_PIN         0
-    #define LED_ON_STATE        1
+    #define LED_BANK		GPIOB
+    #define LED_PIN			0
+    #define LED_ON_STATE	1
     #define BOOTLOADER_WAIT 30
 
+#elif defined TARGET_YEHUO_F103_ZNZ
+
+    #define LED_BANK        GPIOB
+    #define LED_PIN         0
+    #define LED_ON_STATE    0
+    #define BOOTLOADER_WAIT 3
+    #define USB_EN_BANK     GPIOD
+    #define USB_EN_PIN      6
+    #define USB_EN_ON_STATE 0
+
 #elif defined TARGET_STBEE
 
     #define HAS_MAPLE_HARDWARE  1
@@ -411,7 +422,7 @@
     #error "No config for this target"
 #endif
 
-// Check if button pulldown should be enabled 
+// Check if button pulldown should be enabled
 // Default to True as this was the default prior to needing to disable it
 // in order to use the boot1 pin on the Blue Pill which has a very week pullup
 #ifndef BUTTON_INPUT_MODE

config.h

@@ -31,14 +31,34 @@
  */
 
 #include "usb.h"
+
 #include "dfu.h"
+#include "hardware.h"
+
+u16 wTransferSize;
 
 
 extern u8 u8_usbConfigDescriptorDFU[];
 extern u8 u8_usbFunctionalDescriptor[];
 
+void setupUSBEnable(void) {
+#   ifdef USB_EN_PIN
+
+    //for znz
+    SET_REG(
+            GPIO_CR(USB_EN_BANK, USB_EN_PIN),
+            (GET_REG(GPIO_CR(USB_EN_BANK,USB_EN_PIN)) & crMask(USB_EN_PIN)) | CR_OUTPUT_PP << CR_SHITF(USB_EN_PIN)
+        );
+
+    gpio_write_bit(USB_EN_BANK, USB_EN_PIN, USB_EN_ON_STATE);
+#   endif
+}
+
+
 void setupUSB (void) {
 
+    setupUSBEnable();
+
 #ifdef HAS_MAPLE_HARDWARE
     /* Setup USB DISC pin as output open drain */
     SET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC_PIN),(GET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC_PIN)) & crMask(USB_DISC_PIN)) | CR_OUTPUT_OD << CR_SHITF(USB_DISC_PIN));
@@ -56,6 +76,7 @@ void setupUSB (void) {
 
     SET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC_PIN),(GET_REG(GPIO_CR(USB_DISC_BANK,USB_DISC_PIN)) & crMask(USB_DISC_PIN)) | CR_OUTPUT_PP << CR_SHITF(USB_DISC_PIN));
 
+
     gpio_write_bit(USB_DISC_BANK,USB_DISC_PIN,0);  /* present ourselves to the host */
 
     volatile unsigned int delay;

usb.c

@@ -39,9 +39,11 @@
 #define ENDP3_RXADDR    0x110
 
 #define bMaxPacketSize  0x40    /* 64B,  maximum for usb FS devices */
-//#define wTransferSize   FLASH_PAGE_SIZE  /* This is important, because transfers have to match with the flash page size, otherwise it erases a page before its finished copying to that page */
+
+//#define wTransferSize   ((uint16_t)0x800)
+/* This is important, because transfers have to match with the flash page size, otherwise it erases a page before its finished copying to that page */
 #define dummyTransferSize 0x800
-int wTransferSize;
+extern u16 wTransferSize;
 
 #define NUM_ENDPTS      0x01
 
@@ -79,6 +81,9 @@ typedef enum _DEVICE_STATE {
 } DEVICE_STATE;
 
 void setupUSB(void);
+
+void setupUSBEnable(void);
+
 void usbDsbBus(void);
 void usbAppInit(void); /* singleton usb initializer */
 
@@ -134,4 +139,4 @@ void USB_LP_CAN1_RX0_IRQHandler(void);
 
 void nothingProc(void);
 
-#endif
+#endif //USB_H