adolforeyna/tactility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Guition JC1060P470CIWY and update other Guition device IDs (#447)

Browse Source 
This commit contains @josemalm32 's  implementation for the Guition JC1060P470CIWY  (see https://github.com/ByteWelder/Tactility/issues/427)

I've added these changes:
- Updated the branch for the new logging method
- Updated the branch for the PR that I mentioned in the above linked issue
- Replaced the manually pasted in esp_lcd_jd9165 driver with the one from the component registry
- Updated Spanish to English
- Updated all drivers' mutexes/locks
- Fixed the display color format
- Fixed bug in power deinit
- Renamed I2C bus in config
- Added device to continuous integration
- Renamed several Guition devices from CYD to Guition
- Fix for `EspLcdDisplayV2` init for when features are not supported
- Pin esp_wifi_remote to version 1.2.3
- Fix in `WifiManage` logging
- Fix for `WifiEsp.cpp`'s check for wifi presence
- Fix for `WifiEsp`'s scan list logging
- Fix for `gcc_soft_float_symbols` in TactiltyC
This commit is contained in:
Ken Van Hoeylandt
2026-01-07 22:41:45 +01:00
committed by GitHub
parent f620255c41
commit c98cb2bf10
44 changed files with 1060 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactility/Source/Tactility.cpp
+4 -4
View File
@@ -45,7 +45,7 @@ namespace service {
#ifdef ESP_PLATFORM
namespace development { extern const ServiceManifest manifest; }
#endif
#ifdef CONFIG_ESP_WIFI_ENABLED
#if defined(CONFIG_TT_WIFI_ENABLED) && !defined(CONFIG_ESP_WIFI_REMOTE_ENABLED)
namespace espnow { extern const ServiceManifest manifest; }
#endif
// Secondary (UI)
@@ -76,7 +76,7 @@ namespace app {
namespace applist { extern const AppManifest manifest; }
namespace appsettings { extern const AppManifest manifest; }
namespace boot { extern const AppManifest manifest; }
#ifdef CONFIG_ESP_WIFI_ENABLED
#if defined(CONFIG_TT_WIFI_ENABLED) && !defined(CONFIG_ESP_WIFI_REMOTE_ENABLED)
namespace chat { extern const AppManifest manifest; }
#endif
namespace development { extern const AppManifest manifest; }
@@ -155,7 +155,7 @@ static void registerInternalApps() {
addAppManifest(app::screenshot::manifest);
#endif
#ifdef CONFIG_ESP_WIFI_ENABLED
#if defined(CONFIG_TT_WIFI_ENABLED) && !defined(CONFIG_ESP_WIFI_REMOTE_ENABLED)
addAppManifest(app::chat::manifest);
#endif
@@ -260,7 +260,7 @@ static void registerAndStartPrimaryServices() {
addService(service::development::manifest);
#endif
#ifdef CONFIG_ESP_WIFI_ENABLED
#if defined(CONFIG_TT_WIFI_ENABLED) && !defined(CONFIG_ESP_WIFI_REMOTE_ENABLED)
addService(service::espnow::manifest);
#endif
}
Tactility/Source/app/chat/ChatApp.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include <sdkconfig.h>
#endif
#ifdef CONFIG_ESP_WIFI_ENABLED
#if defined(CONFIG_TT_WIFI_ENABLED) && !defined(CONFIG_ESP_WIFI_REMOTE_ENABLED)
#include <Tactility/app/AppManifest.h>
#include <Tactility/lvgl/Toolbar.h>
Tactility/Source/app/wifimanage/WifiManage.cpp
+6 -1
View File
@@ -120,7 +120,12 @@ void WifiManage::onShow(AppContext& app, lv_obj_t* parent) {
bool can_scan = radio_state == service::wifi::RadioState::On ||
radio_state == service::wifi::RadioState::ConnectionPending ||
radio_state == service::wifi::RadioState::ConnectionActive;
LOGGER.info("{} {}", service::wifi::radioStateToString(radio_state), service::wifi::isScanning());
std::string connection_target = service::wifi::getConnectionTarget();
LOGGER.info("Radio: {}, Scanning: {}, Connected to: {}, Can scan: {}",
service::wifi::radioStateToString(radio_state),
service::wifi::isScanning(),
connection_target.empty() ? "(none)" : connection_target.c_str(),
can_scan);
if (can_scan && !service::wifi::isScanning()) {
service::wifi::scan();
}
Tactility/Source/service/espnow/EspNow.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include <sdkconfig.h>
#endif
#ifdef CONFIG_ESP_WIFI_ENABLED
#if defined(CONFIG_TT_WIFI_ENABLED) && !defined(CONFIG_ESP_WIFI_REMOTE_ENABLED)
#include <Tactility/service/espnow/EspNow.h>
#include <Tactility/service/espnow/EspNowService.h>
Tactility/Source/service/espnow/EspNowService.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include <sdkconfig.h>
#endif
#ifdef CONFIG_ESP_WIFI_ENABLED
#if defined(CONFIG_TT_WIFI_ENABLED) && !defined(CONFIG_ESP_WIFI_REMOTE_ENABLED)
#include <Tactility/Logger.h>
#include <Tactility/Tactility.h>
Tactility/Source/service/espnow/EspNowWifi.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include <sdkconfig.h>
#endif
#ifdef CONFIG_ESP_WIFI_ENABLED
#if defined(CONFIG_TT_WIFI_ENABLED) && !defined(CONFIG_ESP_WIFI_REMOTE_ENABLED)
#include <Tactility/kernel/Kernel.h>
#include <Tactility/Logger.h>
Tactility/Source/service/wifi/WifiEsp.cpp
+17 -13
View File
@@ -2,7 +2,7 @@
#include <sdkconfig.h>
#endif
#ifdef CONFIG_ESP_WIFI_ENABLED
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
#include <Tactility/service/wifi/Wifi.h>
@@ -413,17 +413,21 @@ static bool copy_scan_list(std::shared_ptr<Wifi> wifi) {
LOGGER.info("Scanned {} APs. Showing {}:", record_count, safe_record_count);
for (uint16_t i = 0; i < safe_record_count; i++) {
wifi_ap_record_t* record = &wifi->scan_list[i];
LOGGER.info(" - SSID {}, RSSI {}, channel {}, BSSID {:02x}:{:02x}:{:02x}:{:02x}:{:02x}:{:02x}",
reinterpret_cast<const char*>(record->ssid),
record->rssi,
record->primary,
record->bssid[0],
record->bssid[1],
record->bssid[2],
record->bssid[3],
record->bssid[4],
record->bssid[5]
);
if (record->ssid[0] != 0 && record->primary != 0) {
LOGGER.info(" - SSID {}, RSSI {}, channel {}, BSSID {:02x}:{:02x}:{:02x}:{:02x}:{:02x}:{:02x}",
reinterpret_cast<const char*>(record->ssid),
record->rssi,
record->primary,
record->bssid[0],
record->bssid[1],
record->bssid[2],
record->bssid[3],
record->bssid[4],
record->bssid[5]
);
} else {
LOGGER.info(" - (missing channel info)"); // Behaviour on on P4 with C6
}
}
return true;
} else {
@@ -972,4 +976,4 @@ extern const ServiceManifest manifest = {
} // namespace
#endif // ESP_PLATFORM
#endif // CONFIG_SOC_WIFI_SUPPORTED or CONFIG_SLAVE_SOC_WIFI_SUPPORTED
Tactility/Source/service/wifi/WifiMock.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include <sdkconfig.h>
#endif
#ifndef CONFIG_ESP_WIFI_ENABLED
#if not defined(CONFIG_SOC_WIFI_SUPPORTED) && not defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
#include <Tactility/service/wifi/Wifi.h>