qmacro extra 저장하기

naudhizb · Aug 19, 2019 · 81110e8 · 81110e8
1 parent f261d52
commit 81110e8
Showing 1 changed file with 43 additions and 8 deletions.
diff --git a/firmware/ps2avrGB/vusb.c b/firmware/ps2avrGB/vusb.c
@@ -337,6 +337,14 @@ usbMsgLen_t usbFunctionSetup(uint8_t data[8]) {
             		readyForNext = NEXT_RAINBOW;
             	}else if(rq->wLength.word >= OPTION_GET_REPORT_LENGTH_QUICK_MACRO1 && rq->wLength.word <= OPTION_GET_REPORT_LENGTH_QUICK_MACRO12){
             	    readyForNext = rq->wLength.word;
+
+            	/*
+                    이전 eeprom keymap 영역을 매크로 영역으로 확장하여 사용한다.
+                    기존 매크로에 28byte 씩 개별 매크로마다 추가한다.
+                    - 데이터는 4묶음씩 전달된다, 0~3, 4~7, 8~11
+                */  
+                }else if(rq->wLength.word >= OPTION_GET_REPORT_LENGTH_QUICK_MACRO_EXTRA1 && rq->wLength.word <= OPTION_GET_REPORT_LENGTH_QUICK_MACRO_EXTRA12){
+            	    readyForNext = rq->wLength.word;
             	}
 
 
@@ -419,6 +427,12 @@ usbMsgLen_t usbFunctionSetup(uint8_t data[8]) {
                     IsAddressHead = true;
                     quickMacroAddress = EEPROM_MACRO + (MACRO_SIZE_MAX * (readyForNext - OPTION_GET_REPORT_LENGTH_QUICK_MACRO1));
                     expectReport = 5;
+
+                }else if(readyForNext >= OPTION_GET_REPORT_LENGTH_QUICK_MACRO_EXTRA1 && readyForNext <= OPTION_GET_REPORT_LENGTH_QUICK_MACRO_EXTRA12){
+                    // write quick macro
+                    IsAddressHead = true;
+                    quickMacroAddress = EEPROM_MACRO_EXTRA + (MACRO_EXTRA_SIZE_MAX * (readyForNext - OPTION_GET_REPORT_LENGTH_QUICK_MACRO_EXTRA1));
+                    expectReport = 6;
                 }
                 readyForNext = 0;
 
@@ -480,17 +494,35 @@ void updateQuickMacro(uint8_t *data, uint8_t len)
 
     eeprom_update_block(data, (void *)quickMacroAddress, len);
     quickMacroAddress += len;
+}
 
-    /*uint8_t i;
-    for(i = 0; i< len; ++i)
+/*
+todo updateQuickMacro 와 리팩토링 필요
+*/
+void updateQuickMacroExtra(uint8_t *data, uint8_t len)
+{
+    if(IsAddressHead)
     {
-        eeprom_update_byte((void *)quickMacroAddress, *data);
-        quickMacroAddress++;
-        data++;
+        IsAddressHead = false;
+        // 처음에는 인덱스와 ID를 제거해준다.
+        len += -2;
+        data += 2;
+    }
 
-        if(quickMacroAddress >= (EEPROM_MACRO + MACRO_SIZE_MAX * MACRO_NUM)) return;
-    }*/
+    // quick macro의 eeprom address 범위를 넘어서지 않도록 패치
+    if(quickMacroAddress >= (EEPROM_MACRO_EXTRA + MACRO_EXTRA_SIZE_MAX * MACRO_NUM))
+    {
+        return;
+    }
+    else if(quickMacroAddress + len > (EEPROM_MACRO_EXTRA + MACRO_EXTRA_SIZE_MAX * MACRO_NUM))
+    {
+        len = (EEPROM_MACRO_EXTRA + MACRO_EXTRA_SIZE_MAX * MACRO_NUM) - quickMacroAddress;
+    }
+
+    eeprom_update_block(data, (void *)quickMacroAddress, len);
+    quickMacroAddress += len;
 }
+
 /*
  * EEPROM Quick macro reading
  */
@@ -552,7 +584,10 @@ uint8_t usbFunctionWrite(uchar *data, uchar len) {
     	setOptions((uint8_t *)data);
     }else if (expectReport == 5){
         // write quick macro;
-        updateQuickMacro((uint8_t *)data, len);
+        updateQuickMacro((uint8_t *)data, len);    
+    }else if (expectReport == 6){
+        // write quick macro extra;
+        updateQuickMacroExtra((uint8_t *)data, len);
     }
 
     return 0x01;