ise-senior-iot
/
iot-firmware
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Compare commits

base: ise-senior-iot:92c120eb6d9ac0187e3f929cb5b2f139c2469874
Branches Tags
ise-senior-iot:main
ise-senior-iot:ise
ise-senior-iot:new_ise
ise-senior-iot:ise_dbg
ise-senior-iot:ise-debug
ise-senior-iot:cud
ise-senior-iot:modbus
ise-senior-iot:lcd_upload
ise-senior-iot:homeassistant
ise-senior-iot:iot-ay2023
ise-senior-iot:smart-meeting
ise-senior-iot:core
ise-senior-iot:1.0
..
compare: ise-senior-iot:81c89dfe7a63687faf0869bc1008022bcc84c59f
Branches Tags
ise-senior-iot:ise
ise-senior-iot:main
ise-senior-iot:new_ise
ise-senior-iot:ise_dbg
ise-senior-iot:ise-debug
ise-senior-iot:cud
ise-senior-iot:modbus
ise-senior-iot:lcd_upload
ise-senior-iot:homeassistant
ise-senior-iot:iot-ay2023
ise-senior-iot:smart-meeting
ise-senior-iot:core
ise-senior-iot:1.0

No commits in common. "92c120eb6d9ac0187e3f929cb5b2f139c2469874" and "81c89dfe7a63687faf0869bc1008022bcc84c59f" have entirely different histories.
92c120eb6d ... 81c89dfe7a

3 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,4 +3,3 @@
.vscode/c_cpp_properties.json .vscode/c_cpp_properties.json
.vscode/launch.json .vscode/launch.json
.vscode/ipch .vscode/ipch
.vs/

2
src/user_code.cpp
View File

@ -6,7 +6,7 @@ Peripheral Initialization Routine
*/ */
void user_pre_init() void user_pre_init()
{ {
nexInit();
} }
/* /*

1
src/user_code.hpp
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <ESPMegaPRO.h> #include <ESPMegaPRO.h>
#include <Nextion.h>
#include <PubSubClient.h> #include <PubSubClient.h>
#include <PubSubClientTools.h> #include <PubSubClientTools.h>
#include "espmega_iot_timer.hpp" #include "espmega_iot_timer.hpp"