Merge pull request #95 from Lipotam/esp_dev

ESP8266 with nodemcu firmware was added
Lipotam · Apr 18, 2018 · 3f34377 · 3f34377
2 parents fa8cfeb + 9484291
commit 3f34377
Show file tree

Hide file tree

Showing 28 changed files with 513 additions and 322 deletions.
diff --git a/code/Arduino/config/Constants.cpp b/code/Arduino/config/Constants.cpp
@@ -53,6 +53,7 @@ const uint32_t Constants::kBluetoothSerialSpeed = 9600;
 // const uint8_t Constants::wifi_RX = 17;
 // const uint8_t Constants::wifi_TX = 16;
 const uint32_t Constants::kWifiSerialSpeed = 115200;
+const uint32_t Constants::kWifiHandshakeWaitMs = 30000;
 
 /* USB (Hardware Serial) */
 // const uint8_t Constants::usb_RX = 0;

diff --git a/code/Arduino/config/Constants.h b/code/Arduino/config/Constants.h
@@ -12,6 +12,7 @@ class Constants
  // static const uint8_t wifi_RX;
  // static const uint8_t wifi_TX;
  static const uint32_t kWifiSerialSpeed;
+ static const uint32_t kWifiHandshakeWaitMs;
 
  // static const uint8_t usb_RX;
  // static const uint8_t usb_TX;

diff --git a/code/Arduino/connection/Bluetooth.cpp b/code/Arduino/connection/Bluetooth.cpp
@@ -4,12 +4,14 @@
 
 bool Bluetooth::is_inited_ = false;
 
-Bluetooth::Bluetooth(unsigned long speed) : IConnector(&Serial3)
+#define MODULE_SERIAL Serial2
+
+Bluetooth::Bluetooth(unsigned long speed) : IConnector(&MODULE_SERIAL)
 {
  if (!is_inited_)
  {
  is_inited_ = true;
- Serial3.begin(speed);
+ MODULE_SERIAL.begin(speed);
  DisplayManager::get_manager()->init_connector(ConnectorEnum::bluetooth_connector);
  }
 }

diff --git a/code/Arduino/connection/DebugSerial.cpp b/code/Arduino/connection/DebugSerial.cpp
@@ -21,7 +21,7 @@ Stream* DebugSerial::get_serial()
  return serial_;
 }
 
-void DebugSerial::write_answer(uint8_t* answer_ptr, int length)
+void DebugSerial::write_answer(const uint8_t* answer_ptr, int length)
 {
  IConnector::write_answer(answer_ptr, length);
 }

diff --git a/code/Arduino/connection/DebugSerial.h b/code/Arduino/connection/DebugSerial.h
@@ -48,7 +48,7 @@ class DebugSerial : public IConnector
  *
  * @param answer_ptr String to send
  */
- void write_answer(uint8_t* answer_ptr, int length) override;
+ void write_answer(const uint8_t* answer_ptr, int length) override;
  /**
  * @brief Prints data string to debug console
  *

diff --git a/code/Arduino/connection/IConnector.cpp b/code/Arduino/connection/IConnector.cpp
@@ -18,11 +18,12 @@ IConnector::IConnector(int rx, int tx, unsigned long speed)
  device_->setTimeout(Constants::kCommandsWaitTime);
 }
 
-void IConnector::write_answer(uint8_t* answer_ptr, int length)
+void IConnector::write_answer(const uint8_t* answer_ptr, int length)
 {
+ const char* ptr = reinterpret_cast<const char*>(answer_ptr);
  for (int i = 0; i < length; ++i)
  {
- device_->print((reinterpret_cast<char*>(answer_ptr))[i]);
+ device_->print(ptr[i]);
  }
 }
 

diff --git a/code/Arduino/connection/IConnector.h b/code/Arduino/connection/IConnector.h
@@ -16,6 +16,6 @@ class IConnector
 
  virtual bool is_need_to_read_message();
  virtual int read_message(uint8_t* pointer, int max_length);
- virtual void write_answer(uint8_t* answer_ptr, int length);
+ virtual void write_answer(const uint8_t* answer_ptr, int length);
 };