Get rs232 firmware compiling for ESP32 again. (#1064)

Author: FozzTexx

include/fujiCommandID.h

@@ -110,6 +110,7 @@ enum fujiCommandID_t {
   FUJICMD_PERCOM_READ                = 0x4E, // N
   FUJICMD_UNLISTEN                   = 0x4D, // M
   FUJICMD_LISTEN                     = 0x4C, // L
+  FUJICMD_CPM_INIT                   = 0x47, // G
   FUJICMD_GET_ERROR                  = 0x45, // E
   FUJICMD_SET_DESTINATION            = 0x44, // D
   FUJICMD_SET_DUMP                   = 0x44, // D

lib/bus/mac/mac_ll.cpp

@@ -111,6 +111,7 @@ void IRAM_ATTR encode_rmt_bitstream(const void* src, rmt_item32_t* dest, size_t
     *item_num = wanted_num;
 }
 
+#ifdef NOT_IWM_LL_SUBCLASSS
 /*
  * Initialize the RMT Tx channel
  */

lib/bus/rs232/FujiBusPacket.cpp

@@ -1,6 +1,7 @@
 #include "FujiBusPacket.h"
 
 #include "../../include/debug.h"
+#include "utils.h"
 
 typedef struct {
     uint8_t device;   /* Destination Device */
@@ -17,14 +18,6 @@ typedef struct {
 static uint8_t fieldSizeTable[] = {0, 1, 1, 1, 1, 2, 2, 4};
 static uint8_t numFieldsTable[] = {0, 1, 2, 3, 4, 1, 2, 1};
 
-FujiBusPacket::FujiBusPacket(const std::string &slipEncoded)
-{
-    if (!parse(slipEncoded))
-        throw std::invalid_argument("Invalid FujiBusPacket data");
-
-    return;
-}
-
 std::string FujiBusPacket::decodeSLIP(const std::string &input)
 {
     unsigned int idx;
@@ -203,10 +196,8 @@ std::string FujiBusPacket::serialize()
 
 std::unique_ptr<FujiBusPacket> FujiBusPacket::fromSerialized(const std::string &input)
 {
-    try {
-        return std::make_unique<FujiBusPacket>(input);
-    }
-    catch (const std::invalid_argument&) {
+    auto packet = std::make_unique<FujiBusPacket>();
+    if (!packet->parse(input))
         return nullptr;
-    }
+    return packet;
 }

lib/bus/rs232/FujiBusPacket.h

@@ -31,7 +31,7 @@ class FujiBusPacket
     uint8_t calcChecksum(const std::string &buf);
 
 public:
-    FujiBusPacket(const std::string &slipEncoded);
+    FujiBusPacket() = default;
     FujiBusPacket(fujiDeviceID_t dev, fujiCommandID_t cmd, const std::string &dbuf) :
         _device(dev), _command(cmd), _data(dbuf) {}
 

lib/bus/rs232/rs232.cpp

@@ -491,7 +491,7 @@ void systemBus::setUltraHigh(bool _enable, int _ultraHighBaud)
 void systemBus::sendReplyPacket(fujiDeviceID_t source, bool ack, void *data, size_t length)
 {
     FujiBusPacket packet(source, ack ? FUJICMD_ACK : FUJICMD_NAK,
-                         ack ? std::string(static_cast<const char*>(data), length) : nullptr);
+                         ack ? std::string(static_cast<const char*>(data), length) : "");
     std::string encoded = packet.serialize();
     _port->write(encoded.data(), encoded.size());
     return;

lib/console/Commands/VFSCommands.cpp

@@ -354,7 +354,7 @@ int mount(int argc, char **argv)
     int did = atoi(argv[1]);
     fprintf(stdout, "Mounted %d -> %s\r\n", did, argv[2]);
 
-    theFuji->mount_all();
+    theFuji->fujicmd_mount_all_success();
 
     return EXIT_SUCCESS;
 }

lib/device/fujiDevice.cpp

@@ -32,7 +32,9 @@
 #include "compat_string.h"
 
 #include "fuji_endian.h"
+#ifndef ESP_PLATFORM // why ESP does not like it? it throws a linker error undefined reference to 'basename'
 #include <libgen.h>
+#endif /* ESP_PLATFORM */
 
 #ifdef UNUSED
 #define ADDITIONAL_DETAILS_BYTES 10

lib/device/rs232/apetime.cpp

@@ -8,8 +8,6 @@
 
 #include "../../include/debug.h"
 
-char * ape_timezone = NULL;
-
 void rs232ApeTime::_rs232_get_time(bool use_timezone)
 {
     char old_tz[64];
@@ -24,16 +22,16 @@ void rs232ApeTime::_rs232_get_time(bool use_timezone)
 
     time_t tt = time(nullptr);
 
-    if (ape_timezone != NULL && use_timezone) {
+    if (ape_timezone.size() && use_timezone) {
         Debug_printf("Using time zone %s\n", ape_timezone);
         strncpy(old_tz, getenv("TZ"), sizeof(old_tz));
-        setenv("TZ", ape_timezone, 1);
+        setenv("TZ", ape_timezone.c_str(), 1);
         tzset();
     }
 
     struct tm * now = localtime(&tt);
 
-    if (ape_timezone != NULL && use_timezone) {
+    if (ape_timezone.size() && use_timezone) {
         setenv("TZ", old_tz, 1);
         tzset();
     }
@@ -53,35 +51,16 @@ void rs232ApeTime::_rs232_get_time(bool use_timezone)
     bus_to_computer(rs232_reply, sizeof(rs232_reply), false);
 }
 
-void rs232ApeTime::_rs232_set_tz()
+void rs232ApeTime::_rs232_set_tz(std::string newTZ)
 {
-    int bufsz;
-
-    Debug_println("APETIME set TZ request");
-
-    if (ape_timezone != NULL) {
-      free(ape_timezone);
+    if (newTZ.size())
+    {
+        ape_timezone = newTZ;
+        Debug_printf("TZ set to <%s>\n", ape_timezone.c_str());
     }
-
-#ifdef OBSOLETE
-    bufsz = rs232_get_aux16_lo();
-#endif /* OBSOLETE */
-    if (bufsz > 0) {
-      ape_timezone = (char *) malloc((bufsz + 1) * sizeof(char));
-
-      uint8_t ck = bus_to_peripheral((uint8_t *) ape_timezone, bufsz);
-      if (rs232_checksum((uint8_t *) ape_timezone, bufsz) != ck) {
-        rs232_error();
-      } else {
-        ape_timezone[bufsz] = '\0';
-
-        rs232_complete();
-
-        Debug_printf("TZ set to <%s>\n", ape_timezone);
-      }
-    } else {
+    else
       Debug_printf("TZ unset\n");
-    }
+    return;
 }
 
 void rs232ApeTime::rs232_process(FujiBusPacket &packet)
@@ -94,7 +73,7 @@ void rs232ApeTime::rs232_process(FujiBusPacket &packet)
         break;
     case FUJICMD_SETTZ:
         rs232_ack();
-        _rs232_set_tz();
+        _rs232_set_tz(packet.data().value_or(""));
         break;
     case FUJICMD_GETTZTIME:
         rs232_ack();

lib/device/rs232/apetime.h

@@ -6,8 +6,10 @@
 class rs232ApeTime : public virtualDevice
 {
 private:
+    std::string ape_timezone;
+
     void _rs232_get_time(bool use_timezone);
-    void _rs232_set_tz();
+    void _rs232_set_tz(std::string newTZ);
 
 public:
     void rs232_process(FujiBusPacket &packet) override;

lib/device/rs232/rs232cpm.cpp

@@ -74,7 +74,7 @@ void rs232CPM::rs232_process(FujiBusPacket &packet)
 {
     switch (packet.command())
     {
-    case 'G':
+    case FUJICMD_CPM_INIT:
         rs232_ack();
         fnSystem.delay(10);
         rs232_complete();