Cleanup unused code

speeduino · Apr 19, 2024 · fe6238d · fe6238d
1 parent 25e01c5
commit fe6238d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 67 deletions.
diff --git a/UI/index.html b/UI/index.html
@@ -77,7 +77,7 @@
 					<div class="row">
 						<div class="col-5">RPM Sweep speed: </div>
 						<div class="col-2">
-							<input type="range" id="rpmSweepSpeed" min="100" max="8000" step="10" value="5000" onChange="setSweepRPM()" disabled>
+							<input type="range" id="rpmSweepSpeed" min="200" max="4000" step="10" value="3000" onChange="setSweepRPM()" disabled>
 						</div>
 					</div>
                     <div>

diff --git a/ardustim/ardustim/ardustim.h b/ardustim/ardustim/ardustim.h
@@ -22,14 +22,12 @@
 #define __ARDUSTIM_H__
 
 #include <stdint.h>
-#include "structures.h"
 #include <Arduino.h>
 
 /* Structures */
 
 /* Prototypes */
 int check_and_adjust_tcnt_limits(uint32_t *, uint32_t *);  
-sweep_step * build_sweep_steps(uint32_t *, uint32_t *, uint8_t *);
 void reset_new_OCR1A(uint32_t);
 uint8_t get_bitshift_from_prescaler(uint8_t *);
 void get_prescaler_bits(uint32_t *, uint8_t *, uint8_t *);

diff --git a/ardustim/ardustim/ardustim.ino b/ardustim/ardustim/ardustim.ino
@@ -252,8 +252,6 @@ ISR(ADC_vect){
 
 /* Pumps the pattern out of flash to the port 
  * The rate at which this runs is dependent on what OCR1A is set to
- * the sweeper in timer2 alters this on the fly to alow changing of RPM
- * in a very nice way
  */
 ISR(TIMER1_COMPA_vect) {
   /* This is VERY simple, just walk the array and wrap when we hit the limit */

diff --git a/ardustim/ardustim/comms.cpp b/ardustim/ardustim/comms.cpp
@@ -23,7 +23,6 @@
 #include "ardustim.h"
 #include "enums.h"
 #include "comms.h"
-#include "structures.h"
 #include "storage.h"
 #include "wheel_defs.h"
 #include <avr/pgmspace.h>
@@ -85,6 +84,7 @@ void commandParser()
       break;
 
     case 'C': //Send the current config
+      sizeof(config);
 
       break;
 
@@ -123,7 +123,7 @@ void commandParser()
 
     case 'P': //Send the pattern for the current wheel
       numTeeth = pgm_read_word(Wheels[selected_wheel].wheel_max_edges);
-      //PROGMEM_readAnything (&table[i], thisOne);
+
       for(uint16_t x=0; x<Wheels[selected_wheel].wheel_max_edges; x++)
       {
         if(x != 0) { Serial.print(","); }

diff --git a/ardustim/ardustim/globals.h b/ardustim/ardustim/globals.h
@@ -35,4 +35,15 @@ struct configTable {
 };
 extern struct configTable config;
 
+/* Tie things wheel related into one nicer structure ... */
+typedef struct _wheels wheels;
+struct _wheels {
+  const char *decoder_name PROGMEM;
+  const unsigned char *edge_states_ptr PROGMEM;
+  const float rpm_scaler;
+  //const uint16_t rpm_scaler;
+  const uint16_t wheel_max_edges;
+  const uint16_t wheel_degrees;
+};
+
 #endif
diff --git a/ardustim/ardustim/structures.h b/ardustim/ardustim/structures.h