Macintosh-HW/quack
1
0
Fork 0
mirror of https://github.com/demik/quack.git synced 2024-11-26 17:49:32 +00:00
Code Issues Projects Releases Wiki Activity

added support for Kensington ADB Devices

Browse Source
This commit is contained in:
demik 2024-06-04 10:04:47 +02:00
parent 6a0e7ee968
commit 97a57e89ac
3 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
main/adb.c
View File

@ -127,7 +127,7 @@ inline bool adb_is_host(void) {
void adb_probe(void) {
uint16_t register3;
ESP_LOGI(TAG, "Probing for mouse...");
ESP_LOGI(TAG, "Probing for mouse…");
xTaskNotify(t_yellow, LED_SLOW, eSetValueWithOverwrite);
/* for some reason, RMT misses the first exchange sometimes. Flush the device should give it time */
@ -138,15 +138,49 @@ void adb_probe(void) {
while (true) {
adb_tx_cmd(ADB_MOUSE|ADB_TALK|ADB_REG3);
register3 = adb_rx_mouse();
ESP_LOGD("ADB", "Device $3 register3: %x", register3);
ESP_LOGD("ADB", "Device $3 register3: %04x", register3);
if (register3 && (register3 & ADB_H_ALL) == ADB_H_ERR)
ESP_LOGE(TAG, "Mouse failed self init test");
/*
* try to unglue composite devices (Kensington)
* the idea is to move detected devices to $9, and check $3 again
* if there is something again at $3, it may be a composite device, or the user
* plugged two devices.
* if there is nothing anymore, move back $9 to $3
*
* we will handle that further down the line by checking the handler
*/
if (register3 & ADB_H_ALL) {
ESP_LOGI(TAG, "\tMoving $3 to $9 to check for composite devices");
adb_tx_listen(ADB_MOUSE|ADB_LISTEN|ADB_REG3, (ADB_TMP<<4)|ADB_H_MOVE);
vTaskDelay(7 / portTICK_PERIOD_MS);
ESP_LOGI(TAG, "\tChecking $3 again…");
adb_tx_cmd(ADB_MOUSE|ADB_TALK|ADB_REG3);
register3 = adb_rx_mouse();
if (register3) {
adb_tx_cmd(ADB_TMP|ADB_TALK|ADB_REG3);
register3 = adb_rx_mouse();
ESP_LOGI(TAG, "\t… something was there, $9 handler: $%02x", register3 & ADB_H_ALL);
xTaskNotify(t_red, LED_ONCE, eSetValueWithOverwrite);
}
else {
ESP_LOGI(TAG, "\t… nothing, moving $9 back to $3");
adb_tx_listen(ADB_TMP|ADB_LISTEN|ADB_REG3, (ADB_MOUSE<<4)|ADB_H_MOVE);
}
/* restore register3 from $3 for handler detection */
vTaskDelay(7 / portTICK_PERIOD_MS);
adb_tx_cmd(ADB_MOUSE|ADB_TALK|ADB_REG3);
register3 = adb_rx_mouse();
}
/* Accept all known handlers */
if (((register3 & ADB_H_ALL) == ADB_H_C100) || ((register3 & ADB_H_ALL) == ADB_H_C200) ||
((register3 & ADB_H_ALL) == ADB_H_MTRC)) {
ESP_LOGI(TAG, "... detected mouse at $3");
((register3 & ADB_H_ALL) == ADB_H_MTRC) || ((register3 & ADB_H_ALL) == ADB_H_KSGT)) {
ESP_LOGI(TAG, "… detected mouse at $3");
break;
}
@ -172,6 +206,13 @@ void adb_probe(void) {
case ADB_H_MTRC:
ESP_LOGD(TAG, "MacTRAC running at default cpi");
break;
case ADB_H_KSGT:
ESP_LOGD(TAG, "Kensington detected, switching to standard device");
adb_tx_listen(ADB_MOUSE|ADB_LISTEN|ADB_REG3, (ADB_KML1<<4)|ADB_H_MOVE);
adb_tx_listen(ADB_TMP|ADB_LISTEN|ADB_REG3, (ADB_MOUSE<<4)|ADB_H_MOVE);
adb_tx_listen(ADB_MOUSE|ADB_LISTEN|ADB_REG3, 0x6000|(ADB_MOUSE<<4)|ADB_H_C200);
ESP_LOGD(TAG, "Kensington running at 200cpi");
break;
default:
ESP_LOGE(TAG, "Mouse running with unknow handler: %x", register3 & ADB_H_ALL);
}
@ -268,7 +309,7 @@ void adb_task_host(void *pvParameters) {
else
state = ADB_S_KEEP;
}
ESP_LOGD("ADB", "Check mouse presence %x", data);
ESP_LOGD("ADB", "Check mouse presence %04x", data);
}
}
}

4
main/adb.h
View File

@ -59,7 +59,8 @@ void adb_tx_reset(void);
/* Device addresses */
#define ADB_MOUSE (3<<4)
#define ADB_TMP (9<<4)
#define ADB_KML1 (8<<4) // disabled Kensington device
#define ADB_TMP (9<<4)
/* Various stuff */
#define ADB_B_UP 0
@ -70,6 +71,7 @@ void adb_tx_reset(void);
#define ADB_H_C100 0x01 // Handler 1 (Classic @ 100cpi)
#define ADB_H_C200 0x02 // Handler 2 (Classic @ 200cpi)
#define ADB_H_MTRC 0x2f // Handler for MacTRAC 2.0
#define ADB_H_KSGT 0x32 // Handler for Kensington devices
#define ADB_H_MOVE 0xfe // Move to another address
/* Host states */

2
sdkconfig
View File

@ -1,6 +1,6 @@
#
# Automatically generated file. DO NOT EDIT.
# Espressif IoT Development Framework (ESP-IDF) Project Configuration
# Espressif IoT Development Framework (ESP-IDF) 5.1.2 Project Configuration
#
CONFIG_SOC_BROWNOUT_RESET_SUPPORTED="Not determined"
CONFIG_SOC_TWAI_BRP_DIV_SUPPORTED="Not determined"