overload pin definitions of ch59x to ch32 defs, add (untested) debugp…

…rintfdemo

ch32fun/ch32fun.h

@@ -841,15 +841,7 @@ extern "C" {
 #define GPIO_InverseBits(pin)     { if(pin & PB) GPIOB_InverseBits(pin); else GPIOA_InverseBits(pin); }
 #define funDigitalRead(pin)       ( (pin & PB) ? GPIOB_ReadPortPin(pin) : GPIOA_ReadPortPin(pin) )
 #define funDigitalWrite( pin, value ) { if(value==FUN_HIGH){GPIO_SetBits(pin);} else if(value==FUN_LOW){GPIO_ResetBits(pin);} }
-typedef enum
-{
-    GPIO_ModeIN_Floating,
-    GPIO_ModeIN_PU,
-    GPIO_ModeIN_PD,
-    GPIO_ModeOut_PP_5mA,
-    GPIO_ModeOut_PP_20mA,
 
-} GPIOModeTypeDef;
 #define GPIO_ModeCfg(pd_drv, pu, dir, pin, mode) { switch(mode) { \
 																										case GPIO_ModeIN_Floating: \
 																											pd_drv &= ~pin; pu &= ~pin; dir &= ~pin; break; \

ch32fun/ch59xhw.h

@@ -168,6 +168,11 @@ typedef enum
     CLK_SOURCE_PLL_24MHz = (0x40 | 20),
 } SYS_CLKTypeDef;
 
+// For debug writing to the debug interface.
+#define DMDATA0 			((vu32*)0xe0000380)
+#define DMDATA1 			((vu32*)0xe0000384)
+#define DMSTATUS_SENTINEL	((vu32*)0xe0000388)// Reads as 0x00000000 if debugger is attached.
+
 /* System: clock configuration register */
 #define R32_CLK_SYS_CFG     (*((vu32*)0x40001008)) // RWA, system clock configuration, SAM
 #define  RB_CLK_PLL_DIV     0x1F                      // RWA, output clock divider from PLL or CK32M
@@ -290,6 +295,26 @@ typedef enum
 #define PB23     (0x10800000) /*!< Pin 23 selected */
 #define P_All    (0xFFFFFFFF) /*!< All pins selected */
 
+typedef enum
+{
+    GPIO_ModeIN_Floating,
+    GPIO_ModeIN_PU,
+    GPIO_ModeIN_PD,
+    GPIO_ModeOut_PP_5mA,
+    GPIO_ModeOut_PP_20mA,
+} GPIOModeTypeDef;
+
+/* General Purpose I/O */
+typedef enum
+{
+	GPIO_CFGLR_IN_FLOAT = GPIO_ModeIN_Floating,
+	GPIO_CFGLR_IN_PUPD = GPIO_ModeIN_PU, // is most common
+	GPIO_CFGLR_IN_PU = GPIO_ModeIN_PU,
+	GPIO_CFGLR_IN_PD = GPIO_ModeIN_PD, // to suppress the -Wswitch warning
+	GPIO_CFGLR_OUT_10Mhz_PP = GPIO_ModeOut_PP_20mA,
+	GPIO_CFGLR_OUT_2Mhz_PP = GPIO_ModeOut_PP_5mA,
+	GPIO_CFGLR_OUT_50Mhz_PP = GPIO_ModeOut_PP_20mA,
+} GPIO_CFGLR_PIN_MODE_Typedef;
 
 #define HardFault_IRQn        EXC_IRQn
 

examples_ch59x/blink/blink.c

@@ -5,7 +5,7 @@ int main()
 {
 	SystemInit();
 
-	funPinMode( PA8, GPIO_ModeOut_PP_5mA );
+	funPinMode( PA8, GPIO_CFGLR_OUT_2Mhz_PP );
 
 	while(1)
 	{

examples_ch59x/blink/funconfig.h

@@ -5,7 +5,7 @@
 #define FUNCONF_USE_HSE         1
 #define FUNCONF_DEBUG_HARDFAULT 0
 #define FUNCONF_USE_CLK_SEC     0
-#define FUNCONF_USE_DEBUGPRINTF 0 // UART is not implemented yet
+#define FUNCONF_USE_DEBUGPRINTF 0 // saves 16 bytes, enable / remove if you want printf over swio
 #define FUNCONF_INIT_ANALOG     0 // ADC is not implemented yet
 
 #endif

examples_ch59x/debugprintfdemo/Makefile

@@ -0,0 +1,10 @@
+all : flash
+
+TARGET:=debugprintfdemo
+TARGET_MCU:=CH592
+TARGET_MCU_PACKAGE:=CH592F
+
+include ../../ch32fun/ch32fun.mk
+
+flash : cv_flash
+clean : cv_clean

examples_ch59x/debugprintfdemo/debugprintfdemo.c

@@ -0,0 +1,34 @@
+/* Small example showing how to use the SWIO programming pin to 
+   do printf through the debug interface */
+
+#include "ch32fun.h"
+#include <stdio.h>
+
+uint32_t count;
+
+int last = 0;
+void handle_debug_input( int numbytes, uint8_t * data )
+{
+	last = data[0];
+	count += numbytes;
+}
+
+int main()
+{
+	SystemInit();
+
+	funPinMode( PA8, GPIO_CFGLR_OUT_10Mhz_PP );
+
+	while(1)
+	{
+		funDigitalWrite( PA8, FUN_LOW ); // Turn on LED
+		printf( "+%lu\n", count++ );
+		Delay_Ms(100);
+		int i;
+		for( i = 0; i < 10000; i++ )
+			poll_input();
+		funDigitalWrite( PA8, FUN_HIGH ); // Turn off LED
+		printf( "-%lu[%c]\n", count++, last );
+		Delay_Ms(100);
+	}
+}

examples_ch59x/debugprintfdemo/funconfig.h

@@ -0,0 +1,10 @@
+#ifndef _FUNCONFIG_H
+#define _FUNCONFIG_H
+
+#define FUNCONF_USE_HSI         0 // CH592 does not have HSI
+#define FUNCONF_USE_HSE         1
+#define FUNCONF_DEBUG_HARDFAULT 0
+#define FUNCONF_USE_CLK_SEC     0
+#define FUNCONF_INIT_ANALOG     0 // ADC is not implemented yet
+
+#endif