diff --git a/esp32_marauder/GpsInterface.cpp b/esp32_marauder/GpsInterface.cpp index 89b98df..546d114 100644 --- a/esp32_marauder/GpsInterface.cpp +++ b/esp32_marauder/GpsInterface.cpp @@ -469,15 +469,37 @@ String GpsInterface::dt_string_from_gps(){ String datetime = ""; if (nmea.isValid() && nmea.getYear() > 0){ datetime += nmea.getYear(); + datetime += "-"; - datetime += nmea.getMonth(); + + uint8_t month = nmea.getMonth(); + if (month < 10) + datetime += "0"; + datetime += month; + datetime += "-"; - datetime += nmea.getDay(); + + uint8_t day = nmea.getDay(); + if (day < 10) + datetime += "0"; + datetime += day; + datetime += " "; - datetime += nmea.getHour(); + + uint8_t hour = nmea.getHour(); + if (hour < 10) + datetime += "0"; + datetime += hour; + datetime += ":"; - datetime += nmea.getMinute(); + + uint8_t minute = nmea.getMinute(); + if (minute < 10) + datetime += "0"; + datetime += minute; + datetime += ":"; + uint8_t seconds = nmea.getSecond(); if (seconds < 10) datetime += "0"; diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp index 23aafb6..8b3d7ab 100644 --- a/esp32_marauder/MenuFunctions.cpp +++ b/esp32_marauder/MenuFunctions.cpp @@ -911,8 +911,10 @@ void MenuFunctions::main(uint32_t currentTime) #ifdef HAS_BUTTONS - #if (C_BTN >= 0) + #if (C_BTN >= 0) && !defined(MARAUDER_CARDPUTER) bool c_btn_press = c_btn.justPressed(); + #elif defined(MARAUDER_CARDPUTER) + bool c_btn_press = this->isKeyPressed('('); #endif #ifndef HAS_ILI9341 @@ -1276,6 +1278,7 @@ void MenuFunctions::main(uint32_t currentTime) if(c_btn_press){ current_menu->list->get(current_menu->selected).callable(); } + #endif #endif } @@ -3131,7 +3134,11 @@ void MenuFunctions::RunSetup() this->displayCurrentMenu(); } #endif - if (c_btn.justPressed()) { + #if (C_BTN >= 0) && !defined(MARAUDER_CARDPUTER) + if(c_btn.justPressed()){ + #elif defined(MARAUDER_CARDPUTER) + if (this->isKeyPressed('(')) { + #endif if (sd_obj.sd_files->get(sd_file_index) != "Back") { if (sd_obj.removeFile("/" + sd_obj.sd_files->get(sd_file_index))) Serial.println("Successfully Removed File: /" + sd_obj.sd_files->get(sd_file_index)); @@ -3600,7 +3607,7 @@ void MenuFunctions::RunSetup() #endif // Add SSID - #ifdef HAS_C + #ifdef HAS_C && !defined(MARAUDER_CARDPUTER) if (c_btn.justPressed()) { while (!c_btn.justReleased()) { c_btn.justPressed(); // Need to continue updating button hold status. My shitty library. @@ -3628,13 +3635,45 @@ void MenuFunctions::RunSetup() #ifdef MARAUDER_CARDPUTER for (int i = 0; i < 95; i++) { - if (this->isKeyPressed(M5CardputerKeyboard._ascii_list[i])) { - pressed = true; - wifi_scan_obj.current_mini_kb_ssid.concat(M5CardputerKeyboard._ascii_list[i]); + if ((M5CardputerKeyboard._ascii_list[i] != '(') && + (M5CardputerKeyboard._ascii_list[i] != '`')) { + if (this->isKeyPressed(M5CardputerKeyboard._ascii_list[i])) { + pressed = true; + wifi_scan_obj.current_mini_kb_ssid.concat(M5CardputerKeyboard._ascii_list[i]); + } + if (this->isKeyPressed(KEY_BACKSPACE)) { + pressed = true; + wifi_scan_obj.current_mini_kb_ssid.remove(wifi_scan_obj.current_mini_kb_ssid.length() - 1); + } } - if (this->isKeyPressed(KEY_BACKSPACE)) { - pressed = true; - wifi_scan_obj.current_mini_kb_ssid.remove(wifi_scan_obj.current_mini_kb_ssid.length() - 1); + } + + if (!do_pass) { + if (this->isKeyPressed('`')) { + this->changeMenu(targetMenu->parentMenu); + return wifi_scan_obj.current_mini_kb_ssid; + } + + if (this->isKeyPressed('(')) { + if (!do_pass) { + if (wifi_scan_obj.current_mini_kb_ssid != "") { + pressed = true; + ssid s = {wifi_scan_obj.current_mini_kb_ssid, random(1, 12), {random(256), random(256), random(256), random(256), random(256), random(256)}, false}; + ssids->unshift(s); + wifi_scan_obj.current_mini_kb_ssid = ""; + } + } + } + } + else { + if (this->isKeyPressed('(')) { + this->changeMenu(targetMenu->parentMenu); + return wifi_scan_obj.current_mini_kb_ssid; + } + + if (this->isKeyPressed('`')) { + this->changeMenu(targetMenu->parentMenu); + return ""; } } @@ -3749,25 +3788,6 @@ void MenuFunctions::RunSetup() } #endif - // Add SSID - /*#ifdef HAS_C - if (menu_button == SELECT_BUTTON) { - while (display_obj.updateTouch(&t_x, &t_y)) { - ///c_btn.justPressed(); // Need to continue updating button hold status. My shitty library. - - delay(1); - } - // If we have a string, add it to list of SSIDs - if (wifi_scan_obj.current_mini_kb_ssid != "") { - pressed = true; - ssid s = {wifi_scan_obj.current_mini_kb_ssid, random(1, 12), {random(256), random(256), random(256), random(256), random(256), random(256)}, false}; - ssids->unshift(s); - wifi_scan_obj.current_mini_kb_ssid = ""; - } - } - - #endif*/ - // Exit if UP button is held if ((display_obj.isTouchHeld()) && (display_obj.menuButton(&t_x, &t_y, touched, true) == UP_BUTTON)) { display_obj.clearScreen(); @@ -3806,11 +3826,20 @@ void MenuFunctions::RunSetup() display_obj.tft.println("L/R - Prev/Nxt Char"); #endif if (!do_pass) { - display_obj.tft.println("C - Save"); - display_obj.tft.println("C(Hold) - Exit"); + #ifdef MARAUDER_CARDPUTER + display_obj.tft.println("Enter - Save"); + display_obj.tft.println("Esc - Exit"); + #else + display_obj.tft.println("C - Save"); + display_obj.tft.println("C(Hold) - Exit"); + #endif } else { - display_obj.tft.println("C(Hold) - Enter"); + #ifdef MARAUDER_CARDPUTER + display_obj.tft.println("Enter - Enter"); + #else + display_obj.tft.println("C(Hold) - Enter"); + #endif } #endif diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 78ca411..ad280bb 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -30,7 +30,7 @@ //#define MARAUDER_CARDPUTER //// END BOARD TARGETS - #define MARAUDER_VERSION "v1.8.4" + #define MARAUDER_VERSION "v1.8.5" #define GRAPH_REFRESH 100 diff --git a/mechanical/C5 Adapter/.DS_Store b/mechanical/C5 Adapter/.DS_Store new file mode 100644 index 0000000..06535d4 Binary files /dev/null and b/mechanical/C5 Adapter/.DS_Store differ diff --git a/mechanical/C5 Adapter/Extra designs/.DS_Store b/mechanical/C5 Adapter/Extra designs/.DS_Store new file mode 100644 index 0000000..f32e5cf Binary files /dev/null and b/mechanical/C5 Adapter/Extra designs/.DS_Store differ diff --git a/mechanical/C5 Adapter/Extra designs/c5 adapter back - SMA.stl b/mechanical/C5 Adapter/Extra designs/c5 adapter back - SMA.stl new file mode 100644 index 0000000..743fe56 Binary files /dev/null and b/mechanical/C5 Adapter/Extra designs/c5 adapter back - SMA.stl differ diff --git a/mechanical/C5 Adapter/Extra designs/c5 adapter back - hatched 1.stl b/mechanical/C5 Adapter/Extra designs/c5 adapter back - hatched 1.stl new file mode 100644 index 0000000..22e9f90 Binary files /dev/null and b/mechanical/C5 Adapter/Extra designs/c5 adapter back - hatched 1.stl differ diff --git a/mechanical/C5 Adapter/Extra designs/c5 adapter back - hatched 2.stl b/mechanical/C5 Adapter/Extra designs/c5 adapter back - hatched 2.stl new file mode 100644 index 0000000..d592f48 Binary files /dev/null and b/mechanical/C5 Adapter/Extra designs/c5 adapter back - hatched 2.stl differ diff --git a/mechanical/C5 Adapter/Extra designs/c5 adapter front - SMA.stl b/mechanical/C5 Adapter/Extra designs/c5 adapter front - SMA.stl new file mode 100644 index 0000000..b022a3f Binary files /dev/null and b/mechanical/C5 Adapter/Extra designs/c5 adapter front - SMA.stl differ diff --git a/mechanical/C5 Adapter/Extra designs/c5 adapter front - logo cut out.stl b/mechanical/C5 Adapter/Extra designs/c5 adapter front - logo cut out.stl new file mode 100644 index 0000000..ce916e7 Binary files /dev/null and b/mechanical/C5 Adapter/Extra designs/c5 adapter front - logo cut out.stl differ diff --git a/mechanical/C5 Adapter/Extra designs/c5 adapter pin cover - JCMK x AWOK.stl b/mechanical/C5 Adapter/Extra designs/c5 adapter pin cover - JCMK x AWOK.stl new file mode 100644 index 0000000..fde50a6 Binary files /dev/null and b/mechanical/C5 Adapter/Extra designs/c5 adapter pin cover - JCMK x AWOK.stl differ diff --git a/mechanical/C5 Adapter/Extra designs/c5 adapter pin cover - cut out with JCMK x AWOK logos.stl b/mechanical/C5 Adapter/Extra designs/c5 adapter pin cover - cut out with JCMK x AWOK logos.stl new file mode 100644 index 0000000..db502f5 Binary files /dev/null and b/mechanical/C5 Adapter/Extra designs/c5 adapter pin cover - cut out with JCMK x AWOK logos.stl differ diff --git a/mechanical/C5 Adapter/Extra designs/c5 adapter pin cover - with cut out.stl b/mechanical/C5 Adapter/Extra designs/c5 adapter pin cover - with cut out.stl new file mode 100644 index 0000000..1fb4177 Binary files /dev/null and b/mechanical/C5 Adapter/Extra designs/c5 adapter pin cover - with cut out.stl differ diff --git a/mechanical/C5 Adapter/c5 adapter back.stl b/mechanical/C5 Adapter/c5 adapter back.stl new file mode 100644 index 0000000..4fd4026 Binary files /dev/null and b/mechanical/C5 Adapter/c5 adapter back.stl differ diff --git a/mechanical/C5 Adapter/c5 adapter front.stl b/mechanical/C5 Adapter/c5 adapter front.stl new file mode 100644 index 0000000..2c25c7e Binary files /dev/null and b/mechanical/C5 Adapter/c5 adapter front.stl differ diff --git a/mechanical/C5 Adapter/c5 adapter pin cover.stl b/mechanical/C5 Adapter/c5 adapter pin cover.stl new file mode 100644 index 0000000..3097316 Binary files /dev/null and b/mechanical/C5 Adapter/c5 adapter pin cover.stl differ