5 Commits
3 changed files with 37 additions and 18 deletions

No files matched your search

+5 -1
View File
@@ -23,9 +23,13 @@
</label> </label>
</div> </div>
<div class="pwm"> <div class="pwm">
<label id="l_pwm"></label> <label id="label_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>
+32 -17
View File
@@ -2,26 +2,39 @@
#include <Wire.h> #include <Wire.h>
#include "PCA9685.h" #include "PCA9685.h"
#include <GDBStub.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
uint32_t c; int c;
bool toggle = false;
uint32_t m=0; uint32_t m=0;
uint32_t dimmtimer = 0;
uint8_t direction = 1;
uint8_t onoff = 1;
void ledsequence(uint8_t direction, uint8_t onoff, uint8_t factor);
uint8_t softstart_led(uint8_t led, uint16_t startval, uint16_t stopval, uint8_t factor);
void timerCallback(void *pArg) void timerCallback(void *pArg)
{ {
*((int *) pArg) += 1; *((int *) pArg) += 1;
Serial.print("hallo\n"); ledsequence(direction, onoff, 4);
Serial.println(micros()-m); // Serial.print("[");
m = micros(); // 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>
@@ -162,15 +175,18 @@ 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
} }
void setup() { void setup() {
Serial.begin(115200); Serial.begin(460800);
gdbstub_init();
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
@@ -183,8 +199,9 @@ void setup() {
ESP.restart(); ESP.restart();
} }
os_timer_setfn(&Timer1, timerCallback, NULL); os_timer_setfn(&Timer1, timerCallback, &c);
os_timer_arm(&Timer1, 1000, true); os_timer_arm(&Timer1, 1, true);
Serial.println("Ready"); Serial.println("Ready");
Serial.print("IP address: "); Serial.print("IP address: ");
@@ -224,7 +241,7 @@ uint8_t softstart_led(uint8_t led, uint16_t startval, uint16_t stopval, uint8_t
return 1; return 1;
} }
#define LEDCOUNT 13 #define LEDCOUNT 16
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;
@@ -284,12 +301,10 @@ void ledsequence(uint8_t direction, uint8_t onoff, uint8_t factor){
void loop() { void loop() {
static uint32_t dimmtimer = 0;
static uint8_t direction = 1;
static uint8_t onoff = 1;
if(millis() - dimmtimer > 2){ if(millis() - dimmtimer > 2){
ledsequence(direction, onoff, 4); //ledsequence(direction, onoff, 4);
dimmtimer = millis(); dimmtimer = millis();
} }
if(millis() > 25000 && onoff == 1 && direction == 1) onoff = 0; if(millis() > 25000 && onoff == 1 && direction == 1) onoff = 0;
View File
Whitespace-only changes.