Get synced

Merge branch 'master' of github.com:emeb/ch32v003fun

examples/debugprintfdemo/debugprintfdemo.c

@@ -34,7 +34,6 @@ int main()
 		GPIOD->BSHR = (1<<16) | (1<<(16+4)); // Turn off GPIODs
 		GPIOC->BSHR = (1<<16);
 		printf( "-%lu\n", count++ );
-		count++;
 		//_write( 0, "xxxxxxx", 7 );
 	}
 }

examples/ws2812bdemo/ws2812bdemo.c

@@ -25,8 +25,8 @@ uint32_t WS2812BLEDCallback( int ledno )
 	uint8_t index = (phases[ledno])>>8;
 	uint8_t rsbase = sintable[index];
 	uint8_t rs = rsbase>>3;
-	uint32_t fire = (huetable[(rs+190)&0xff]<<16) | (huetable[(rs+30)&0xff]) | (huetable[(rs+0)]<<8);
-	uint32_t ice  = 0xff0000 | ((rsbase)<<8) | ((rsbase));
+	uint32_t fire = (huetable[(rs+190)&0xff]<<16) | (huetable[(rs+30)&0xff]) | ((huetable[(rs+0)]>>1)<<8);
+	uint32_t ice  = 0x7f0000 | ((rsbase>>1)<<8) | ((rsbase>>1));
 
 	// Because this chip doesn't natively support multiplies, we are going to avoid tweening of 1..254.
 	return TweenHexColors( fire, ice, ((tween + ledno)>0)?255:0 ); // Where "tween" is a value from 0 ... 255

minichlink/pgm-wch-linke.c

@@ -193,9 +193,10 @@ printf( "  5: %d\n", bOn );
 	return 0;
 }
 
-static int LEUnbrick( void * dev )
+static int LEUnbrick( void * d )
 {
 	printf( "Sending unbrick\n" );
+	libusb_device_handle * dev = ((struct LinkEProgrammerStruct*)d)->devh;
 	wch_link_command( (libusb_device_handle *)dev, "\x81\x0d\x01\x0f\x09", 5, 0, 0, 0 );
 	printf( "Done unbrick\n" );
 	return 0;