diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index e80666bf..00000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - // See http://go.microsoft.com/fwlink/?LinkId=827846 - // for the documentation about the extensions.json format - "recommendations": [ - "platformio.platformio-ide" - ] -} diff --git a/include/Cmd.h b/include/Cmd.h index 1ee09fd5..948440d3 100644 --- a/include/Cmd.h +++ b/include/Cmd.h @@ -1,12 +1,14 @@ #pragma once -extern void cmd_init(); + #include +extern void cmd_init(); + extern void sensorsInit(); -extern void levelPr(); -extern void ultrasonicCm(); -extern void ultrasonic_reading(); +//extern void levelPr(); +//extern void ultrasonicCm(); +//extern void ultrasonic_reading(); extern void analog_reading1(); extern void analog_reading2(); diff --git a/src/Cmd.cpp b/src/Cmd.cpp index a152627f..eeea2695 100644 --- a/src/Cmd.cpp +++ b/src/Cmd.cpp @@ -1,7 +1,5 @@ #include "Cmd.h" - #include "items/itemsGlobal.h" -//#include "Class/LineParsing.h" #include "Class/NotAsinc.h" #include "Global.h" #include "Module/Terminal.h" @@ -31,9 +29,8 @@ void cmd_init() { sCmd.addCommand("input-time", inputTime); sCmd.addCommand("output-text", textOut); -#ifdef ANALOG_ENABLED sCmd.addCommand("analog-adc", analogAdc); -#endif + sCmd.addCommand("ultrasonicCm", ultrasonicCm); @@ -44,11 +41,6 @@ void cmd_init() { sCmd.addCommand("timerStart", timerStart_); sCmd.addCommand("timerStop", timerStop_); - -#ifdef LEVEL_ENABLED - sCmd.addCommand("levelPr", levelPr); - sCmd.addCommand("ultrasonicCm", ultrasonicCm); -#endif #ifdef DALLAS_ENABLED sCmd.addCommand("dallas", dallas); #endif diff --git a/src/items/SensorUltrasonicClass.cpp b/src/items/SensorUltrasonicClass.cpp index 6d182f5a..ac8e84ac 100644 --- a/src/items/SensorUltrasonicClass.cpp +++ b/src/items/SensorUltrasonicClass.cpp @@ -4,6 +4,7 @@ //=========================================Модуль ультрозвукового дальномера================================================================== //ultrasonic-cm;id;anydata;Сенсоры;Расстояние;order;pin[12,13];map[1,100,1,100];c[1] //========================================================================================================================================= +SensorUltrasonic* mySensorUltrasonic; void ultrasonicCm() { mySensorUltrasonic = new SensorUltrasonic(); mySensorUltrasonic->update();