File tree Expand file tree Collapse file tree 3 files changed +7
-9
lines changed
Spectral BLDC Firmware/src Expand file tree Collapse file tree 3 files changed +7
-9
lines changed Original file line number Diff line number Diff line change @@ -88,8 +88,6 @@ typedef struct
88
88
volatile float flux_linkage = 0 ; // Flux linkage of your BLDC motor
89
89
volatile float KV = 0 ;
90
90
91
- volatile int Termistor_on_off = 0 ; // 0 is off 1 is on
92
-
93
91
volatile int Max_temperature = 75 ; // Max temperature in degrees
94
92
volatile int Min_temperature = -20 ; // Min temperature in degrees
95
93
Original file line number Diff line number Diff line change @@ -481,7 +481,7 @@ void UART_protocol(Stream &Serialport)
481
481
else if (strcmp (command, " Temp" ) == 0 )
482
482
{
483
483
Serialport.print (" Temp " );
484
- if (controller.Termistor_on_off == 1 )
484
+ if (controller.Thermistor_on_off == 1 )
485
485
{
486
486
Serialport.println (controller.TEMP_DEG );
487
487
}
@@ -499,15 +499,15 @@ void UART_protocol(Stream &Serialport)
499
499
int var = atoi (argument);
500
500
if (var >= 1 )
501
501
{
502
- controller.Termistor_on_off = 1 ;
502
+ controller.Thermistor_on_off = 1 ;
503
503
}
504
504
else
505
505
{
506
- controller.Termistor_on_off = 0 ;
506
+ controller.Thermistor_on_off = 0 ;
507
507
}
508
508
}
509
509
Serialport.print (" Term " );
510
- Serialport.println (controller.Termistor_on_off );
510
+ Serialport.println (controller.Thermistor_on_off );
511
511
}
512
512
513
513
// Print controller mode
Original file line number Diff line number Diff line change @@ -160,7 +160,7 @@ void IT_callback(void)
160
160
#endif
161
161
162
162
/* Sample temperature every 15000 ticks; If enabled*/
163
- if (controller.Termistor_on_off == 1 )
163
+ if (controller.Thermistor_on_off == 1 )
164
164
{
165
165
static int temperature_tick = 0 ;
166
166
if (temperature_tick >= 15000 )
@@ -202,7 +202,7 @@ void IT_callback(void)
202
202
/* Check for errors, If errors are present go idle */
203
203
204
204
// / Check termistor
205
- if (controller.Termistor_on_off == 1 )
205
+ if (controller.Thermistor_on_off == 1 )
206
206
{
207
207
if (controller.TEMP_DEG < controller.Min_temperature || controller.TEMP_DEG > controller.Max_temperature )
208
208
{
@@ -1812,7 +1812,7 @@ void Gripper_mode()
1812
1812
PID.Velocity_setpoint = -vel_sepoint;
1813
1813
}
1814
1814
1815
- if (Gripper.action_status == 1 && Gripper.calibrated == 1 && Gripper.activated == 1 ) // if it is goto
1815
+ if (Gripper.action_status == 1 && Gripper.calibrated == 1 && Gripper.activated == 1 && controller. I_AM_GRIPPER == 1 ) // if it is goto
1816
1816
{
1817
1817
// If our gripper is at the requested positon hold that position
1818
1818
if (Gripper.position_setpoint == Gripper.position || Gripper.At_position == 1 )
You can’t perform that action at this time.
0 commit comments