Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

protect serial asyncmsg with indicate to prevent halt (#2272)

Browse Source
This commit is contained in:
zxkmm 2024-09-29 16:19:29 +08:00 committed by GitHub
parent b19ed5fec5
commit b43eaa8786
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/application/usb_serial.hpp
View File

@ -37,6 +37,8 @@ class USBSerial {
void on_channel_closed(); void on_channel_closed();
void setEventDispatcher(EventDispatcher* ed) { _eventDispatcher = ed; } void setEventDispatcher(EventDispatcher* ed) { _eventDispatcher = ed; }
bool serial_connected() { return connected; }
private: private:
void enable_xtal(); void enable_xtal();
void disable_pll0(); void disable_pll0();
@ -51,4 +53,4 @@ class USBSerial {
EventDispatcher* _eventDispatcher = NULL; EventDispatcher* _eventDispatcher = NULL;
}; };
} // namespace portapack } // namespace portapack

31
firmware/application/usb_serial_asyncmsg.cpp
View File

@ -23,6 +23,7 @@
*/ */
#include "usb_serial_asyncmsg.hpp" #include "usb_serial_asyncmsg.hpp"
#include "usb_serial.hpp"
/// value /// value
// to_string_bin/ to_string_decimal/ to_string_hex/ to_string_hex_array/ to_string_dec_uint/ to_string_dec_int etc seems usellss so i didn't add them here // to_string_bin/ to_string_decimal/ to_string_hex/ to_string_hex_array/ to_string_dec_uint/ to_string_dec_int etc seems usellss so i didn't add them here
@ -30,7 +31,7 @@
template <> template <>
void UsbSerialAsyncmsg::asyncmsg<int64_t>(const int64_t& data) { void UsbSerialAsyncmsg::asyncmsg<int64_t>(const int64_t& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str()); chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
@ -38,7 +39,7 @@ void UsbSerialAsyncmsg::asyncmsg<int64_t>(const int64_t& data) {
template <> template <>
void UsbSerialAsyncmsg::asyncmsg<int32_t>(const int32_t& data) { void UsbSerialAsyncmsg::asyncmsg<int32_t>(const int32_t& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str()); chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
@ -46,7 +47,7 @@ void UsbSerialAsyncmsg::asyncmsg<int32_t>(const int32_t& data) {
template <> template <>
void UsbSerialAsyncmsg::asyncmsg<int16_t>(const int16_t& data) { void UsbSerialAsyncmsg::asyncmsg<int16_t>(const int16_t& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str()); chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
@ -54,7 +55,7 @@ void UsbSerialAsyncmsg::asyncmsg<int16_t>(const int16_t& data) {
template <> template <>
void UsbSerialAsyncmsg::asyncmsg<int8_t>(const int8_t& data) { void UsbSerialAsyncmsg::asyncmsg<int8_t>(const int8_t& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str()); chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
@ -62,7 +63,7 @@ void UsbSerialAsyncmsg::asyncmsg<int8_t>(const int8_t& data) {
template <> template <>
void UsbSerialAsyncmsg::asyncmsg<uint8_t>(const uint8_t& data) { void UsbSerialAsyncmsg::asyncmsg<uint8_t>(const uint8_t& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str()); chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
@ -70,7 +71,7 @@ void UsbSerialAsyncmsg::asyncmsg<uint8_t>(const uint8_t& data) {
template <> template <>
void UsbSerialAsyncmsg::asyncmsg<uint16_t>(const uint16_t& data) { void UsbSerialAsyncmsg::asyncmsg<uint16_t>(const uint16_t& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str()); chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
@ -78,7 +79,7 @@ void UsbSerialAsyncmsg::asyncmsg<uint16_t>(const uint16_t& data) {
template <> template <>
void UsbSerialAsyncmsg::asyncmsg<uint32_t>(const uint32_t& data) { void UsbSerialAsyncmsg::asyncmsg<uint32_t>(const uint32_t& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str()); chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
@ -86,7 +87,7 @@ void UsbSerialAsyncmsg::asyncmsg<uint32_t>(const uint32_t& data) {
template <> template <>
void UsbSerialAsyncmsg::asyncmsg<uint64_t>(const uint64_t& data) { void UsbSerialAsyncmsg::asyncmsg<uint64_t>(const uint64_t& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str()); chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
@ -94,7 +95,7 @@ void UsbSerialAsyncmsg::asyncmsg<uint64_t>(const uint64_t& data) {
template <> template <>
void UsbSerialAsyncmsg::asyncmsg<float>(const float& data) { void UsbSerialAsyncmsg::asyncmsg<float>(const float& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_decimal(data, 7).c_str()); chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_decimal(data, 7).c_str());
@ -105,7 +106,7 @@ void UsbSerialAsyncmsg::asyncmsg<float>(const float& data) {
template <> template <>
// usage: UsbSerialAsyncmsg::asyncmsg(path); // usage: UsbSerialAsyncmsg::asyncmsg(path);
void UsbSerialAsyncmsg::asyncmsg<std::filesystem::path>(const std::filesystem::path& data) { void UsbSerialAsyncmsg::asyncmsg<std::filesystem::path>(const std::filesystem::path& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
std::string path_str = data.string(); std::string path_str = data.string();
@ -114,7 +115,7 @@ void UsbSerialAsyncmsg::asyncmsg<std::filesystem::path>(const std::filesystem::p
template <> template <>
void UsbSerialAsyncmsg::asyncmsg<std::filesystem::path::string_type>(const std::filesystem::path::string_type& data) { void UsbSerialAsyncmsg::asyncmsg<std::filesystem::path::string_type>(const std::filesystem::path::string_type& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
std::string str_data(data.begin(), data.end()); std::string str_data(data.begin(), data.end());
@ -127,7 +128,7 @@ void UsbSerialAsyncmsg::asyncmsg<std::filesystem::path::string_type>(const std::
template <> template <>
// usage: UsbSerialAsyncmsg::asyncmsg(str); // usage: UsbSerialAsyncmsg::asyncmsg(str);
void UsbSerialAsyncmsg::asyncmsg<std::string>(const std::string& data) { void UsbSerialAsyncmsg::asyncmsg<std::string>(const std::string& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", data.c_str()); chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", data.c_str());
@ -136,7 +137,7 @@ void UsbSerialAsyncmsg::asyncmsg<std::string>(const std::string& data) {
// string literal AKA char[] // string literal AKA char[]
// usage: UsbSerialAsyncmsg::asyncmsg("abc"); // usage: UsbSerialAsyncmsg::asyncmsg("abc");
void UsbSerialAsyncmsg::asyncmsg(const char* data) { void UsbSerialAsyncmsg::asyncmsg(const char* data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", data); chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", data);
@ -146,8 +147,8 @@ void UsbSerialAsyncmsg::asyncmsg(const char* data) {
template <> template <>
// usage: UsbSerialAsyncmsg::asyncmsg(true); // usage: UsbSerialAsyncmsg::asyncmsg(true);
void UsbSerialAsyncmsg::asyncmsg<bool>(const bool& data) { void UsbSerialAsyncmsg::asyncmsg<bool>(const bool& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", data ? "true" : "false"); chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", data ? "true" : "false");
} }

2
firmware/application/usb_serial_asyncmsg.hpp
View File

@ -61,7 +61,7 @@ class UsbSerialAsyncmsg {
// ussgae: UsbSerialAsyncmsg::asyncmsg(vec); // ussgae: UsbSerialAsyncmsg::asyncmsg(vec);
template <typename VECTORCOVER> template <typename VECTORCOVER>
void UsbSerialAsyncmsg::asyncmsg(const std::vector<VECTORCOVER>& data) { void UsbSerialAsyncmsg::asyncmsg(const std::vector<VECTORCOVER>& data) {
if (!portapack::async_tx_enabled) { if (!portapack::async_tx_enabled || !portapack::usb_serial.serial_connected()) {
return; return;
} }
for (const auto& item : data) { for (const auto& item : data) {