commented kvmd/kvmd#80 (#102)

Co-authored-by: Maxim Devaev <mdevaev@gmail.com>

hid/patch.py

@@ -28,6 +28,7 @@ def _patch(path: str, patch_path: str) -> None:
     assert exists(path)
     flag_path: str = join(path, f".{basename(patch_path)}.done")
     if not exists(flag_path):
+        # TODO check for failure
         env.Execute(f"patch -p1 -d {path} < {patch_path}")
         env.Execute(lambda *_, **__: open(flag_path, "w").close())
 

hid/patches/arduino-no-main.patch

@@ -1,17 +1,24 @@
-diff -u -r a/cores/arduino/main.cpp b/cores/arduino/main.cpp
---- a/cores/arduino/main.cpp	2019-05-16 15:52:01.000000000 +0300
-+++ b/cores/arduino/main.cpp	2020-11-17 18:56:01.243474508 +0300
-@@ -30,6 +30,7 @@
- void setupUSB() __attribute__((weak));
- void setupUSB() { }
+diff --git a/cores/arduino/main.cpp b/cores/arduino/main.cpp
+index 434cd40..7aba76f 100644
+--- a/cores/arduino/main.cpp
++++ b/cores/arduino/main.cpp
+@@ -36,15 +36,15 @@ int main(void)
  
-+/*
- int main(void)
- {
- 	init();
-@@ -49,4 +50,5 @@
+ 	initVariant();
+ 
+-#if defined(USBCON)
+-	USBDevice.attach();
+-#endif
++// #if defined(USBCON)
++// 	USBDevice.attach();
++// #endif
+ 	
+ 	setup();
+     
+ 	for (;;) {
+ 		loop();
+-		if (serialEventRun) serialEventRun();
++		// if (serialEventRun) serialEventRun();
+ 	}
          
  	return 0;
- }
-+*/
- 

hid/src/main.cpp

@@ -303,9 +303,7 @@ static void _sendResponse(uint8_t code) {
 #	endif
 }
 
-int main() {
-	init(); // Embedded
-	initVariant(); // Arduino
+void setup() {
 	_initOutputs();
 
 #	ifdef AUM
@@ -314,14 +312,12 @@ int main() {
 
 #	ifdef CMD_SERIAL
 	CMD_SERIAL.begin(CMD_SERIAL_SPEED);
-	unsigned long last = micros();
-	uint8_t buffer[8];
-	uint8_t index = 0;
 #	elif defined(CMD_SPI)
 	spiBegin();
 #	endif
+}
 
-	while (true) {
+void loop() {
 #	ifdef AUM
 	aumProxyUsbVbus();
 #	endif
@@ -329,6 +325,9 @@ int main() {
 	_kbd->periodic();
 
 #	ifdef CMD_SERIAL
+	static unsigned long last = micros();
+	static uint8_t buffer[8];
+	static uint8_t index = 0;
 	if (CMD_SERIAL.available() > 0) {
 		buffer[index] = (uint8_t)CMD_SERIAL.read();
 		if (index == 7) {
@@ -349,6 +348,4 @@ int main() {
 		_sendResponse(_handleRequest(spiGet()));
 	}
 #	endif
-	}
-	return 0;
 }