mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-26 22:22:16 +03:00
compiling version
This commit is contained in:
7
.vscode/extensions.json
vendored
7
.vscode/extensions.json
vendored
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
// See http://go.microsoft.com/fwlink/?LinkId=827846
|
|
||||||
// for the documentation about the extensions.json format
|
|
||||||
"recommendations": [
|
|
||||||
"platformio.platformio-ide"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,12 +1,14 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
extern void cmd_init();
|
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
|
|
||||||
|
extern void cmd_init();
|
||||||
|
|
||||||
extern void sensorsInit();
|
extern void sensorsInit();
|
||||||
|
|
||||||
extern void levelPr();
|
//extern void levelPr();
|
||||||
extern void ultrasonicCm();
|
//extern void ultrasonicCm();
|
||||||
extern void ultrasonic_reading();
|
//extern void ultrasonic_reading();
|
||||||
|
|
||||||
extern void analog_reading1();
|
extern void analog_reading1();
|
||||||
extern void analog_reading2();
|
extern void analog_reading2();
|
||||||
|
|||||||
10
src/Cmd.cpp
10
src/Cmd.cpp
@@ -1,7 +1,5 @@
|
|||||||
#include "Cmd.h"
|
#include "Cmd.h"
|
||||||
|
|
||||||
#include "items/itemsGlobal.h"
|
#include "items/itemsGlobal.h"
|
||||||
//#include "Class/LineParsing.h"
|
|
||||||
#include "Class/NotAsinc.h"
|
#include "Class/NotAsinc.h"
|
||||||
#include "Global.h"
|
#include "Global.h"
|
||||||
#include "Module/Terminal.h"
|
#include "Module/Terminal.h"
|
||||||
@@ -31,9 +29,8 @@ void cmd_init() {
|
|||||||
sCmd.addCommand("input-time", inputTime);
|
sCmd.addCommand("input-time", inputTime);
|
||||||
sCmd.addCommand("output-text", textOut);
|
sCmd.addCommand("output-text", textOut);
|
||||||
|
|
||||||
#ifdef ANALOG_ENABLED
|
|
||||||
sCmd.addCommand("analog-adc", analogAdc);
|
sCmd.addCommand("analog-adc", analogAdc);
|
||||||
#endif
|
sCmd.addCommand("ultrasonicCm", ultrasonicCm);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -44,11 +41,6 @@ void cmd_init() {
|
|||||||
|
|
||||||
sCmd.addCommand("timerStart", timerStart_);
|
sCmd.addCommand("timerStart", timerStart_);
|
||||||
sCmd.addCommand("timerStop", timerStop_);
|
sCmd.addCommand("timerStop", timerStop_);
|
||||||
|
|
||||||
#ifdef LEVEL_ENABLED
|
|
||||||
sCmd.addCommand("levelPr", levelPr);
|
|
||||||
sCmd.addCommand("ultrasonicCm", ultrasonicCm);
|
|
||||||
#endif
|
|
||||||
#ifdef DALLAS_ENABLED
|
#ifdef DALLAS_ENABLED
|
||||||
sCmd.addCommand("dallas", dallas);
|
sCmd.addCommand("dallas", dallas);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
//=========================================Модуль ультрозвукового дальномера==================================================================
|
//=========================================Модуль ультрозвукового дальномера==================================================================
|
||||||
//ultrasonic-cm;id;anydata;Сенсоры;Расстояние;order;pin[12,13];map[1,100,1,100];c[1]
|
//ultrasonic-cm;id;anydata;Сенсоры;Расстояние;order;pin[12,13];map[1,100,1,100];c[1]
|
||||||
//=========================================================================================================================================
|
//=========================================================================================================================================
|
||||||
|
SensorUltrasonic* mySensorUltrasonic;
|
||||||
void ultrasonicCm() {
|
void ultrasonicCm() {
|
||||||
mySensorUltrasonic = new SensorUltrasonic();
|
mySensorUltrasonic = new SensorUltrasonic();
|
||||||
mySensorUltrasonic->update();
|
mySensorUltrasonic->update();
|
||||||
|
|||||||
Reference in New Issue
Block a user