Big disastrous commit trying to get PlatformIO example working with l…

…ibrary configured instead of including as source.

Components/Device/examples/uDAQC_Configure/.gitignore

@@ -1,7 +1,8 @@
 .pio
+.vscode
 .pioenvs
 .piolibdeps
 .clang_complete
 .gcc-flags.json
 /src/Certificate/key.h
-/src/Certificate/x509.h
+/src/Certificate/x509.h

Components/Device/examples/uDAQC_Configure/platformio.ini

@@ -42,7 +42,7 @@
 default_envs = nodemcu
 
 [env:nodemcu]
-lib_extra_dirs = ../../libraries/, /home/tyler/Dropbox/My Programs/PlatformIO/Libraries/Third Party/
+lib_extra_dirs = /home/tyler/Dropbox/My Programs/Git Repositories/uDAQC/Components/Device/src, /home/tyler/Dropbox/My Programs/PlatformIO/Libraries/Third Party/
 platform = espressif8266
 ;platform = https://github.com/platformio/platform-espressif8266.git ;this is the upstream version
 board = nodemcuv2

Components/Device/examples/uDAQC_Template/.gitignore

@@ -1,4 +1,5 @@
 .pio
+.vscode
 .pioenvs
 .piolibdeps
 .clang_complete

Components/Device/examples/uDAQC_Template/include/Certificate/key.h

@@ -0,0 +1,30 @@
+
+  0x30, 0x82, 0x01, 0x39, 0x02, 0x01, 0x00, 0x02, 0x41, 0x00, 0xaa, 0x42,
+  0xa0, 0x0b, 0xeb, 0x74, 0xdd, 0x90, 0x71, 0xec, 0x3b, 0xad, 0x3b, 0xcf,
+  0x8c, 0x78, 0x00, 0x0e, 0x69, 0x13, 0xcc, 0xc2, 0xe6, 0x54, 0x7e, 0xd2,
+  0xb7, 0x8f, 0xbd, 0x5b, 0x05, 0xac, 0x2c, 0xf0, 0x20, 0xb8, 0x87, 0x35,
+  0xf6, 0xd2, 0xf0, 0x3e, 0x5a, 0x57, 0xe0, 0x57, 0x2d, 0x18, 0x2b, 0x8d,
+  0xd0, 0xe1, 0xa0, 0x1a, 0x1c, 0xe1, 0x68, 0x30, 0xdf, 0x2f, 0xfa, 0x7e,
+  0x99, 0xf3, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02, 0x40, 0x19, 0x31, 0xd6,
+  0xc1, 0x2c, 0xcc, 0x94, 0x64, 0xe5, 0x96, 0xd1, 0x95, 0xe6, 0xfd, 0xe5,
+  0x89, 0x74, 0x68, 0xad, 0x7f, 0xf2, 0x92, 0xfc, 0xc6, 0x90, 0x25, 0xda,
+  0x67, 0xf8, 0xdb, 0x59, 0x51, 0x4d, 0x5f, 0x6c, 0xd2, 0xdd, 0xc7, 0x73,
+  0xad, 0x61, 0xf1, 0x38, 0xed, 0xea, 0xb4, 0xa3, 0xd7, 0xb0, 0xa8, 0x55,
+  0x29, 0x3c, 0xf3, 0xba, 0x53, 0x23, 0x87, 0x3d, 0x63, 0xac, 0x1a, 0x82,
+  0x51, 0x02, 0x21, 0x00, 0xd5, 0x5e, 0xbb, 0x6d, 0xcb, 0x5a, 0xfb, 0x48,
+  0xbc, 0x33, 0x17, 0x87, 0x0d, 0x61, 0x1c, 0xff, 0x35, 0xc3, 0xe0, 0x91,
+  0xa9, 0xdc, 0x35, 0x99, 0x54, 0xc8, 0xd3, 0xb3, 0xd1, 0x42, 0xcd, 0x6d,
+  0x02, 0x21, 0x00, 0xcc, 0x46, 0xf3, 0x4d, 0x17, 0xf9, 0x24, 0x7c, 0x7c,
+  0x9e, 0xcc, 0x5e, 0x2a, 0x0e, 0xa6, 0x8d, 0x84, 0x55, 0x44, 0x95, 0x62,
+  0x2e, 0x4b, 0x9e, 0xed, 0x2c, 0x5c, 0xec, 0x34, 0x43, 0x48, 0xdf, 0x02,
+  0x20, 0x0f, 0x50, 0x9d, 0x63, 0x64, 0x15, 0x43, 0xb4, 0x14, 0xce, 0x16,
+  0x02, 0x3b, 0x93, 0x9c, 0xe1, 0x34, 0x9a, 0xba, 0xa3, 0xb9, 0xed, 0x74,
+  0x6b, 0x6d, 0x0a, 0x7d, 0x27, 0x8a, 0xfd, 0xa0, 0x81, 0x02, 0x20, 0x37,
+  0xaa, 0x81, 0xf4, 0x99, 0x3a, 0xd0, 0x61, 0x88, 0x08, 0x32, 0x02, 0xdb,
+  0x0d, 0x20, 0xff, 0xe1, 0x76, 0xe6, 0xf8, 0x9a, 0x47, 0xa9, 0x5d, 0xc6,
+  0x9d, 0xd7, 0x38, 0x9a, 0xc9, 0x57, 0x1b, 0x02, 0x20, 0x3c, 0x1f, 0xd8,
+  0x11, 0x8b, 0x07, 0x62, 0x8e, 0x96, 0x8f, 0xe4, 0xa3, 0x73, 0xd9, 0x4d,
+  0x47, 0x67, 0x61, 0xf3, 0x6c, 0x01, 0x3b, 0x0d, 0xbb, 0x4a, 0x8d, 0x93,
+  0x90, 0x8f, 0x71, 0x11, 0x1f
+
+

Components/Device/examples/uDAQC_Template/include/Certificate/x509.h

@@ -0,0 +1,32 @@
+
+  0x30, 0x82, 0x01, 0x52, 0x30, 0x81, 0xfd, 0x02, 0x14, 0x7a, 0x12, 0xd8,
+  0x1f, 0x55, 0xd2, 0x6a, 0xe7, 0x3b, 0x3d, 0x30, 0x89, 0x6b, 0x33, 0x1c,
+  0x16, 0xb3, 0x3f, 0x63, 0x20, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48,
+  0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x2a, 0x31, 0x14,
+  0x30, 0x12, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x0b, 0x54, 0x79, 0x6c,
+  0x65, 0x72, 0x20, 0x4d, 0x6f, 0x6f, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10,
+  0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x09, 0x31, 0x32, 0x37, 0x2e, 0x30,
+  0x2e, 0x30, 0x2e, 0x31, 0x30, 0x20, 0x17, 0x0d, 0x31, 0x39, 0x30, 0x39,
+  0x31, 0x38, 0x31, 0x35, 0x34, 0x33, 0x34, 0x38, 0x5a, 0x18, 0x0f, 0x32,
+  0x31, 0x35, 0x36, 0x30, 0x38, 0x31, 0x30, 0x31, 0x35, 0x34, 0x33, 0x34,
+  0x38, 0x5a, 0x30, 0x2a, 0x31, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x04,
+  0x0a, 0x0c, 0x0b, 0x54, 0x79, 0x6c, 0x65, 0x72, 0x20, 0x4d, 0x6f, 0x6f,
+  0x72, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c,
+  0x09, 0x31, 0x32, 0x37, 0x2e, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x30, 0x5c,
+  0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
+  0x01, 0x05, 0x00, 0x03, 0x4b, 0x00, 0x30, 0x48, 0x02, 0x41, 0x00, 0xaa,
+  0x42, 0xa0, 0x0b, 0xeb, 0x74, 0xdd, 0x90, 0x71, 0xec, 0x3b, 0xad, 0x3b,
+  0xcf, 0x8c, 0x78, 0x00, 0x0e, 0x69, 0x13, 0xcc, 0xc2, 0xe6, 0x54, 0x7e,
+  0xd2, 0xb7, 0x8f, 0xbd, 0x5b, 0x05, 0xac, 0x2c, 0xf0, 0x20, 0xb8, 0x87,
+  0x35, 0xf6, 0xd2, 0xf0, 0x3e, 0x5a, 0x57, 0xe0, 0x57, 0x2d, 0x18, 0x2b,
+  0x8d, 0xd0, 0xe1, 0xa0, 0x1a, 0x1c, 0xe1, 0x68, 0x30, 0xdf, 0x2f, 0xfa,
+  0x7e, 0x99, 0xf3, 0x02, 0x03, 0x01, 0x00, 0x01, 0x30, 0x0d, 0x06, 0x09,
+  0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03,
+  0x41, 0x00, 0xa5, 0xe1, 0xc3, 0x17, 0xff, 0x67, 0x61, 0x47, 0xb9, 0x6b,
+  0xd2, 0xc7, 0x1c, 0x1e, 0xfc, 0x31, 0x68, 0x10, 0x5b, 0xbb, 0xcc, 0x6f,
+  0xd8, 0x61, 0x30, 0xfa, 0xb1, 0x85, 0x1b, 0xd6, 0x75, 0x66, 0x29, 0x1c,
+  0x75, 0x04, 0xc9, 0xa6, 0x18, 0x9e, 0xb5, 0x53, 0xcd, 0xe4, 0xd1, 0x89,
+  0xc3, 0x0f, 0xce, 0x0c, 0x55, 0xc4, 0x07, 0xcb, 0x57, 0x26, 0x99, 0xb7,
+  0xfd, 0xaa, 0x72, 0x06, 0x11, 0xab
+
+

Components/Device/examples/uDAQC_Template/platformio.ini

@@ -42,7 +42,8 @@
 default_envs = nodemcu
 
 [env:nodemcu]
-lib_extra_dirs = ../../libraries/, /home/tyler/Dropbox/My Programs/PlatformIO/Libraries/Third Party/
+lib_deps =  
+  uDAQC ; to work with development library, just put a symlinc to the library folder in pio global storage and run "pio lib install" for this project; changes will be available to linker and compiler immediately without update
 platform = espressif8266
 ;platform = https://github.com/platformio/platform-espressif8266.git ;this is the upstream version
 board = nodemcuv2
@@ -59,6 +60,7 @@ build_flags =
   -D DEBUG_UDAQC ; comment out to get rid of debug output
   -D ROUND_WORKAROUND ; workaround for Arduino.h problem, see https://github.com/esp8266/Arduino/issues/5787
   -DNDEBUG
+  echo pio lib update ; for development, update the uDAQC library every update
 upload_speed = 921600 ;can be 115200, 921600
 
 [env:thing]

Components/Device/examples/uDAQC_Template/src/main.cpp → Components/Device/examples/uDAQC_Template/src/template.cpp

@@ -1,4 +1,4 @@
-#include <uDAQC.h>
+#include "uDAQC.h"
 #include <cmath>
 
 UDAQC::IO::IO_System system1("System 1");

Components/Device/library.json

@@ -13,10 +13,10 @@
         "url": "https://github.com/overtone1000/uDAQC.git"
     },
     "include": "Components/Device",
-    "version": "0.2.4",
     "export": {
         "include": "uDAQC"
     },
+    "version": "0.2.4",
     "frameworks": "arduino",
     "platforms": "esp8266"
-}
+}

Components/Device/src/FileSystem/FileSystem.h

@@ -2,6 +2,7 @@
 #define ESP_FileSystem_h
 
 #include <FS.h>
+#include "../ESP_Utilities/ESP_Utilities.h"
 #include <ESP8266WiFiMulti.h>
 
 namespace UDAQC

Components/Device/src/IO/IO.cpp

@@ -55,13 +55,13 @@ namespace IO
 
 #include "Devices/TCP/CommandCodec.cpp"
 
-#include "Devices/@Bases/IO_Node.cpp"
-#include "Devices/@Bases/IO_Group.cpp"
-#include "Devices/@Bases/IO_Timestamp.cpp"
-#include "Devices/@Bases/IO_System.cpp"
+#include "Devices/Bases/IO_Node.cpp"
+#include "Devices/Bases/IO_Group.cpp"
+#include "Devices/Bases/IO_Timestamp.cpp"
+#include "Devices/Bases/IO_System.cpp"
 
 //#include "Devices/@Bases/IO_SaveableValue.cpp"
 
-#include "Devices/$Implementations/ESP_Internals/ESP_Internals.cpp"
-#include "Devices/$Implementations/BinarySwitch/BinarySwitch.cpp"
-#include "Devices/$Implementations/PID/PID.cpp"
+#include "Devices/Implementations/ESP_Internals/ESP_Internals.cpp"
+#include "Devices/Implementations/BinarySwitch/BinarySwitch.cpp"
+#include "Devices/Implementations/PID/PID.cpp"

Components/Device/src/IO/IO.h

@@ -55,7 +55,7 @@ namespace IO
 
 #include "Devices/TCP/CommandCodec.h"
 
-#include "Devices/@Bases/IO_System.h"
+#include "Devices/Bases/IO_System.h"
 
 namespace UDAQC
 {
@@ -64,11 +64,11 @@ namespace UDAQC
   extern const char* IOpanel_path;
 }};
 
-#include "Devices/@Bases/IO_SaveableValue.h"
+#include "Devices/Bases/IO_SaveableValue.h"
 
 //Then derived classes
-#include "Devices/$Implementations/ESP_Internals/ESP_Internals.h"
-#include "Devices/$Implementations/BinarySwitch/BinarySwitch.h"
-#include "Devices/$Implementations/PID/PID.h"
+#include "Devices/Implementations/ESP_Internals/ESP_Internals.h"
+#include "Devices/Implementations/BinarySwitch/BinarySwitch.h"
+#include "Devices/Implementations/PID/PID.h"
 
 #endif

Components/Device/src/uDAQC.cpp

@@ -2,8 +2,8 @@
 
 #include "IO/IO.cpp"
 #include "Network/Network.cpp"
-#include "FileSystem/FileSystem.cpp"
 #include "ESP_Utilities/ESP_Utilities.cpp"
+#include "FileSystem/FileSystem.cpp"
 
 namespace UDAQC {
 	void Initialize(String device_name, Network::SecurityBundle bundle)

Documentation/Development To-Do.md

@@ -13,11 +13,12 @@
 
 ## Documentation
 * Improve README.md.
+* Add instructions for creating Device key using shell script.
 
 ## Deployment
 * Move deployment directory to main repository directory
 * Separate Center deployment into a separate deploy subdirectory
 * Include Arduino library in deployment directory
 
 ## Deferred
-* Can't put library on Arduino Library Manager (https://github.com/arduino/Arduino/wiki/Library-Manager-FAQ) because the whole git repository must be dedicated to that library only.
+* Can't put library on Arduino Library Manager (https://github.com/arduino/Arduino/wiki/Library-Manager-FAQ) because the whole git repository must be dedicated to that library only.