include/FlipFlat.h

@@ -7,11 +7,13 @@
 #include <EasyButton.h>
 #include <AccelStepper.h>
 #include <TMCStepper.h>
+#include <AVR_PWM.h>
 
 #define DEBUG       0
-#define TMC2130
 //#define UNIPOLAR    
 
+#define PWM_FREQUENCY 1000
+
 #ifdef ESP32
 #define BRIGHT_PLUS GPIO_NUM_34
 #define BRIGHT_MIN  GPIO_NUM_35
@@ -37,21 +39,21 @@
 #define STEP_PIN2   6
 #define STEP_PIN3   7
 #define STEP_PIN4   8
-#define STEPS       2038
+#define STEPS       2038 // steps per revolution for the motor 28BYJ-48
+#define REDUCTION   15
 #else
 #define STEP_PIN    7
 #define DIR_PIN     8
-#endif
-
-#ifdef TMC2130
+#define STEPS       200 // steps per revolution for the motor NEMA17
+#define REDUCTION   1
 #define R_SENSE     0.11f
 #define CS_PIN      6
 #define EN_PIN      5
 #endif
 
 #define MAX_SPEED   200
-#define STEPS       200 // steps per revolution for the motor
-#define MICROSTEPS  4
+
+#define MICROSTEPS  2
 
 #define COVER_ANGLE 180.0
 
@@ -104,10 +106,13 @@ void initializeStepper();
 void setupSerial();
 void handleSerial();
 void handleCoverButton();
+void handleIncreaseButton();
+void handleDecreaseButton();
 
 void increaseBrightness();
 void decreaseBrightness();
 void setBrightness(int newBrightness);
+
 void openFlipFlat();
 void closeFlipFlat();
 void rotateMotor(int direction);

platformio.ini

@@ -14,6 +14,7 @@ lib_deps =
 	evert-arias/EasyButton@^2.0.1
 	waspinator/AccelStepper@^1.64
 	https://github.com/teemuatlut/TMCStepper.git
+	https://github.com/khoih-prog/AVR_PWM.git
 
 [env:ESP32]
 platform = espressif32

src/FlipFlat.cpp

@@ -1,7 +1,7 @@
 // FlipFlat based on the Altinak Flip-Flat commands. Makes it possible to use it with ASCOM and INDI drivers
 
 // Enable DEBUG in FlipFlat.h to see logging.
-// Due to driver imitations in de indi driver, when using ESP32 Serial can't be used for FlipFlat communication.
+// Due to driver limitations in de indi driver, when using ESP32, Serial can't be used for FlipFlat communication.
 // Use Serial 2 (pins 16 and 17) instead. Standard Serial is used for debug messages
 
 #include <FlipFlat.h>
@@ -11,19 +11,24 @@ int motorStatus = STOPPED;
 int lightStatus = OFF;
 int coverStatus = CLOSED;
 int motorDirection = IDLE;
-uint32_t steps = STEPS / 360.0 * COVER_ANGLE * MICROSTEPS;
+uint32_t steps = STEPS / 360.0 * COVER_ANGLE * MICROSTEPS * REDUCTION;
 int brightness = 0;
 int lastCommand = CLOSE;
 
 EasyButton coverButton(COVER_FF);
+EasyButton increaseButton(BRIGHT_PLUS);
+EasyButton decreaseButton(BRIGHT_MIN);
 
-#if UNIPOLAR
+#ifdef UNIPOLAR
 AccelStepper stepper(AccelStepper::FULL4WIRE, STEP_PIN1, STEP_PIN3, STEP_PIN2, STEP_PIN4);
 #else
 AccelStepper stepper(AccelStepper::DRIVER, STEP_PIN, DIR_PIN);
+TMC2130Stepper driver = TMC2130Stepper(CS_PIN, R_SENSE);
 #endif
 
-TMC2130Stepper driver = TMC2130Stepper(CS_PIN, R_SENSE);
+
+//creates pwm instance
+AVR_PWM *PWM_Instance;
 
 void setup()
 {
@@ -36,17 +41,29 @@ void setup()
   coverButton.begin();
   coverButton.onPressed(handleCoverButton);
 
+  LOG("Setup increase brightness button");
+  increaseButton.begin();
+  increaseButton.onPressed(handleIncreaseButton);
+
+  LOG("Setup decrease brightness button");
+  decreaseButton.begin();
+  decreaseButton.onPressed(handleDecreaseButton);
+
   LOG("Initializing stepper");
   initializeStepper();
 
   LOG("'Initializeing PWM");
-  pinMode(PWM, OUTPUT);
+  //assigns PWM frequency of 10 KHz and a duty cycle of 0%
+  PWM_Instance = new AVR_PWM(PWM, PWM_FREQUENCY, 0);
 
 }
 
+
 void loop()
 {
   coverButton.read();
+  increaseButton.read();
+  decreaseButton.read();
 
   if (FF_SERIAL.available() > 0) // all incoming communications are fixed length at 6 bytes including the \r
   {
@@ -61,6 +78,7 @@ void loop()
 
 void initializeStepper()
 {
+#ifndef UNIPOLAR
   SPI.begin();
 
   pinMode(CS_PIN, OUTPUT);
@@ -71,10 +89,11 @@ void initializeStepper()
   driver.en_pwm_mode(1);   // Enable extremely quiet stepping
   driver.pwm_autoscale(1);
   driver.microsteps(MICROSTEPS);
+  stepper.setEnablePin(EN_PIN);
+#endif
 
   stepper.setMaxSpeed(MAX_SPEED);
   stepper.setAcceleration(1000);
-  stepper.setEnablePin(EN_PIN);
   stepper.setPinsInverted(false, false, true);
   stepper.enableOutputs();
 }
@@ -166,7 +185,7 @@ void processCommand(const char *cmd, const char *data)
       id = deviceId
   */
   case 'D':
-    LOG("Turn off received");
+    LOG("Light off received");
     lastCommand = LIGHT_OFF;
     setBrightness(0);
     break;
@@ -231,7 +250,7 @@ void openFlipFlat()
   if (coverStatus != OPENED)
   {
     LOG("Turn light off");
-    // setBrightness(0);
+    setBrightness(0);
 
     motorDirection = OPENING;
     rotateMotor(motorDirection);
@@ -274,17 +293,17 @@ void setupSerial()
 
 #ifdef ESP32
   FF_SERIAL.begin(9600, SERIAL_8N1, 16, 17);
-  LOG_SERIAL.begin(9600);
 #endif
 
 #ifdef __AVR_ATmega32U4__
   FF_SERIAL.begin(9600);
+#endif
+
 #if DEBUG
   LOG_SERIAL.begin(9600);
-#endif
+  LOG("Logging serial up and running");
 #endif
 
-  LOG("Logging serial up and running");
   LOG("FlipFlat Serial up and running");
 }
 
@@ -296,17 +315,32 @@ void handleCoverButton()
   case CLOSED:
     LOG("Opening cover");
     openFlipFlat();
+    coverStatus = OPENED;
     break;
   case OPENED:
     LOG("Closing cover");
     closeFlipFlat();
+    coverStatus = CLOSED;
     break;
   default:
     LOG("Cover not open or closed");
+    coverStatus = NEITHER_OPENED_NOR_CLOSED;
   }
 }
 
 
+void handleIncreaseButton()
+{
+  setBrightness(++brightness);
+}
+
+
+void handleDecreaseButton()
+{
+  setBrightness(--brightness);
+}
+
+
 void sendCommandResponse()
 {
   switch (lastCommand)
@@ -329,7 +363,7 @@ void sendCommandResponse()
     break;
 
   case LIGHT_ON:
-    lightStatus =ON;
+    lightStatus = ON;
     FF_SERIAL << F("*L") << deviceId << F("OOO\n");
     lastCommand = NONE;
     break;
@@ -370,5 +404,10 @@ void sendCommandResponse()
 
 void setBrightness(int newBrightness)
 {
-  analogWrite(PWM, newBrightness);
+
+  float dutyCycle = newBrightness / 250.0 * 100.0;
+  LOG1('Setting brightness to', newBrightness);
+
+  PWM_Instance->setPWM(PWM, PWM_FREQUENCY, dutyCycle);
+
 }