diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 931738c..24a5039 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -8,29 +8,29 @@ { "name": "PlatformIO", "includePath": [ - "C:/Users/helgi/H26/ESP/Projects/ESP_Project2_H26/include", - "C:/Users/helgi/H26/ESP/Projects/ESP_Project2_H26/src", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/cores/arduino", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/variants/eightanaloginputs", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/libraries/EEPROM/src", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/libraries/HID/src", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/libraries/SPI/src", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/libraries/SoftwareSerial/src", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/libraries/Wire/src", + "C:/Users/isakt/Embedded/ESP_Project3_H26/include", + "C:/Users/isakt/Embedded/ESP_Project3_H26/src", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/cores/arduino", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/variants/eightanaloginputs", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/libraries/EEPROM/src", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/libraries/HID/src", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/libraries/SPI/src", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/libraries/SoftwareSerial/src", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/libraries/Wire/src", "" ], "browse": { "limitSymbolsToIncludedHeaders": true, "path": [ - "C:/Users/helgi/H26/ESP/Projects/ESP_Project2_H26/include", - "C:/Users/helgi/H26/ESP/Projects/ESP_Project2_H26/src", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/cores/arduino", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/variants/eightanaloginputs", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/libraries/EEPROM/src", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/libraries/HID/src", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/libraries/SPI/src", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/libraries/SoftwareSerial/src", - "C:/Users/helgi/.platformio/packages/framework-arduino-avr/libraries/Wire/src", + "C:/Users/isakt/Embedded/ESP_Project3_H26/include", + "C:/Users/isakt/Embedded/ESP_Project3_H26/src", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/cores/arduino", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/variants/eightanaloginputs", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/libraries/EEPROM/src", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/libraries/HID/src", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/libraries/SPI/src", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/libraries/SoftwareSerial/src", + "C:/Users/isakt/.platformio/packages/framework-arduino-avr/libraries/Wire/src", "" ] }, @@ -45,7 +45,7 @@ ], "cStandard": "gnu11", "cppStandard": "gnu++11", - "compilerPath": "C:/Users/helgi/.platformio/packages/toolchain-atmelavr/bin/avr-gcc.exe", + "compilerPath": "C:/Users/isakt/.platformio/packages/toolchain-atmelavr/bin/avr-gcc.exe", "compilerArgs": [ "-mmcu=atmega328p", "" diff --git a/.vscode/launch.json b/.vscode/launch.json index 120fa44..3a6caba 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,9 +12,9 @@ "type": "platformio-debug", "request": "launch", "name": "PIO Debug", - "executable": "C:/Users/helgi/H26/ESP/Projects/ESP_Project2_H26/.pio/build/nanoatmega328new/firmware.elf", + "executable": "C:/Users/isakt/Embedded/ESP_Project3_H26/.pio/build/nanoatmega328new/firmware.elf", "projectEnvName": "nanoatmega328new", - "toolchainBinDir": "C:/Users/helgi/.platformio/packages/toolchain-atmelavr/bin", + "toolchainBinDir": "C:/Users/isakt/.platformio/packages/toolchain-atmelavr/bin", "internalConsoleOptions": "openOnSessionStart", "preLaunchTask": { "type": "PlatformIO", @@ -25,18 +25,18 @@ "type": "platformio-debug", "request": "launch", "name": "PIO Debug (skip Pre-Debug)", - "executable": "C:/Users/helgi/H26/ESP/Projects/ESP_Project2_H26/.pio/build/nanoatmega328new/firmware.elf", + "executable": "C:/Users/isakt/Embedded/ESP_Project3_H26/.pio/build/nanoatmega328new/firmware.elf", "projectEnvName": "nanoatmega328new", - "toolchainBinDir": "C:/Users/helgi/.platformio/packages/toolchain-atmelavr/bin", + "toolchainBinDir": "C:/Users/isakt/.platformio/packages/toolchain-atmelavr/bin", "internalConsoleOptions": "openOnSessionStart" }, { "type": "platformio-debug", "request": "launch", "name": "PIO Debug (without uploading)", - "executable": "C:/Users/helgi/H26/ESP/Projects/ESP_Project2_H26/.pio/build/nanoatmega328new/firmware.elf", + "executable": "C:/Users/isakt/Embedded/ESP_Project3_H26/.pio/build/nanoatmega328new/firmware.elf", "projectEnvName": "nanoatmega328new", - "toolchainBinDir": "C:/Users/helgi/.platformio/packages/toolchain-atmelavr/bin", + "toolchainBinDir": "C:/Users/isakt/.platformio/packages/toolchain-atmelavr/bin", "internalConsoleOptions": "openOnSessionStart", "loadMode": "manual" } diff --git a/docs/diagrams/src/motor_state.wsd b/docs/diagrams/src/motor_state.wsd new file mode 100644 index 0000000..fea22e6 --- /dev/null +++ b/docs/diagrams/src/motor_state.wsd @@ -0,0 +1,28 @@ +@startuml + + +skinparam state { + BackgroundColor LightBlue +} + +[*] --> Initialization + +state Initialization + Initialization : Entry / Stop motor + Initialization : Do / Initialize internal parameters + Initialization : Do / Reset speed measurement + Initialization : Exit / Send Boot-up message + + + +state Operational + Operational : Entry / LED on + Operational : Do / Run speed controller + Operational : Exit / Stop motor + Operational : Exit / LED off + + +Initialization --> Operational : initialization complete +Operational --> Initialization : reset + +@enduml diff --git a/platformio.ini b/platformio.ini index 96d263e..be95bc9 100644 --- a/platformio.ini +++ b/platformio.ini @@ -13,4 +13,5 @@ platform = atmelavr board = nanoatmega328new framework = arduino -monitor_speed = 115200 \ No newline at end of file +monitor_speed = 115200 +