diff --git a/README.md b/README.md index a8b5d8a..c233cd2 100644 --- a/README.md +++ b/README.md @@ -412,7 +412,7 @@ Included below is the default system setup defines of the Dual-Axis Tracking exa #define SETUP_EXTDATA_EEPROM_ENABLE false // If data should be read from an external EEPROM (searched first for strings data) // External EEPROM Settings -#define SETUP_EEPROM_SYSDATA_ADDR 0x2e50 // System data memory offset for EEPROM saves (from Data Writer output) +#define SETUP_EEPROM_SYSDATA_ADDR 0x1111 // System data memory offset for EEPROM saves (from Data Writer output) #define SETUP_EEPROM_STRINGS_ADDR 0x0000 // Start address for strings data (from Data Writer output) // Device Setup @@ -480,6 +480,7 @@ Included below is the default system setup defines of the Dual-Axis Tracking exa #define SETUP_PANEL_OFFSET {0.0f,0.0f} // Panel axis alignment offset (azi,ele or RA,dec) #define SETUP_PANEL_HEATER_TEMP 0 // Temperature at which panel heaters are engaged (if using temp sensor), in Celsius #define SETUP_PANEL_STORMING_SPEED 500 // Wind speed at which storming mode is engaged (if using wind sensor), in m/min +#define SETUP_LINACT_TRAVEL_SPEED 1.0/0.5 // The base continuous linear actuator travel speed, in m/min. #define SETUP_PANEL_TILT_AXIS1_SCALE 0,0 , 1,90 // Ele/dec axis panel tilt angle sensor scaling parameters used for angle calibration (passed to setFromTwoPoints), from raw into degrees #define SETUP_POS_SERVO_MINMAX_ANGLE -90, 90 // Axial positional servo min,max angle range used for angle calibration (passed to setFromServo), in degrees #define SETUP_WIND_SPEED_SENSOR_SCALE 0.08,0 , 0.4,0.54 // Wind speed sensor scaling parameters used for speed calibration (passed to setFromTwoPoints), from raw into m/min @@ -505,7 +506,7 @@ In serial monitor (near end): 2023-02-07T04:24:27 [INFO] Total EEPROM usage: 11856 bytes 2023-02-07T04:24:27 [INFO] EEPROM capacity used: 36.18% of 32768 bytes 2023-02-07T04:24:27 [INFO] Use the following EEPROM setup defines in your sketch: -#define SETUP_EEPROM_SYSDATA_ADDR 0x2e50 +#define SETUP_EEPROM_SYSDATA_ADDR 0x1111 #define SETUP_EEPROM_STRINGS_ADDR 0x0000 2023-02-07T04:24:27 [INFO] Done! ``` diff --git a/examples/DATracking/DATracking.ino b/examples/DATracking/DATracking.ino index 55cc854..65cd50c 100644 --- a/examples/DATracking/DATracking.ino +++ b/examples/DATracking/DATracking.ino @@ -86,7 +86,7 @@ SoftwareSerial SWSerial(RX, TX); // Replace with Rx/Tx pi #define SETUP_EXTDATA_EEPROM_ENABLE false // If data should be read from an external EEPROM (searched first for strings data) // External EEPROM Settings -#define SETUP_EEPROM_SYSDATA_ADDR 0x2e50 // System data memory offset for EEPROM saves (from Data Writer output) +#define SETUP_EEPROM_SYSDATA_ADDR 0x1111 // System data memory offset for EEPROM saves (from Data Writer output) #define SETUP_EEPROM_STRINGS_ADDR 0x0000 // Start address for strings data (from Data Writer output) // Device Setup @@ -154,6 +154,7 @@ SoftwareSerial SWSerial(RX, TX); // Replace with Rx/Tx pi #define SETUP_PANEL_OFFSET {0.0f,0.0f} // Panel axis alignment offset (azi,ele or RA,dec) #define SETUP_PANEL_HEATER_TEMP 0 // Temperature at which panel heaters are engaged (if using temp sensor), in Celsius #define SETUP_PANEL_STORMING_SPEED 500 // Wind speed at which storming mode is engaged (if using wind sensor), in m/min +#define SETUP_LINACT_TRAVEL_SPEED 1.0/0.5 // The base continuous linear actuator travel speed, in m/min. #define SETUP_PANEL_TILT_AXIS1_SCALE 0,0 , 1,90 // Ele/dec axis panel tilt angle sensor scaling parameters used for angle calibration (passed to setFromTwoPoints), from raw into degrees #define SETUP_POS_SERVO_MINMAX_ANGLE -90, 90 // Axial positional servo min,max angle range used for angle calibration (passed to setFromServo), in degrees #define SETUP_WIND_SPEED_SENSOR_SCALE 0.08,0 , 0.4,0.54 // Wind speed sensor scaling parameters used for speed calibration (passed to setFromTwoPoints), from raw into m/min @@ -440,6 +441,7 @@ inline void setupObjects() auto linearAct1 = helioController.addLinearActuatorRelay(SETUP_LINACT1_AXIS1_PINA, SETUP_LINACT1_AXIS1_PINB, SETUP_LINACT_AXIS1_STROKE, 0, SETUP_LINACT1_AXIS1_MUXCHNA, SETUP_LINACT1_AXIS1_MUXCHNB); linearAct1->setParentPanel(trackingPanel, 1); linearAct1->setParentRail(dcRelayPower); + linearAct1->setContinuousSpeed(HelioSingleMeasurement(SETUP_LINACT_TRAVEL_SPEED, Helio_UnitsType_Speed_MetersPerMin)); #endif #if SETUP_LINACT1_POS_SENSOR_PIN >= 0 { auto positionSensor = helioController.addAnalogPositionSensor(SETUP_LINACT1_POS_SENSOR_PIN, ADC_RESOLUTION, SETUP_LINACT1_POS_SENSOR_MUXCHN); @@ -469,6 +471,7 @@ inline void setupObjects() auto linearAct2 = helioController.addLinearActuatorRelay(SETUP_LINACT2_AXIS1_PINA, SETUP_LINACT2_AXIS1_PINB, SETUP_LINACT_AXIS1_STROKE, 0, SETUP_LINACT2_AXIS1_MUXCHNA, SETUP_LINACT2_AXIS1_MUXCHNB); linearAct2->setParentPanel(trackingPanel, 1); linearAct2->setParentRail(dcRelayPower); + linearAct2->setContinuousSpeed(HelioSingleMeasurement(SETUP_LINACT_TRAVEL_SPEED, Helio_UnitsType_Speed_MetersPerMin)); #endif #if SETUP_LINACT2_POS_SENSOR_PIN >= 0 { auto positionSensor = helioController.addAnalogPositionSensor(SETUP_LINACT2_POS_SENSOR_PIN, ADC_RESOLUTION, SETUP_LINACT2_POS_SENSOR_MUXCHN); diff --git a/examples/FullSystem/FullSystem.ino b/examples/FullSystem/FullSystem.ino index 33edea2..b123d86 100644 --- a/examples/FullSystem/FullSystem.ino +++ b/examples/FullSystem/FullSystem.ino @@ -93,7 +93,7 @@ SoftwareSerial SWSerial(RX, TX); // Replace with Rx/Tx pi #define SETUP_EXTDATA_EEPROM_ENABLE false // If data should be read from an external EEPROM (searched first for strings data) // External EEPROM Settings -#define SETUP_EEPROM_SYSDATA_ADDR 0x2e50 // System data memory offset for EEPROM saves (from Data Writer output) +#define SETUP_EEPROM_SYSDATA_ADDR 0x1111 // System data memory offset for EEPROM saves (from Data Writer output) #define SETUP_EEPROM_STRINGS_ADDR 0x0000 // Start address for strings data (from Data Writer output) #if defined(HELIO_USE_WIFI)