From 20860ec212e1fa30b556e910e023050e1c318c3e Mon Sep 17 00:00:00 2001 From: willem Date: Wed, 19 May 2021 21:34:57 +0200 Subject: [PATCH] code changes to hw v11 --- clockclock/include/board.h | 52 ++++++++++++++++++++++++++++++++-- clockclock/include/board_v10.h | 24 ---------------- clockclock/platformio.ini | 32 ++++++++++++++++----- clockclock/src/main.cpp | 2 +- clockclock/src/motor.cpp | 10 +++---- clockclock/src/movement.cpp | 19 +++++++++++-- 6 files changed, 98 insertions(+), 41 deletions(-) delete mode 100644 clockclock/include/board_v10.h diff --git a/clockclock/include/board.h b/clockclock/include/board.h index b6187de..9787fb3 100644 --- a/clockclock/include/board.h +++ b/clockclock/include/board.h @@ -1,11 +1,59 @@ #pragma once #ifndef HARDWAREVERSION - #define HARDWAREVERSION 10 + #define HARDWAREVERSION 11 #endif #if HARDWAREVERSION == 10 - #include "board_v10.h" + #define MOT_STCK0 PA1 + #define MOT_DIR0 PA2 + #define MOT_RST0 PA3 + #define MOT_EN0 PA4 + #define MOT_VREF1 PA5 + + #define MOT_STCK1 PA6 + #define MOT_DIR1 PA7 + #define MOT_RST1 PB0 + #define MOT_EN1 PB1 + + #define ADDR0 PA12 + #define ADDR1 PA11 + #define ADDR2 PA8 + #define ADDR3 PB7 + + #define I2C_CLK PA9 + #define I2C_SDA PA10 + + #define MCU_BUT_MIN PB4 + #define MCU_BUT_PLUS PB5 +#elif HARDWAREVERSION == 11 + #define MOT_STCK0 5 + #define MOT_DIR0 4 + #define MOT_RST0 14 + + #define MOT_STCK1 17 + #define MOT_DIR1 16 + #define MOT_RST1 18 + + #define MOT_VREF 25 + #define MOT_EN 13 + + #define ADDR0 33 + #define ADDR1 32 + #define ADDR2 35 + #define ADDR3 34 + + #define I2C_CLK 22 + #define I2C_SDA 21 + + #define PROX_LED 27 + #define LED_DATA 26 + #define PROOX_IN 36 + + #define MCU_BUT_MIN 19 + #define MCU_BUT_PLUS 23 +#else + #warning NO BOARD SPECIFIED #endif diff --git a/clockclock/include/board_v10.h b/clockclock/include/board_v10.h deleted file mode 100644 index 6765043..0000000 --- a/clockclock/include/board_v10.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -//hardware version v1.0 -#define MOT_STCK0 PA1 -#define MOT_DIR0 PA2 -#define MOT_RST0 PA3 -#define MOT_EN0 PA4 -#define MOT_VREF1 PA5 - -#define MOT_STCK1 PA6 -#define MOT_DIR1 PA7 -#define MOT_RST1 PB0 -#define MOT_EN1 PB1 - -#define ADDR0 PA12 -#define ADDR1 PA11 -#define ADDR2 PA8 -#define ADDR3 PB7 - -#define I2C_CLK PA9 -#define I2C_SDA PA10 - -#define MCU_BUT_MIN PB4 -#define MCU_BUT_PLUS PB5 \ No newline at end of file diff --git a/clockclock/platformio.ini b/clockclock/platformio.ini index 1f06494..083a7bd 100644 --- a/clockclock/platformio.ini +++ b/clockclock/platformio.ini @@ -9,16 +9,34 @@ ; https://docs.platformio.org/page/projectconf.html [env] -platform = ststm32 framework = arduino -upload_port = stlink -debug_tool = stlink lib_ldf_mode = deep+ lib_deps = http://192.168.2.3/Bonobo.Git.Server/Accelstepper.git -[env:clockclock_hwV10] -board = STM32L422KB +; [env:clockclock_hwV10_L422] +;platform = ststm32 +; board = STM32L422KB +; build_flags = +; -DHARDWAREVERSION=10 +; -O2 + + +; STM32L031K6 +; [env:clockclock_hwV10_L301] +; platform = ststm32 +; board = STM32L031K6 +; upload_port = stlink +; debug_tool = stlink +; build_flags = +; -DHARDWAREVERSION=10 +; -O2 + +[env:clockclock_hwV11_ESP32] +platform = espressif32 +board = esp32dev +monitor_speed = 115200 build_flags = - -DHARDWAREVERSION=10 - -O2 + -DHARDWAREVERSION=11 + + diff --git a/clockclock/src/main.cpp b/clockclock/src/main.cpp index 5a0831f..66e3a59 100644 --- a/clockclock/src/main.cpp +++ b/clockclock/src/main.cpp @@ -1,5 +1,5 @@ #include -#include "board_v10.h" +#include "board.h" #include "motor.h" #include "buttons.h" #include "movement.h" diff --git a/clockclock/src/motor.cpp b/clockclock/src/motor.cpp index 93fdfd0..4be165a 100644 --- a/clockclock/src/motor.cpp +++ b/clockclock/src/motor.cpp @@ -1,11 +1,11 @@ #include "motor.h" #include "arduino.h" -#include "board_v10.h" +#include "board.h" #include "MultiStepper.h" -c_motor motor0(MOT_STCK0, MOT_DIR0, MOT_EN0, MOT_RST0); -c_motor motor1(MOT_STCK1, MOT_DIR1, MOT_EN1, MOT_RST1); +c_motor motor0(MOT_STCK0, MOT_DIR0, MOT_EN, MOT_RST0); +c_motor motor1(MOT_STCK1, MOT_DIR1, MOT_EN, MOT_RST1); MultiStepper motors; @@ -27,8 +27,8 @@ void c_motor::init(bool setvref) if (setvref) { - pinMode(MOT_VREF1, OUTPUT); - analogWrite(MOT_VREF1, 32); + pinMode(MOT_VREF, OUTPUT); + ledcWrite(MOT_VREF, 32); } } diff --git a/clockclock/src/movement.cpp b/clockclock/src/movement.cpp index 70f3c80..6d71b80 100644 --- a/clockclock/src/movement.cpp +++ b/clockclock/src/movement.cpp @@ -1,12 +1,27 @@ #include "movement.h" #include "motor.h" +uint64_t movementTimer1 = 0; +#define MOVEMENTINTERVAL 100 + +void doMovement( void ) +{ + increaseMotor(MOTOR0); + decreaseMotor(MOTOR1); +} void handleMovement( void ) { - + uint64_t currentmillis = millis(); + if(currentmillis - movementTimer1 > MOVEMENTINTERVAL) + { + doMovement(); + movementTimer1 = currentmillis; + } } + + void initMovement( void ) { - + /* noting to init */ } \ No newline at end of file