ExternalVendorCode/k3ng_rotator_controller
1
0
Fork 0
mirror of https://github.com/k3ng/k3ng_rotator_controller.git synced 2024-12-19 21:27:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2021.10.05.02

Browse Source 
Cleaned up code and pins files to remove az_stepper_motor_direction and el_stepper_motor_direction and throw a compiler error if either are defined.  (Use the rotate_* pins instead.)
        Reference: b36c5a1d4c
This commit is contained in:
Anthony Good 2021-10-05 20:44:53 -04:00
parent 7179f72516
commit a78deaf816
6 changed files with 15 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
k3ng_rotator_controller/k3ng_rotator_controller.ino
View File

@ -992,7 +992,11 @@
FEATURE_NEXTION_DISPLAY - Added code to watch for unexpected reset / 'i am alive' from Nextion
2021.10.05.01
DEBUG_ROTATOR - added code to traceback who called rotator()
DEBUG_ROTATOR - added code to traceback who called rotator()
2021.10.05.02
Cleaned up code and pins files to remove az_stepper_motor_direction and el_stepper_motor_direction and throw a compiler error if either are defined. (Use the rotate_* pins instead.)
Reference: https://github.com/k3ng/k3ng_rotator_controller/commit/b36c5a1d4c2cf21fe342d5c07ded6093adf71503
All library files should be placed in directories likes \sketchbook\libraries\library1\ , \sketchbook\libraries\library2\ , etc.
Anything rotator_*.* should be in the ino directory!
@ -1007,7 +1011,7 @@
*/
#define CODE_VERSION "2021.10.05.01"
#define CODE_VERSION "2021.10.05.02"
#include <avr/pgmspace.h>
@ -1145,6 +1149,10 @@
#include "rotator_pins.h"
#endif
#if defined(az_stepper_motor_direction) || defined(el_stepper_motor_direction)
#error "az_stepper_motor_direction and el_stepper_motor_direction pins are not supported anymore. Use rotate_* pins instead."
#endif
#ifdef HARDWARE_EA4TX_ARS_USB
#include "rotator_settings_ea4tx_ars_usb.h"
#endif
@ -9771,23 +9779,6 @@ void rotator(byte rotation_action, byte rotation_type, byte traceback) {
if (rotate_cw_ccw){
digitalWriteEnhanced(rotate_cw_ccw, ROTATE_PIN_AZ_ACTIVE_VALUE);
}
/*
#ifdef FEATURE_STEPPER_MOTOR
if (az_stepper_motor_direction){
if (configuration.az_stepper_motor_last_direction != STEPPER_CCW){
if (configuration.az_stepper_motor_last_pin_state == LOW){
digitalWriteEnhanced(az_stepper_motor_direction,HIGH);
configuration.az_stepper_motor_last_pin_state = HIGH;
} else {
digitalWriteEnhanced(az_stepper_motor_direction,LOW);
configuration.az_stepper_motor_last_pin_state = LOW;
}
configuration.az_stepper_motor_last_direction = STEPPER_CCW;
configuration_dirty = 1;
}
}
#endif //FEATURE_STEPPER_MOTOR
*/
#ifdef DEBUG_ROTATOR
if (debug_mode) {
debug.print(F(" normal_az_speed_voltage:"));
@ -9890,24 +9881,7 @@ void rotator(byte rotation_action, byte rotation_type, byte traceback) {
}
if (rotate_up_or_down) {
digitalWriteEnhanced(rotate_up_or_down, ROTATE_PIN_EL_ACTIVE_VALUE);
}
/*
#ifdef FEATURE_STEPPER_MOTOR
if (el_stepper_motor_direction){
if (configuration.el_stepper_motor_last_direction != STEPPER_UP){
if (configuration.el_stepper_motor_last_pin_state == LOW){
digitalWriteEnhanced(el_stepper_motor_direction,HIGH);
configuration.el_stepper_motor_last_pin_state = HIGH;
} else {
digitalWriteEnhanced(el_stepper_motor_direction,LOW);
configuration.el_stepper_motor_last_pin_state = LOW;
}
configuration.el_stepper_motor_last_direction = STEPPER_UP;
configuration_dirty = 1;
}
}
#endif //FEATURE_STEPPER_MOTOR
*/
}
} else {
#ifdef DEBUG_ROTATOR
if (debug_mode) {
@ -10013,24 +9987,7 @@ void rotator(byte rotation_action, byte rotation_type, byte traceback) {
}
if (rotate_up_or_down) {
digitalWriteEnhanced(rotate_up_or_down, ROTATE_PIN_EL_ACTIVE_VALUE);
}
/*
#ifdef FEATURE_STEPPER_MOTOR
if (el_stepper_motor_direction){
if (configuration.el_stepper_motor_last_direction != STEPPER_DOWN){
if (configuration.el_stepper_motor_last_pin_state == LOW){
digitalWriteEnhanced(el_stepper_motor_direction,HIGH);
configuration.el_stepper_motor_last_pin_state = HIGH;
} else {
digitalWriteEnhanced(el_stepper_motor_direction,LOW);
configuration.el_stepper_motor_last_pin_state = LOW;
}
configuration.el_stepper_motor_last_direction = STEPPER_DOWN;
configuration_dirty = 1;
}
}
#endif //FEATURE_STEPPER_MOTOR
*/
}
} else {
#ifdef DEBUG_ROTATOR
if (debug_mode) {
@ -10400,24 +10357,12 @@ void initialize_pins(){
pinModeEnhanced(az_stepper_motor_pulse, OUTPUT);
digitalWriteEnhanced(az_stepper_motor_pulse, HIGH);
}
/*
if (az_stepper_motor_direction){
pinModeEnhanced(az_stepper_motor_direction, OUTPUT);
digitalWriteEnhanced(az_stepper_motor_direction, configuration.az_stepper_motor_last_pin_state);
}
*/
#ifdef FEATURE_ELEVATION_CONTROL
if (el_stepper_motor_pulse){
pinModeEnhanced(el_stepper_motor_pulse, OUTPUT);
digitalWriteEnhanced(el_stepper_motor_pulse, HIGH);
}
/*
if (el_stepper_motor_direction){
pinModeEnhanced(el_stepper_motor_direction, OUTPUT);
digitalWriteEnhanced(el_stepper_motor_direction, configuration.el_stepper_motor_last_pin_state);
}
*/
#endif //FEATURE_ELEVATION_CONTROL
#endif //FEATURE_STEPPER_MOTOR

2
k3ng_rotator_controller/rotator_dependencies.h
View File

@ -147,3 +147,5 @@
#endif

3
k3ng_rotator_controller/rotator_pins.h
View File

@ -31,8 +31,7 @@
#define button_stop 0 // connect to momentary switch (ground on button press) for preset stop (set to 0 to disable or for preset automatic start)
#define rotation_indication_pin 0
#define blink_led 0
#define az_stepper_motor_pulse 44 //0
#define az_stepper_motor_direction 0
#define az_stepper_motor_pulse 0
#define az_rotation_stall_detected 0

2
k3ng_rotator_controller/rotator_pins_m0upu.h
View File

@ -29,7 +29,6 @@
#define button_stop 0 // connect to momentary switch (ground on button press) for preset stop (set to 0 to disable or for preset automatic start)
#define rotation_indication_pin 0
#define az_stepper_motor_pulse 0
#define az_stepper_motor_direction 0
#define az_rotation_stall_detected 0
@ -49,7 +48,6 @@
#define button_down 0 // normally open button to ground for manual down rotation
#define brake_el 0 // goes high to disengage elevation brake (set to 0 to disable)
#define el_stepper_motor_pulse 0
#define el_stepper_motor_direction 0
#define el_rotation_stall_detected 0
#endif //FEATURE_ELEVATION_CONTROL

2
k3ng_rotator_controller/rotator_pins_test.h
View File

@ -39,7 +39,6 @@
#define rotation_indication_pin 0
#define blink_led 0
#define az_stepper_motor_pulse 0
#define az_stepper_motor_direction 0
#define az_rotation_stall_detected 0
@ -59,7 +58,6 @@
#define button_down 45 // normally open button to ground for manual down rotation
#define brake_el 0 // goes high to disengage elevation brake (set to 0 to disable)
#define el_stepper_motor_pulse 0
#define el_stepper_motor_direction 0
#define el_rotation_stall_detected 0
#endif //FEATURE_ELEVATION_CONTROL

2
k3ng_rotator_controller/rotator_pins_wb6kcn_az_test_setup.h
View File

@ -37,7 +37,6 @@
#define rotation_indication_pin 47
#define blink_led 0
#define az_stepper_motor_pulse 29 //33 //0
#define az_stepper_motor_direction 0//31 //37
/*----------- elevation pins --------------*/
@ -56,7 +55,6 @@
#define brake_el 0 // goes high to disengage elevation brake (set to 0 to disable)
#define elevation_speed_voltage 0 // optional - PWM output for speed control voltage feed into rotator (on continually unlike rotate_up_pwm and rotate_down_pwm)
#define el_stepper_motor_pulse 33 //29 //0 //29
#define el_stepper_motor_direction 37 //31 //0 //31
#endif //FEATURE_ELEVATION_CONTROL
// rotary encoder pins and options