Add dynamic compression amplitude

speeduino · May 16, 2024 · fe6cd5c · fe6cd5c
1 parent 207c606
commit fe6cd5c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/UI/assets/css/main.css b/UI/assets/css/main.css
@@ -718,8 +718,8 @@ input, select, textarea {
 	hr {
 		border: 0;
 		border-top: solid 1px #ddd;
-		padding: 1.5em 0 0 0;
-		margin: 1.75em 0 0 0;
+		padding: 0.5em 0 0 0;
+		margin: 0.75em 0 0 0;
 	}
 
 	sub {

diff --git a/UI/index.html b/UI/index.html
@@ -64,7 +64,7 @@
 									</div>
 								</div>
 								<div class="row">
-									<div class="col-5">RPM Sweep range: </div>
+									<div class="col-5">Sweep range: </div>
 									<div class="col-3">
 										<input type="number" id="rpmSweepMin" min="0" max="10000" step="1" value="100" onChange="sendConfig()" disabled>
 									</div>
@@ -74,17 +74,24 @@
 									</div>
 								</div>
 								<div class="row">
-									<div class="col-5">RPM Sweep speed: </div>
+									<div class="col-5">Sweep speed: </div>
 									<div class="col-2">
 										<input type="range" id="rpmSweepSpeed" min="200" max="4000" step="10" value="3000" onChange="sendConfig()" disabled>
 									</div>
 								</div>
+								<hr />
 								<div class="row">
 									<div class="col-7"><span class="tooltip">Enable compression: <span class="tooltiptext">When Enabled, this simulates RPM 'waves' that are common during cranking as each cylinder compresses. The effect will only be active below a set RPM value</span></span></div>
 									<div class="col-2">
 										<input type="checkbox" id="compressionEnable" onChange="toggleCompression()">
 									</div>
 								</div>
+								<div class="row">
+									<div class="col-7"><span class="tooltip">Dynamic amplitude: <span class="tooltiptext">When Enabled, the amplitude of the waves will change based on how far the RPM is below the compression RPM setting. If disabled, the wave amplitude will always be 100rpm</span></span></div>
+									<div class="col-2">
+										<input type="checkbox" id="compressionDynamic" onChange="sendConfig()" disabled>
+									</div>
+								</div>
 								<div class="row">
 									<div class="col-7">Configuration: </div>
 									<div class="col-2">

diff --git a/UI/renderer.js b/UI/renderer.js
@@ -6,7 +6,7 @@ const ByteLengthParser = require('@serialport/parser-byte-length')
 const {ipcRenderer} = require("electron")
 var port = new serialport('/dev/tty-usbserial1', { autoOpen: false })
 
-const CONFIG_SIZE = 17;
+const CONFIG_SIZE = 18;
 var onConnectIntervalConfig;
 var onConnectIntervalWheels;
 var isConnected=false;
@@ -236,6 +236,7 @@ function receiveConfig(data)
   document.getElementById("compressionMode").value = data[12];
   document.getElementById("compressionRPM").value = (((data[14] & 0xff) << 8) | (data[13] & 0xff));
   document.getElementById("compressionOffset").value = (((data[16] & 0xff) << 8) | (data[15] & 0xff));
+  document.getElementById("compressionDynamic").value = data[17];
 
   port.unpipe();
 
@@ -260,6 +261,7 @@ function sendConfig()
   configBuffer[12] = parseInt(document.getElementById('compressionMode').value);
   configBuffer.writeUInt16LE(parseInt(document.getElementById('compressionRPM').value), 13);
   configBuffer.writeUInt16LE(parseInt(document.getElementById('compressionOffset').value), 15);
+  configBuffer[16] = document.getElementById('compressionDynamic').checked;
 
   console.log("Sending full config: ", configBuffer);
 
@@ -568,6 +570,7 @@ function toggleCompression()
 {
   var state = document.getElementById('compressionEnable').checked
 
+  document.getElementById('compressionDynamic').disabled = !state
   document.getElementById('compressionMode').disabled = !state
   document.getElementById('compressionRPM').disabled = !state
   document.getElementById('compressionOffset').disabled = !state

diff --git a/ardustim/ardustim/ardustim.ino b/ardustim/ardustim/ardustim.ino
@@ -330,7 +330,7 @@ void loop()
 
 uint16_t calculateCompressionModifier()
 {
-  if( (currentStatus.rpm > config.compressionRPM) || (config.useCompression != true) ) { return 0; }
+  if( (currentStatus.base_rpm > config.compressionRPM) || (config.useCompression != true) ) { return 0; }
   //if( currentStatus.base_rpm > 400 ) { return 0;}
 
   uint16_t crankAngle = calculateCurrentCrankAngle();
@@ -359,6 +359,14 @@ uint16_t calculateCompressionModifier()
       compressionModifier = pgm_read_byte(&sin_100_180[modAngle]);
       break;
   }
+
+  //RPM scaler - Varies the amplitude of the compression modifier based on how far below the compression RPM point we are. Eg:
+  //If the compression RPM value is 400
+  //At 300rpm the amplitude will be 75%
+  //At 200rpm the amplitude will be 50%
+  //At 100rpm the amplitude will be 25% etc
+  //Base RPM must be below 650 to prevent overflow
+  if(config.compressionDynamic && (currentStatus.base_rpm < 655U) ) { compressionModifier = (compressionModifier * currentStatus.base_rpm) / config.compressionRPM; }
 
   return compressionModifier;
 }

diff --git a/ardustim/ardustim/globals.h b/ardustim/ardustim/globals.h
@@ -50,6 +50,7 @@ struct configTable
   uint8_t compressionType = 0;
   uint16_t compressionRPM = 400;
   uint16_t compressionOffset = 0;
+  bool compressionDynamic = false;
 } __attribute__ ((packed));
 extern struct configTable config;