Merge branch 'master' of https://github.com/FujiNetWIFI/fujinet-platf…

…ormio

lib/bus/sio/sio.cpp

@@ -226,7 +226,11 @@ void systemBus::_sio_process_cmd()
  if (it != _daisyChain.end())
  {
  _activeDev = it->second;
+ // heap_trace_start(HEAP_TRACE_LEAKS);
  it->second->sio_process(tempFrame.commanddata, tempFrame.checksum);
+ // heap_trace_stop();
+ // Debug_printv("heap trace follows.");
+ // heap_trace_dump();
  }
  }
  }

lib/device/rs232/modem.cpp

@@ -160,9 +160,6 @@ void rs232Modem::rs232_poll_3(uint8_t device, uint8_t aux1, uint8_t aux2)
  if (respond == false)
  return;
 
- // Get size of handler
- int filesize = fnSystem.load_firmware(FIRMWARE_850HANDLER, NULL);
-
  // Simply return (without ACK) if we failed to get this
  if (filesize < 0)
  return;
@@ -258,7 +255,6 @@ void rs232Modem::rs232_send_firmware(uint8_t loadcommand)
 
  // Load firmware from file
  uint8_t *code;
- int codesize = fnSystem.load_firmware(firmware, &code);
  // NAK if we failed to get this
  if (codesize < 0 || code == NULL)
  {

lib/device/sio/fuji.cpp

@@ -1868,4 +1868,4 @@ std::string sioFuji::get_host_prefix(int host_slot)
  return _fnHosts[host_slot].get_prefix();
 }
 
-#endif /* BUILD_ATARI */
+#endif /* BUILD_ATARI */

lib/device/sio/network.cpp

@@ -190,15 +190,15 @@ void sioNetwork::sio_close()
  else
  sio_complete();
 
- Debug_printf("Before protocol delete %lu\n",esp_get_free_heap_size());
+ Debug_printv("Before protocol delete %lu\n",esp_get_free_internal_heap_size());
  // Delete the protocol object
  delete protocol;
  protocol = nullptr;
 
  if (json != nullptr)
  delete json;
 
- Debug_printf("After protocol delete %lu\n",esp_get_free_heap_size());
+ Debug_printv("After protocol delete %lu\n",esp_get_free_internal_heap_size());
 }
 
 /**
@@ -245,6 +245,7 @@ void sioNetwork::sio_read()
  // And send off to the computer
  bus_to_computer((uint8_t *)receiveBuffer->data(), num_bytes, err);
  receiveBuffer->erase(0, num_bytes);
+ receiveBuffer->shrink_to_fit();
 }
 
 /**

lib/fnjson/fnjson.cpp

@@ -40,7 +40,7 @@ FNJSON::~FNJSON()
 /**
  * Specify line ending
  */
-void FNJSON::setLineEnding(string _lineEnding)
+void FNJSON::setLineEnding(const string &_lineEnding)
 {
  lineEnding = _lineEnding;
 }
@@ -57,12 +57,12 @@ void FNJSON::setProtocol(NetworkProtocol *newProtocol)
 /**
  * Set read query string
  */
-void FNJSON::setReadQuery(string queryString, uint8_t queryParam)
+void FNJSON::setReadQuery(const string &queryString, uint8_t queryParam)
 {
  _queryString = queryString;
  _queryParam = queryParam;
  _item = resolveQuery();
- json_bytes_remaining=readValueLen();
+ json_bytes_remaining = readValueLen();
 }
 
 /**
@@ -88,9 +88,8 @@ string FNJSON::processString(string in)
 
  if (endpos != string::npos)
  {
- in.erase(startpos,endpos-startpos);
+ in.erase(startpos, endpos - startpos);
  }
-
  }
 
 #ifdef BUILD_IEC
@@ -105,78 +104,74 @@ string FNJSON::processString(string in)
  */
 string FNJSON::getValue(cJSON *item)
 {
+ stringstream ss;
+
  if (cJSON_IsString(item))
  {
- stringstream ss;
 
- Debug_printf("S: [cJSON_IsString] %s\r\n",cJSON_GetStringValue(item));
+ Debug_printf("S: [cJSON_IsString] %s\r\n", cJSON_GetStringValue(item));
 
- ss << cJSON_GetStringValue(item);
-
- #ifdef BUILD_ATARI
+#ifdef BUILD_ATARI
 
  // SIO AUX bits 0+1 control the mapping
  // Bit 0=0 - don't touch the characters
  // Bit 0=1 - convert the characters when possible
  // Bit 1=0 - convert to generic ASCII/ATASCII (no font change needed)
  // Bit 1=1 - convert to ATASCII international charset (need to be switched on ATARI, i.e via POKE 756,204)
- 
+
  // SIO AUX2 Bit 1 set?
  if ((_queryParam & 1) != 0)
  {
  // yes, map special characters
- string str_utf8mapping = ss.str(); 
+ string str_utf8mapping = ss.str();
  Debug_printf("S: [Mapping->ATARI]\r\n");
 
  // SIO AUX2 Bit 2 set?
  if ((_queryParam & 2) != 0)
  {
  // yes, mapping to international charset
- string mapFrom[] =  { "á",  "ù",  "Ñ",  "É",  "ç",  "ô",  "ò",  "ì",  "£",  "ï",  "ü",  "ä",  "Ö",  "ú",  "ó",  "ö",  "Ü",  "â",  "û",  "î",  "é",  "è",  "ñ",  "ê",  "å",  "à",  "Å",  "¡",  "Ä",  "ß" };
- string mapTo[] =  { "\x00", "\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\x09", "\x0a", "\x0b", "\x0c", "\x0d", "\x0e", "\x0f", "\x10", "\x11", "\x12", "\x13", "\x14", "\x15", "\x16", "\x17", "\x18", "\x19", "\x1a", "\x60", "\x7b", "ss" };
- int elementCount = sizeof(mapFrom)/sizeof(mapFrom[0]);
- for (int elementIndex=0; elementIndex < elementCount; elementIndex++)
- if(str_utf8mapping.find(mapFrom[elementIndex]) != std::string::npos) 
+ string mapFrom[] = {"á", "ù", "Ñ", "É", "ç", "ô", "ò", "ì", "£", "ï", "ü", "ä", "Ö", "ú", "ó", "ö", "Ü", "â", "û", "î", "é", "è", "ñ", "ê", "å", "à", "Å", "¡", "Ä", "ß"};
+ string mapTo[] = {"\x00", "\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\x09", "\x0a", "\x0b", "\x0c", "\x0d", "\x0e", "\x0f", "\x10", "\x11", "\x12", "\x13", "\x14", "\x15", "\x16", "\x17", "\x18", "\x19", "\x1a", "\x60", "\x7b", "ss"};
+ int elementCount = sizeof(mapFrom) / sizeof(mapFrom[0]);
+ for (int elementIndex = 0; elementIndex < elementCount; elementIndex++)
+ if (str_utf8mapping.find(mapFrom[elementIndex]) != std::string::npos)
  str_utf8mapping.replace(str_utf8mapping.find(mapFrom[elementIndex]), string(mapFrom[elementIndex]).size(), mapTo[elementIndex]);
  }
  else
  {
  // no, mapping to normal ASCI (workaround)
- string mapFrom[] =  { "Ä",  "Ö",  "Ü",  "ä",  "ö",  "ü",  "ß",  "é", "è", "á", "à", "ó", "ò", "ú", "ù" };
- string mapTo[] =  { "Ae", "Oe", "Ue", "ae", "oe", "ue", "ss", "e", "e", "a", "a", "o", "o", "u", "u" };
- int elementCount = sizeof(mapFrom)/sizeof(mapFrom[0]);
- for (int elementIndex=0; elementIndex < elementCount; elementIndex++)
- if(str_utf8mapping.find(mapFrom[elementIndex]) != std::string::npos) 
+ string mapFrom[] = {"Ä", "Ö", "Ü", "ä", "ö", "ü", "ß", "é", "è", "á", "à", "ó", "ò", "ú", "ù"};
+ string mapTo[] = {"Ae", "Oe", "Ue", "ae", "oe", "ue", "ss", "e", "e", "a", "a", "o", "o", "u", "u"};
+ int elementCount = sizeof(mapFrom) / sizeof(mapFrom[0]);
+ for (int elementIndex = 0; elementIndex < elementCount; elementIndex++)
+ if (str_utf8mapping.find(mapFrom[elementIndex]) != std::string::npos)
  str_utf8mapping.replace(str_utf8mapping.find(mapFrom[elementIndex]), string(mapFrom[elementIndex]).size(), mapTo[elementIndex]);
  }
 
  ss.str(str_utf8mapping);
- Debug_printf("S: [Mapping->ATARI] %s\r\n",ss.str().c_str());
+ Debug_printf("S: [Mapping->ATARI] %s\r\n", ss.str().c_str());
  }
- #endif
-
- return processString(ss.str() + lineEnding);
+#endif
+ ss << processString(cJSON_GetStringValue(item) + lineEnding);
  }
  else if (cJSON_IsBool(item))
  {
- Debug_printf("S: [cJSON_IsBool] %s\r\n",cJSON_IsTrue(item) ? "true" : "false");
+ Debug_printf("S: [cJSON_IsBool] %s\r\n", cJSON_IsTrue(item) ? "true" : "false");
 
  if (cJSON_IsTrue(item))
- return "TRUE" + lineEnding;
+ ss << "TRUE" + lineEnding;
  else if (cJSON_IsFalse(item))
- return "FALSE" + lineEnding;
+ ss << "FALSE" + lineEnding;
  }
  else if (cJSON_IsNull(item))
  {
  Debug_printf("S: [cJSON_IsNull]\r\n");
 
- return "NULL" + lineEnding;
+ ss << "NULL" + lineEnding;
  }
  else if (cJSON_IsNumber(item))
  {
- stringstream ss;
-
- Debug_printf("S: [cJSON_IsNumber] %f\r\n",cJSON_GetNumberValue(item));
+ Debug_printf("S: [cJSON_IsNumber] %f\r\n", cJSON_GetNumberValue(item));
 
  // Is the number an integer?
  if (floor(cJSON_GetNumberValue(item)) == cJSON_GetNumberValue(item))
@@ -187,51 +182,43 @@ string FNJSON::getValue(cJSON *item)
  else
  {
  // no, return as double with max. 10 digits
- ss << setprecision(10)<<cJSON_GetNumberValue(item);
+ ss << setprecision(10) << cJSON_GetNumberValue(item);
  }
 
- return ss.str() + lineEnding;
+ ss << lineEnding;
  }
  else if (cJSON_IsObject(item))
  {
- string ret = "";
-
  item = item->child;
 
  do
  {
- ret += string(item->string) + lineEnding + getValue(item);
+ ss << item->string + lineEnding + getValue(item);
  } while ((item = item->next) != NULL);
-
- return ret;
  }
  else if (cJSON_IsArray(item))
  {
  cJSON *child = item->child;
- string ret;
-
  do
  {
- ret += getValue(child);
+ ss << getValue(child);
  } while ((child = child->next) != NULL);
-
- return ret;
  }
-
- return "UNKNOWN" + lineEnding;
+ else
+ ss << "UNKNOWN" + lineEnding;
+
+ return ss.str();
 }
 
 /**
  * Return requested value
  */
 bool FNJSON::readValue(uint8_t *rx_buf, unsigned short len)
-{
+{ 
  if (_item == nullptr)
  return true; // error
 
- string ret = getValue(_item);
-
- memcpy(rx_buf, ret.data(), len);
+ memcpy(rx_buf, getValue(_item).data(), len);
 
  return false; // no error.
 }
@@ -253,7 +240,6 @@ int FNJSON::readValueLen()
 bool FNJSON::parse()
 {
  NetworkStatus ns;
- _parseBuffer.clear();
 
  if (_json != nullptr)
  cJSON_Delete(_json);
@@ -275,7 +261,7 @@ bool FNJSON::parse()
  vTaskDelay(10);
  }
 
- Debug_printf("S: %s\r\n",_parseBuffer.c_str());
+ Debug_printf("S: %s\r\n", _parseBuffer.c_str());
  _json = cJSON_Parse(_parseBuffer.c_str());
 
  if (_json == nullptr)
@@ -284,18 +270,12 @@ bool FNJSON::parse()
  return false;
  }
 
- char* debugOutput = cJSON_Print(_json);
- if (debugOutput != nullptr) {
- Debug_printf("Parsed JSON: %s\r\n", debugOutput);
- cJSON_free(debugOutput); 
- }
-
  return true;
 }
 
 bool FNJSON::status(NetworkStatus *s)
 {
- Debug_printf("FNJSON::status(%u) %s\r\n",json_bytes_remaining,getValue(_item).c_str());
+ Debug_printf("FNJSON::status(%u) %s\r\n", json_bytes_remaining, getValue(_item).c_str());
  s->connected = true;
  s->rxBytesWaiting = json_bytes_remaining;
  s->error = json_bytes_remaining == 0 ? 136 : 0;

lib/fnjson/fnjson.h

@@ -19,9 +19,9 @@ class FNJSON
  FNJSON();
  virtual ~FNJSON();
 
- void setLineEnding(string _lineEnding);
+ void setLineEnding(const string &_lineEnding);
  void setProtocol(NetworkProtocol *newProtocol);
- void setReadQuery(string queryString, uint8_t queryParam);
+ void setReadQuery(const string &queryString, uint8_t queryParam);
  cJSON *resolveQuery();
  bool status(NetworkStatus *status);
 

lib/ftp/fnFTP.cpp

@@ -652,7 +652,7 @@ fnFTP::~fnFTP()
  delete data;
 }
 
-bool fnFTP::login(string _username, string _password, string _hostname, unsigned short _port)
+bool fnFTP::login(const string &_username, const string &_password, const string &_hostname, unsigned short _port)
 {
  username = _username;
  password = _password;

lib/ftp/fnFTP.h

@@ -42,7 +42,7 @@ class fnFTP
  * @param port port to login (default 21)
  * @return TRUE on error, FALSE on success
  */
- bool login(string _username, string _password, string _hostname, unsigned short _port = 21);
+ bool login(const string &_username, const string &_password, const string &_hostname, unsigned short _port = 21);
 
  /**
  * Log out of FTP server, closes control connection.

lib/hardware/fnSystem.cpp

@@ -527,9 +527,9 @@ uint32_t SystemManager::get_psram_size()
 
 /*
  If buffer is NULL, simply returns size of file. Otherwise
- allocates buffer for reading file contents. Buffer must be freed by caller.
+ allocates buffer for reading file contents. Buffer must be managed by caller.
 */
-int SystemManager::load_firmware(const char *filename, uint8_t **buffer)
+int SystemManager::load_firmware(const char *filename, uint8_t *buffer)
 {
  Debug_printf("load_firmware '%s'\r\n", filename);
 
@@ -551,25 +551,13 @@ int SystemManager::load_firmware(const char *filename, uint8_t **buffer)
  }
 
  int bytes_read = -1;
- uint8_t *result = (uint8_t *)malloc(file_size);
- if (result == NULL)
+ if (buffer == NULL)
  {
- Debug_println("load_firmware failed to malloc");
+ Debug_println("load_firmware passed in buffer was NULL");
  }
  else
  {
- bytes_read = fread(result, 1, file_size, f);
- if (bytes_read == file_size)
- {
- *buffer = result;
- }
- else
- {
- free(result);
- bytes_read = -1;
-
- Debug_printf("load_firmware only read %u bytes out of %u - failing\r\n", bytes_read, file_size);
- }
+ bytes_read = fread(buffer, 1, file_size, f);
  }
 
  fclose(f);

lib/hardware/fnSystem.h

@@ -120,7 +120,7 @@ class SystemManager
  void delete_tempfile(FileSystem *fs, const char *filename);
  void delete_tempfile(const char *filename);
 
- int load_firmware(const char *filename, uint8_t **buffer);
+ int load_firmware(const char *filename, uint8_t *buffer);
  void debug_print_tasks();
 
  void check_hardware_ver();

lib/hardware/fnUART.cpp

@@ -310,7 +310,7 @@ size_t UARTManager::print(const char *str)
  ;
 }
 
-size_t UARTManager::print(std::string str)
+size_t UARTManager::print(const std::string &str)
 {
  if (!_initialized)
  return -1;

lib/hardware/fnUART.h

@@ -53,7 +53,7 @@ class UARTManager
 
  //size_t print(const char *format, ...);
  size_t print(const char *str);
- size_t print(std::string str);
+ size_t print(const std::string &str);
  size_t print(int n, int base = 10);
  size_t print(unsigned int n, int base = 10);
  size_t print(long n, int base = 10);