PulseChannel fix bug.

miochen1226 · Oct 11, 2023 · edca5ba · edca5ba
1 parent 60fa719
commit edca5ba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/NES_EMU.xcodeproj/project.pbxproj b/NES_EMU.xcodeproj/project.pbxproj
@@ -763,7 +763,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 82Q375NBS9;
 				ENABLE_PREVIEWS = YES;
 				GCC_OPTIMIZATION_LEVEL = 3;
@@ -791,7 +791,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 82Q375NBS9;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = iOS/Info.plist;

diff --git a/...U.xcodeproj/project.xcworkspace/xcuserdata/mio.xcuserdatad/UserInterfaceState.xcuserstate b/...U.xcodeproj/project.xcworkspace/xcuserdata/mio.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Shared/NES/Apu/Channel/PulseChannel.swift b/Shared/NES/Apu/Channel/PulseChannel.swift
@@ -52,16 +52,9 @@ class PulseChannel:BaseChannel {
         lengthCounter.setHalt(l)
         volumeEnvelope.setLoop(l)
 
-        if c {
-            volumeEnvelope.setConstantVolumeMode(true)
-            volumeEnvelope.setConstantVolume(UInt16(vvvv))
-            //print("volumeEnvelope c true->" + String(vvvv))
-        }
-        else {
-            volumeEnvelope.setConstantVolumeMode(false)
-            volumeEnvelope.setCounter(UInt16(vvvv))
-            volumeEnvelope.restart()
-        }
+        volumeEnvelope.setConstantVolumeMode(c)
+        volumeEnvelope.setConstantVolume(UInt16(vvvv))
+        volumeEnvelope.setCounter(UInt16(vvvv))
     }
 
     func handle40014005(cpuAddress:UInt16, value: UInt8) {
@@ -87,11 +80,11 @@ class PulseChannel:BaseChannel {
         let SSS = readBits8( target:BITS([0,1,2]),value:value)
         sweepUnit.setShiftCount(SSS)
 
-        //sweepUnit.restart()
+        // Side effect
+        sweepUnit.restart()
     }
 
-    func handle40024006(cpuAddress:UInt16, value:UInt8)
-    {
+    func handle40024006(cpuAddress:UInt16, value:UInt8) {
         //LLLL.LLLL
         //LLLLLLLL
         //timer 的低 8 位（一共 11 位，用于将 cpu 二分频后的时钟继续分频）
@@ -111,7 +104,8 @@ class PulseChannel:BaseChannel {
         let LLLL = readBits8( target:BITS([3,4,5,6,7]),value:value) >> 3
         lengthCounter.loadCounterFromLUT(LLLL)
 
-        //volumeEnvelope.restart()
+        // Side effects...
+        volumeEnvelope.restart()
         pulseWaveGenerator.restart()
     }
 

diff --git a/Shared/NES/Apu/Channel/TriangleChannel.swift b/Shared/NES/Apu/Channel/TriangleChannel.swift
@@ -52,6 +52,7 @@ class TriangleChannel: BaseChannel {
         case 0x400B:
             let period = readBits8(target: 0x7, value: value)
             timer.setPeriodHigh3(UInt16(period))
+            // Side effect
             linearCounter.restart()
             lengthCounter.loadCounterFromLUT(value >> 3)
             break