iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

pwm add

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-07-31 01:29:16 +02:00
parent 217cdfc080
commit f4a5bc0218
5 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/Class/Pwm.h Normal file
View File

@@ -0,0 +1,33 @@
#pragma once
#include <Arduino.h>
#include "Class/LineParsing.h"
#include "Global.h"
class Pwm : public LineParsing {
public:
Pwm() : LineParsing(){};
void pwmModeSet() {
if (_pin != "") {
pinMode(_pin.toInt(), INPUT);
}
}
void pwmStateSetDefault() {
if (_state != "") {
pwmChange(_key, _pin, _state);
}
}
void pwmChange(String key, String pin, String state) {
int pinInt = pin.toInt();
analogWrite(pinInt, state.toInt());
eventGen(key, "");
jsonWriteInt(configLiveJson, key, state.toInt());
MqttClient::publishStatus(key, state);
}
};
extern Pwm* myPwm;

1
include/Class/button.h
View File

@@ -10,7 +10,6 @@ class Button : public LineParsing {
void pinModeSet() {
if (_pin != "") {
Serial.println(_pin);
pinMode(_pin.toInt(), OUTPUT);
}
}

1
src/Class/Button.cpp
View File

@@ -1,3 +1,2 @@
#include "Class/Button.h"
Button* myButton;

2
src/Class/Pwm.cpp Normal file
View File

@@ -0,0 +1,2 @@
#include "Class/Pwm.h"
Pwm* myPwm;

38
src/Cmd.cpp
View File

@@ -2,6 +2,7 @@
#include "Class/Button.h"
#include "Class/LineParsing.h"
#include "Class/Pwm.h"
#include "Global.h"
#include "Module/Terminal.h"
#include "Servo/Servos.h"
@@ -99,15 +100,14 @@ void cmd_init() {
sCmd.addCommand("firmwareUpdate", firmwareUpdate);
sCmd.addCommand("firmwareVersion", firmwareVersion);
handle_time_init();
myButton = new Button();
handle_time_init();
}
//==========================================Модуль кнопок===================================================
//button out light toggle Кнопки Свет 1 pin[12] inv[1] st[1]
//==========================================================================================================
void button() {
myButton = new Button();
myButton->update();
String key = myButton->gkey();
String pin = myButton->gpin();
@@ -137,31 +137,23 @@ void buttonSet() {
//pwm out volume range Кнопки Свет 1 pin[12] st[500]
//==================================================================================================================
void pwm() {
//line->update();
//String key = line->gkey();
//String pin = line->gpin();
//String state = line->gstate();
//line->clear();
//sCmd.addCommand(key.c_str(), pwmSet);
//
//if (pin != "") {
// jsonWriteInt(configOptionJson, key + "_pin", pin.toInt());
// analogWrite(pin.toInt(), state.toInt());
// jsonWriteInt(configLiveJson, key, state.toInt());
// MqttClient::publishStatus(key, String(state));
//}
myPwm = new Pwm();
myPwm->update();
String key = myPwm->gkey();
String pin = myPwm->gpin();
String inv = myPwm->ginv();
sCmd.addCommand(key.c_str(), pwmSet);
jsonWriteStr(configOptionJson, key + "_pin", pin);
myPwm->pwmModeSet();
myPwm->pwmStateSetDefault();
myPwm->clear();
}
void pwmSet() {
String key = sCmd.order();
String state = sCmd.next();
int pin = jsonReadInt(configOptionJson, key + "_pin");
analogWrite(pin, state.toInt());
eventGen(key, "");
jsonWriteStr(configLiveJson, key, state);
MqttClient::publishStatus(key, state);
String pin = jsonReadStr(configOptionJson, key + "_pin");
myPwm->pwmChange(key, pin, state);
}
//==================================================================================================================