Skip to content

Commit 05bcb17

Browse files
Merge pull request #105 from OpenAstroTech/remove-obsolete-boards
Removed support for esp8266, Arduino UNO, integrated heating
2 parents 95b4734 + 5b9029d commit 05bcb17

21 files changed

+19
-999
lines changed

Software/Arduino code/OpenAstroTracker/Configuration_adv.hpp

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -190,29 +190,21 @@
190190
#endif // DISPLAY_TYPE
191191

192192
// Enable Meade protocol communication over serial
193-
#ifdef __AVR_ATmega328P__
194-
#define SUPPORT_SERIAL_CONTROL 0
195-
#else
196193
#define SUPPORT_SERIAL_CONTROL 1
197-
#endif
198194

199195

200-
#if defined(ESP8266) || defined(ESP32)
196+
#if defined(ESP32)
201197
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
202198
// //////////
203199
// WIFI SETTINGS //////////
204200
// //////////
205201
////////////////////////////
206-
// These settings are valid only for ESP8266 or ESP32
202+
// These settings are valid only for ESP32
207203
//
208204
// Define some things, dont change: ///
209205
#define ESPBOARD
210206
// #define BLUETOOTH_ENABLED
211207
#define WIFI_ENABLED
212-
#if defined(ESP8266)
213-
#undef RUN_STEPPERS_IN_MAIN_LOOP
214-
#define RUN_STEPPERS_IN_MAIN_LOOP 1
215-
#endif
216208
///////////////////////////////////////
217209
//
218210
// SETTINGS
@@ -293,10 +285,3 @@
293285
#if RA_STEPPER_TYPE != STEPPER_TYPE_28BYJ48 && ESP32
294286
#error "Sorry, ESP32 only supports 28BYJ48 steppers at this moment"
295287
#endif
296-
#if RA_STEPPER_TYPE != STEPPER_TYPE_28BYJ48 && __AVR_ATmega328P__
297-
#error "Sorry, Arduino Uno only supports 28BYJ48 steppers."
298-
#endif
299-
300-
// Set this to 1 this to enable the heating menu
301-
// NOTE: Heating is currently not supported!
302-
#define SUPPORT_HEATING 0

Software/Arduino code/OpenAstroTracker/Configuration_pins.hpp

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -99,29 +99,3 @@
9999
#error GPS module not currently configured/supported in ESP32
100100
#endif
101101
#endif
102-
103-
////////////////////////////////////////////////////////////////////
104-
// Arduino UNO
105-
////////////////////////////////////////////////////////////////////
106-
#ifdef __AVR_ATmega328P__ // Arduino Uno
107-
#if (RA_STEPPER_TYPE != STEPPER_TYPE_28BYJ48) || (DEC_STEPPER_TYPE != STEPPER_TYPE_28BYJ48)
108-
#error Only 28BJY-48 stepper motors are supported on the UNO (for now)
109-
#endif
110-
111-
#define RA_IN1_PIN 12
112-
#define RA_IN2_PIN 11
113-
#define RA_IN3_PIN 3
114-
#define RA_IN4_PIN 2
115-
116-
#define DEC_IN1_PIN 18
117-
#define DEC_IN2_PIN 17
118-
#define DEC_IN3_PIN 16
119-
#define DEC_IN4_PIN 15
120-
121-
#if AZIMUTH_ALTITUDE_MOTORS == 1
122-
#error Azimuth / Altitude motors not currently configured/supported in ESP32
123-
#endif
124-
#if USE_GPS == 1
125-
#error GPS module not currently configured/supported in ESP32
126-
#endif
127-
#endif

Software/Arduino code/OpenAstroTracker/platformio.ini

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,6 @@ upload_protocol = wiring
3131
lib_deps =
3232
${common.lib_deps}
3333

34-
[env:uno]
35-
platform = atmelavr
36-
board = uno
37-
lib_deps =
38-
${common.lib_deps}
39-
40-
[env:esp8266]
41-
platform = espressif8266
42-
board = esp12e
43-
lib_deps =
44-
${common.lib_deps}
45-
ESP8266WiFi
46-
4734
[env:esp32]
4835
platform = espressif32
4936
board = esp32dev

Software/Arduino code/OpenAstroTracker/src/Core.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include "c725_menuHOME.hpp"
99
#include "c72_menuHA.hpp"
1010
#include "c72_menuHA_GPS.hpp"
11-
#include "c74_menuHEAT.hpp"
1211
#include "c75_menuCTRL.hpp"
1312
#include "c76_menuCAL.hpp"
1413
#include "c78_menuINFO.hpp"

Software/Arduino code/OpenAstroTracker/src/ESP8266TimerInterrupt.h

Lines changed: 0 additions & 205 deletions
This file was deleted.

Software/Arduino code/OpenAstroTracker/src/InterruptCallback.cpp

Lines changed: 4 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66
// whatever timer is used for the hardware being run
77
//////////////////////////////////////
88

9-
// NOTE: ESP8266 support is not complete and does not work. This code is never called.
10-
#ifdef ESP8266
11-
#include "ESP8266TimerInterrupt.h"
12-
#elif defined ESP32
9+
#if defined ESP32
1310
// We don't support ESP32 boards in interrupt mode
14-
#elif defined __AVR_ATmega328P__ || defined __AVR_ATmega2560__ // Arduino Uno or Mega
11+
#elif defined __AVR_ATmega2560__ // Arduino Mega
1512
#define USE_TIMER_1 true
1613
#define USE_TIMER_2 true
1714
#define USE_TIMER_3 false
@@ -22,43 +19,7 @@
2219
#error Unrecognized board selected. Either implement interrupt code or define the board here.
2320
#endif
2421

25-
#ifdef ESP8266
26-
ESP8266Timer interruptHandler;
27-
28-
void* actualPayload = NULL;
29-
volatile interrupt_callback_p actualCallback = NULL;
30-
31-
// This timer only supports a callback with no payload
32-
void ICACHE_RAM_ATTR esp8266callback(void)
33-
{
34-
if (actualCallback != NULL) {
35-
(*actualCallback)(actualPayload);
36-
}
37-
}
38-
39-
bool InterruptCallback::setInterval(float intervalMs, interrupt_callback_p callback, void* payload)
40-
{
41-
// Since this timer only supports a callback with no payload, we store the requested callback and payload
42-
// in static variables and install an intermediate callback for the interrupt to call. The intermerdiate
43-
// The calls the actual requested callback with the payload.
44-
actualPayload = payload;
45-
actualCallback = callback;
46-
47-
// This timer library requires microsecond interval definitions
48-
interruptHandler.setInterval(1000.0f * intervalMs, esp8266callback);
49-
50-
return true;
51-
}
52-
53-
void InterruptCallback::start()
54-
{
55-
}
56-
57-
void InterruptCallback::stop()
58-
{
59-
}
60-
61-
#elif defined(ESP32)
22+
#if defined(ESP32)
6223

6324
/*
6425
volatile bool _lock = false;
@@ -107,7 +68,7 @@ void InterruptCallback::start(){
10768
}
10869
*/
10970

110-
#elif defined __AVR_ATmega328P__ || defined __AVR_ATmega2560__
71+
#elif defined __AVR_ATmega2560__
11172

11273
bool InterruptCallback::setInterval(float intervalMs, interrupt_callback_p callback, void* payload)
11374
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ bool gpsAqcuisitionComplete(int & indicator); // defined in c72_menuHA_GPS.hpp
365365
// :XGM#
366366
// Get Mount configuration settings
367367
// Returns: <board>,<RA Stepper Info>,<DEC Stepper Info>,<GPS info>,<AzAlt info>,<Gyro info>#
368-
// Where <board> is one of the supported boards (currently Uno, Mega, ESP8266, ESP32)
368+
// Where <board> is one of the supported boards (currently Mega, ESP32)
369369
// <Stepper Info> is a pipe-delimited string of Motor type (NEMA or 28BYJ), Pulley Teeth, Steps per revolution)
370370
// <GPS info> is either NO_GPS or GPS, depending on whether a GPS module is present
371371
// <AzAlt info> is either NO_AZ_ALT or AUTO_AZ_ALT, depending on whether the AutoPA stepper motors are present
@@ -374,7 +374,7 @@ bool gpsAqcuisitionComplete(int & indicator); // defined in c72_menuHA_GPS.hpp
374374
//
375375
// :XGN#
376376
// Get network settings
377-
// Gets the current status of the Wifi connection. Reply only available when running on ESP8266 boards.
377+
// Gets the current status of the Wifi connection. Reply only available when running on ESP boards.
378378
// Returns: 1,<stats>,<hostname>,<ip>:<port>,<SSID>,<OATHostname># - if Wifi is enabled
379379
// Returns: 0,# - if Wifi is not enabled
380380
//

0 commit comments

Comments
 (0)