Skip to content

Commit 9335a9f

Browse files
ClutchplateDudeClutchplateDude
authored
Merge pull request #109 from OpenAstroTech/esp32-build-fix
V1.8.45 - Updates
2 parents a5ab086 + 71a5def commit 9335a9f

File tree

6 files changed

+49
-56
lines changed

6 files changed

+49
-56
lines changed

‎Software/Arduino code/OpenAstroTracker/Configuration_pins.hpp

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -101,23 +101,15 @@
101101
#define DEC_SERIAL_PORT Serial2 // HardwareSerial port, wire to TX2 for write-only
102102
#define DEC_DRIVER_ADDRESS 0b01 // Set by MS1/MS2 (MS1 HIGH, MS2 LOW)
103103

104-
#if AZIMUTH_ALTITUDE_MOTORS == 1
105-
#define AZ_IN1_PIN 38
106-
#define AZ_IN2_PIN 40
107-
#define AZ_IN3_PIN 42
108-
#define AZ_IN4_PIN 44
109-
#define ALT_IN1_PIN 46
110-
#define ALT_IN2_PIN 48
111-
#define ALT_IN3_PIN 50
112-
#define ALT_IN4_PIN 52
113-
#endif
104+
#if AZIMUTH_ALTITUDE_MOTORS == 1
105+
#error Azimuth/Alt motors not currently configured/supported in ESP32
106+
#endif
114107

115-
// ST4 Input Pins - TODO.
116-
/*#define st4North SD0
117-
#define st4South SD1
118-
#define st4West SD2
119-
#define st4East SD3*/
120108
#if USE_GPS == 1
121109
#error GPS module not currently configured/supported in ESP32
122110
#endif
111+
112+
#if USE_GYRO == 1
113+
#error Digital Level not currently configured/supported in ESP32
114+
#endif
123115
#endif

‎Software/Arduino code/OpenAstroTracker/Version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define VERSION "V1.8.44"
1+
#define VERSION "V1.8.45"

‎Software/Arduino code/OpenAstroTracker/src/LcdMenu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ MenuItem *LcdMenu::findById(byte id)
8181
void LcdMenu::addItem(const char *disp, byte id)
8282
{
8383
_menuItems[_numMenuItems++] = new MenuItem(disp, id);
84-
_longestDisplay = max(_longestDisplay, strlen(disp));
84+
_longestDisplay = max((size_t)_longestDisplay, strlen(disp));
8585
}
8686

8787
// Get the currently active item ID

‎Software/Arduino code/OpenAstroTracker/src/MeadeCommandProcessor.cpp

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -63,40 +63,40 @@ bool gpsAqcuisitionComplete(int & indicator); // defined in c72_menuHA_GPS.hpp
6363
//
6464
// :GVP#
6565
// Get the Product Name
66-
// Returns: 'OpenAstroTracker'
66+
// Returns: 'OpenAstroTracker#'
6767
//
6868
// :GVN#
6969
// Get the Firmware Version Number
70-
// Returns: 'V1.major.minor' from OpenAstroTracker.ino
70+
// Returns: 'V1.major.minor#' from version.h
7171
//
7272
// :Gd#
7373
// Get Target Declination
74-
// Returns: sDD*MM'SS
74+
// Returns: sDD*MM'SS#
7575
// Where s is + or -, DD is degrees, MM is minutes, SS is seconds.
7676
//
7777
// :GD#
7878
// Get Current Declination
79-
// Returns: sDD*MM'SS
79+
// Returns: sDD*MM'SS#
8080
// Where s is + or -, DD is degrees, MM is minutes, SS is seconds.
8181
//
8282
// :Gr#
8383
// Get Target Right Ascension
84-
// Returns: HH:MM:SS
84+
// Returns: HH:MM:SS#
8585
// Where HH is hour, MM is minutes, SS is seconds.
8686
//
8787
// :GR#
8888
// Get Current Right Ascension
89-
// Returns: HH:MM:SS
89+
// Returns: HH:MM:SS#
9090
// Where HH is hour, MM is minutes, SS is seconds.
9191
//
9292
// :Gt#
9393
// Get Site Latitude
94-
// Returns: sDD*MM
94+
// Returns: sDD*MM#
9595
// Where s is + or - and DD is the latitude in degrees and MM the minutes.
9696
//
9797
// :Gg#
9898
// Get Site Longitude
99-
// Returns: DDD*MM
99+
// Returns: DDD*MM#
100100
// Where DDD is the longitude in degrees and MM the minutes. Negative (W) longitudes have had 360 added to them.
101101
//
102102
//
@@ -181,7 +181,7 @@ bool gpsAqcuisitionComplete(int & indicator); // defined in c72_menuHA_GPS.hpp
181181
// This sets the date
182182
// Where HHMM is the month, DD is teh day and YY is the year since 2000.
183183
// CURRENTLY IGNORED.
184-
// Returns: 1Updating Planetary Data
184+
// Returns: 1Updating Planetary Data#
185185
//
186186
// -- SET Extensions --
187187
// :SHHH:MM#
@@ -305,7 +305,8 @@ bool gpsAqcuisitionComplete(int & indicator); // defined in c72_menuHA_GPS.hpp
305305
// :XDnnn#
306306
// Run drift alignment
307307
// This runs a drift alignment procedure where the mounts slews east, pauses, slews west and pauses.
308-
// Where nnn is the number of seconds the entire alignment should take.
308+
// Where nnn is the number of seconds the entire alignment should take. The call is blocking and will
309+
// only return once the drift alignment is complete.
309310
// Returns: nothing
310311
//
311312
// :XL0#
@@ -335,32 +336,32 @@ bool gpsAqcuisitionComplete(int & indicator); // defined in c72_menuHA_GPS.hpp
335336
// :XGB#
336337
// Get Backlash correction steps
337338
// Get the number of steps the RA stepper motor needs to overshoot and backtrack when slewing east.
338-
// Returns: integer
339+
// Returns: integer#
339340
//
340341
// :XGR#
341342
// Get RA steps
342343
// Get the number of steps the RA stepper motor needs to take to rotate by one degree
343-
// Returns: integer
344+
// Returns: integer#
344345
//
345346
// :XGD#
346347
// Get DEC steps
347348
// Get the number of steps the DEC stepper motor needs to take to rotate by one degree
348-
// Returns: integer
349+
// Returns: integer#
349350
//
350351
// :XGS#
351352
// Get Tracking speed adjustment
352353
// Get the adjustment factor used to speed up (>1.0) or slow down (<1.0) the tracking speed of the mount.
353-
// Returns: float
354+
// Returns: float#
354355
//
355356
// :XGT#
356357
// Get Tracking speed
357358
// Get the absolute tracking speed of the mount.
358-
// Returns: float
359+
// Returns: float#
359360
//
360361
// :XGH#
361362
// Get HA
362363
// Get the current HA of the mount.
363-
// Returns: HHMMSS
364+
// Returns: HHMMSS#
364365
//
365366
// :XGM#
366367
// Get Mount configuration settings
@@ -480,13 +481,13 @@ String MeadeCommandProcessor::handleMeadeGetInfo(String inCmd) {
480481
}
481482
break;
482483

483-
case 'r': return _mount->RAString(MEADE_STRING | TARGET_STRING);
484+
case 'r': return _mount->RAString(MEADE_STRING | TARGET_STRING); // returns trailing #
484485

485-
case 'd': return _mount->DECString(MEADE_STRING | TARGET_STRING);
486+
case 'd': return _mount->DECString(MEADE_STRING | TARGET_STRING); // returns trailing #
486487

487-
case 'R': return _mount->RAString(MEADE_STRING | CURRENT_STRING);
488+
case 'R': return _mount->RAString(MEADE_STRING | CURRENT_STRING); // returns trailing #
488489

489-
case 'D': return _mount->DECString(MEADE_STRING | CURRENT_STRING);
490+
case 'D': return _mount->DECString(MEADE_STRING | CURRENT_STRING); // returns trailing #
490491

491492
case 'X': return _mount->getStatusString() + "#";
492493

‎Software/Arduino code/OpenAstroTracker/src/c722_menuPOI.hpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@ PointOfInterest pointOfInterest[] = {
1818
// Name (15chars) RA (hms) DEC (dms)
1919
//0123456789012345
2020
{">Polaris", POLARIS_RA_HOUR, POLARIS_RA_MINUTE, POLARIS_RA_SECOND, 89, 21, 6},
21-
{">Veil Nebula", 20, 51, 28, 30, 59, 30},
22-
{">M81 Bodes Galxy", 9, 57, 13, 68, 58, 1},
23-
{">Cederblad 214", 0, 5, 46, 67, 16, 45},
24-
{">Heart Nebula", 2, 34, 57, 61, 31, 17},
25-
{">Navi", 0, 57, 57, 60, 49, 33},
26-
{">Soul Nebula", 2, 52, 47, 60, 30, 56},
27-
{">Elephant Trunk", 21, 39, 44, 57, 35, 31},
21+
{">Altair", 19, 51, 45, 8, 55, 15},
22+
{">Arcturus", 14, 16, 37, 19, 5, 21},
2823
{">Big Dipper", 12, 16, 26, 56, 55, 7},
29-
{">M101 Pinwheel", 14, 3, 56, 54, 15, 0},
30-
{">M51 Whirlpool", 13, 30, 45, 47, 5, 21},
24+
{">Cederblad 214", 0, 5, 46, 67, 16, 45},
3125
{">Deneb (Cygnus)", 20, 42, 7, 45, 21, 12},
32-
{">M63 Sunflower", 13, 16, 45, 41, 55, 14},
26+
{">Elephant Trunk", 21, 39, 44, 57, 35, 31},
27+
{">Heart Nebula", 2, 34, 57, 61, 31, 17},
28+
{">Lagoon Nebula", 18, 5, 2, -24, 22, 52},
3329
{">M31 Andromeda", 0, 43, 52, 41, 22, 53},
34-
{">Vega", 18, 37, 37, 38, 48, 7},
3530
{">M33 Triangulum", 1, 35, 02, 30, 46, 5},
36-
{">Pleiades 7Sistr", 3, 48, 15, 24, 10, 54},
37-
{">Arcturus", 14, 16, 37, 19, 5, 21},
38-
{">Altair", 19, 51, 45, 8, 55, 15},
3931
{">M42 Orion Nbula", 5, 36, 18, -5, 22, 44},
40-
{">Lagoon Nebula", 18, 5, 2, -24, 22, 52},
32+
{">M51 Whirlpool", 13, 30, 45, 47, 5, 21},
33+
{">M63 Sunflower", 13, 16, 45, 41, 55, 14},
34+
{">M81 Bodes Galxy", 9, 57, 13, 68, 58, 1},
35+
{">M101 Pinwheel", 14, 3, 56, 54, 15, 0},
36+
{">Navi", 0, 57, 57, 60, 49, 33},
37+
{">Pleiades 7Sistr", 3, 48, 15, 24, 10, 54},
38+
{">Soul Nebula", 2, 52, 47, 60, 30, 56},
39+
{">Vega", 18, 37, 37, 38, 48, 7},
40+
{">Veil Nebula", 20, 51, 28, 30, 59, 30},
4141

4242
// Add new items above here, not below.
4343
{">Home", 0, 0, 0, 90, 0, 0},

‎Software/Arduino code/OpenAstroTracker/src/c76_menuCAL.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,14 @@ bool checkProgressiveUpDown(int *val)
139139
{
140140
*val = *val + 1;
141141
mount.delay(calDelay);
142-
calDelay = max(25, 0.94 * calDelay);
142+
calDelay = max(25.0, 0.94 * calDelay);
143143
ret = false;
144144
}
145145
else if (lcdButtons.currentState() == btnDOWN)
146146
{
147147
*val = *val - 1;
148148
mount.delay(calDelay);
149-
calDelay = max(25, 0.94 * calDelay);
149+
calDelay = max(25.0, 0.94 * calDelay);
150150
ret = false;
151151
}
152152
else
@@ -221,7 +221,7 @@ bool processCalibrationKeys()
221221
}
222222

223223
mount.delay(calDelay);
224-
calDelay = max(5, 0.96 * calDelay);
224+
calDelay = max(5.0, 0.96 * calDelay);
225225
checkForKeyChange = false;
226226
}
227227
else if (currentButtonState == btnDOWN)
@@ -233,7 +233,7 @@ bool processCalibrationKeys()
233233
}
234234

235235
mount.delay(calDelay);
236-
calDelay = max(5, 0.96 * calDelay);
236+
calDelay = max(5.0, 0.96 * calDelay);
237237
checkForKeyChange = false;
238238
}
239239
else

0 commit comments

Comments
 (0)