Merge pull request #445 from openxc/modem_configuration

Change the json.cpp to correctly send modem_configuration command. A…
openxc · Mar 24, 2020 · b738b6b · b738b6b
2 parents 0e1daee + ea028cc
commit b738b6b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/payload/json.cpp b/src/payload/json.cpp
@@ -448,19 +448,19 @@ static void deserializeModemConfiguration(cJSON* root, openxc_ControlCommand* co
     // set up the struct for a modem configuration message
     command->type = openxc_ControlCommand_Type_MODEM_CONFIGURATION;
     openxc_ModemConfigurationCommand* modemConfigurationCommand = &command->modem_configuration_command;
-
+    // Keeping if statement commented out, was used for a depricated way to deserialize Modem Configuration.
     // parse server command
-    cJSON* server = cJSON_GetObjectItem(root, "server");
-    if(server != NULL) {
-        cJSON* host = cJSON_GetObjectItem(server, "host");
+    // cJSON* server = cJSON_GetObjectItem(root, "server");
+    // if(server != NULL) {
+        cJSON* host = cJSON_GetObjectItem(root, "host");
         if(host != NULL) {
             strcpy(modemConfigurationCommand->serverConnectSettings.host, host->valuestring);
         }
-        cJSON* port = cJSON_GetObjectItem(server, "port");
+        cJSON* port = cJSON_GetObjectItem(root, "port");
         if(port != NULL) {
             modemConfigurationCommand->serverConnectSettings.port = port->valueint;
         }
-    }
+    // }
 }
 
 static void deserializeRTCConfiguration(cJSON* root, openxc_ControlCommand* command) {

diff --git a/src/platform/pic32/log.cpp b/src/platform/pic32/log.cpp
@@ -15,6 +15,8 @@ void openxc::util::log::initialize() {
         Serial.begin(115200);
 #elif defined(CROSSCHASM_C5_BT)
         return; //Serial.begin(115200);
+#elif defined(CROSSCHASM_C5_CELLULAR)
+        Serial.begin(115200);
 #else 
         Serial2.begin(115200);
 #endif
@@ -26,6 +28,8 @@ void openxc::util::log::debugUart(const char* message) {
         Serial.print(message);
 #elif defined(CROSSCHASM_C5_BT)
         return;//Serial.print(message);
+#elif defined(CROSSCHASM_C5_CELLULAR)
+        Serial.print(message);
 #else 
         Serial2.print(message);
 #endif

diff --git a/src/platform/pic32/usb.cpp b/src/platform/pic32/usb.cpp
@@ -146,7 +146,7 @@ void openxc::interface::usb::processSendQueue(UsbDevice* usbDevice) {
         UsbEndpoint* endpoint = &usbDevice->endpoints[i];
 
         // Don't touch usbDevice->sendBuffer if there's still a pending transfer
-        if(!waitForHandle(usbDevice, endpoint)) {
+        if(waitForHandle(usbDevice, endpoint)) {
             return;
         }