Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code cleanup #112

Merged
merged 8 commits into from
Sep 12, 2024
Merged

Code cleanup #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a65f667
Deleted unnecessary code from app module
novicatepic Sep 11, 2024
507f3f4
Tried to correct line break after binary operator error
novicatepic Sep 11, 2024
ac39d70
Fix line break before binary operator error
novicatepic Sep 11, 2024
fb0bf75
Data service code cleanup and commented out data service tests for now
novicatepic Sep 11, 2024
ab45ccd
Deleted sensor_devices, stats_service and test_stats_service unnecess…
novicatepic Sep 11, 2024
88dac93
Merge branch 'master' of https://github.com/sale3/iot-gateway-app int…
novicatepic Sep 11, 2024
8785c51
CAN modifications made
novicatepic Sep 11, 2024
370e0aa
Modified startup and shutdown script because sensor devices module is…
novicatepic Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions exe_script.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ echo Cloud App ready!

cd src

echo Starting Sensors Client...
start "Sensor Dispatcher" python.exe "sensor_devices.py"
echo Sensors Started!
echo Starting CAN Client...
start "CAN Dispatcher" python.exe "can_service.py"
echo CAN Started!

echo Starting IoT Gateway...
start "IoT Gateway" python.exe "app.py"
Expand Down
6 changes: 3 additions & 3 deletions shutdown_script.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title Windows Shutdown Script

set sensors_mosquitto_window_title=Sensors Mosquitto
set gateway_mosquitto_window_title=Gateway Mosquitto
set sensor_dispatcher_window_title=Sensor Dispatcher
set can_dispatcher_window_title=CAN Dispatcher
set cloud_window_title=Cloud App
set gateway_window_title=IoT Gateway
set rest_window_title=REST API
Expand All @@ -18,8 +18,8 @@ if %errorlevel% equ 0 ( echo %sensors_mosquitto_window_title% shut down! )
taskkill /FI "WINDOWTITLE eq %gateway_mosquitto_window_title%" /F >nul 2>&1
if %errorlevel% equ 0 ( echo %gateway_mosquitto_window_title% shut down! )

taskkill /FI "WINDOWTITLE eq %sensor_dispatcher_window_title%" /F >nul 2>&1
if %errorlevel% equ 0 ( echo %sensor_dispatcher_window_title% shut down! )
taskkill /FI "WINDOWTITLE eq %can_dispatcher_window_title%" /F >nul 2>&1
if %errorlevel% equ 0 ( echo %can_dispatcher_window_title% shut down! )

taskkill /FI "WINDOWTITLE eq %cloud_window_title%" /F >nul 2>&1
if %errorlevel% equ 0 ( echo %cloud_window_title% shut down! )
Expand Down
Loading
Loading