Compare commits
No commits in common. "09aff91b311b9d951d0eb154a40903e5901759d4" and "ee72092a3af2d30b6d6e45e19ff0f8dd6f180517" have entirely different histories.
09aff91b31
...
ee72092a3a
@ -23,13 +23,9 @@
|
|||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="pwm">
|
<div class="pwm">
|
||||||
<label id="label_pwm"></label>
|
<label id="l_pwm"></label>
|
||||||
<input type="range" min="1" max="100" value="50" class="rangeslider" id="range1">
|
<input type="range" min="1" max="100" value="50" class="rangeslider" id="range1">
|
||||||
</div>
|
</div>
|
||||||
<div class="timer">
|
|
||||||
<label id="label_timer"></label>
|
|
||||||
<input type="range" min="1" max="100" value="50" class="rangeslider" id="timer_range">
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
25
src/main.cpp
25
src/main.cpp
@ -3,16 +3,13 @@
|
|||||||
|
|
||||||
#include "PCA9685.h"
|
#include "PCA9685.h"
|
||||||
|
|
||||||
#define ESP12_LED 2
|
|
||||||
#define NODEMCU_LED 16
|
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include "user_interface.h"
|
#include "user_interface.h"
|
||||||
}
|
}
|
||||||
os_timer_t Timer1; // Verwaltungsstruktur des Timers
|
os_timer_t Timer1; // Verwaltungsstruktur des Timers
|
||||||
|
|
||||||
int c;
|
uint32_t c;
|
||||||
bool toggle = false;
|
|
||||||
uint32_t m=0;
|
uint32_t m=0;
|
||||||
|
|
||||||
uint32_t dimmtimer = 0;
|
uint32_t dimmtimer = 0;
|
||||||
@ -27,13 +24,14 @@ void timerCallback(void *pArg)
|
|||||||
{
|
{
|
||||||
*((int *) pArg) += 1;
|
*((int *) pArg) += 1;
|
||||||
|
|
||||||
|
//Serial.print("hallo\n");
|
||||||
|
//Serial.println(micros()-m);
|
||||||
|
//m = micros();
|
||||||
ledsequence(direction, onoff, 4);
|
ledsequence(direction, onoff, 4);
|
||||||
// Serial.print("[");
|
}
|
||||||
// Serial.print(micros()-m);
|
|
||||||
// Serial.print("] timerCallback\n");
|
|
||||||
// m = micros();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
// Änderung
|
||||||
// OTA & WEB
|
// OTA & WEB
|
||||||
#include "wifi_credentials.h"
|
#include "wifi_credentials.h"
|
||||||
#include <ESP8266WiFi.h>
|
#include <ESP8266WiFi.h>
|
||||||
@ -174,6 +172,8 @@ void setup_pwm_pca9685() {
|
|||||||
pwmController.init(B000000); // Address pins A5-A0 set to B000000
|
pwmController.init(B000000); // Address pins A5-A0 set to B000000
|
||||||
pwmController.setPWMFrequency(200); // Default is 200Hz, supports 24Hz to 1526Hz
|
pwmController.setPWMFrequency(200); // Default is 200Hz, supports 24Hz to 1526Hz
|
||||||
|
|
||||||
|
pwmController.setChannelPWM(0, 128 << 4); // Set PWM to 128/255, but in 4096 land
|
||||||
|
|
||||||
Serial.println(pwmController.getChannelPWM(0)); // Should output 2048, which is 128 << 4
|
Serial.println(pwmController.getChannelPWM(0)); // Should output 2048, which is 128 << 4
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -181,9 +181,6 @@ void setup() {
|
|||||||
Serial.begin(115200);
|
Serial.begin(115200);
|
||||||
Serial.println(F("Booting ...."));
|
Serial.println(F("Booting ...."));
|
||||||
|
|
||||||
pinMode(NODEMCU_LED, OUTPUT);
|
|
||||||
pinMode(ESP12_LED, OUTPUT);
|
|
||||||
|
|
||||||
Wire.begin(); // Wire must be started first
|
Wire.begin(); // Wire must be started first
|
||||||
Wire.setClock(400000); // Supported baud rates are 100kHz, 400kHz, and 1000kHz
|
Wire.setClock(400000); // Supported baud rates are 100kHz, 400kHz, and 1000kHz
|
||||||
|
|
||||||
@ -238,7 +235,7 @@ uint8_t softstart_led(uint8_t led, uint16_t startval, uint16_t stopval, uint8_t
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define LEDCOUNT 16
|
#define LEDCOUNT 13
|
||||||
|
|
||||||
void ledsequence(uint8_t direction, uint8_t onoff, uint8_t factor){
|
void ledsequence(uint8_t direction, uint8_t onoff, uint8_t factor){
|
||||||
static int8_t led = 0;
|
static int8_t led = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user