コミット: 253 - kmbasic (svn)

BASIC compiler/interpreter for PIC32MX/MZ-80K (suspended)

コミットメタ情報

• リビジョン: 253 (tree)
• 日時: 2018-07-08 10:18:42
• 作者: kmorimatsu

ログメッセージ

Initialize music at start up for avoiding noise when starting a program.

変更サマリ

• modified: mips/branches/megalopa/debug.c
• modified: mips/branches/megalopa/main.c
• modified: mips/branches/megalopa/music.c
• modified: mips/branches/megalopa/run.c

差分

--- mips/branches/megalopa/debug.c	(revision 252)
+++ mips/branches/megalopa/debug.c	(revision 253)
@@ -61,8 +61,6 @@
 
 	printstr("BASIC "BASVER"\n");
 	wait60thsec(15);
-	// Initialize music
-	init_music();
 
 	printstr("Compiling...");
 

--- mips/branches/megalopa/main.c	(revision 252)
+++ mips/branches/megalopa/main.c	(revision 253)
@@ -234,7 +234,8 @@
 	}
 	else printstr("OK\n");
 
-	wait60thsec(60); //1秒待ち
+//	wait60thsec(60); //1秒待ち
+	init_music(); // 音源初期化（所要時間、約2秒）
 
 	// 実行中HEXファイル名がHEXFILEと一致した場合はエディタ起動
 	appname=(char*)FILENAME_FLASH_ADDRESS;

--- mips/branches/megalopa/music.c	(revision 252)
+++ mips/branches/megalopa/music.c	(revision 253)
@@ -326,28 +326,38 @@
 }
 
 void init_music(){
+	int i,t;
 	stop_music();
 
-	// Timer3 for PWM
-	PR3=0x100;
-	T3CON=0x0000; // Not yet started
-	TMR3=0;
-
 	// OC4 setting
 	RPF5R = 0x0b;    //Use RPF5 for OC4
 	OC4R=0x00;
-	OC4RS=0x80;
+//	OC4RS=0x80;
+	if (OC4RS&0xff00) OC4RS=0x00;
 	OC4CON=0x000e;
 	OC4CONSET=0x8000;
 	// OC3 setting
 	RPF4R = 0x0b;    //Use RPF4 for OC3
 	OC3R=0x00;
-	OC3RS=0x80;
+//	OC3RS=0x80;
+	if (OC3RS&0xff00) OC3RS=0x00;
 	OC3CON=0x000e;
 	OC3CONSET=0x8000;
 
-	// Start timer 3
-	T3CONSET=0x8000;
+	// Timer3 for PWM
+	PR3=0x100;
+	TMR3=0;
+	T3CON=0x8000;
+
+	// Move OC4RS and OC3 RS from 0x00 to 0x80
+	if (OC3RS==0 || OC4RS==0) {
+		for(i=0;i<=(0x80<<10);i++){
+			asm(WAIT);
+			OC4RS=OC3RS=i>>10;
+			//t=TMR3;
+			//while(t<=TMR3);
+		}
+	}
 }
 
 void musicSetL(){

--- mips/branches/megalopa/run.c	(revision 252)
+++ mips/branches/megalopa/run.c	(revision 253)
@@ -73,12 +73,13 @@
 	g_long_name_var_num=0;
 	cmpdata_init();
 
+	// Initialize music system
+	init_music();
+
 	printstr("BASIC "BASVER"\n");
 	wait60thsec(15);
 	// Initialize environment
 	init_env();
-	// Initialize music system
-	init_music();
 
 	printstr("Compiling...");