added DFU and Compose Key Scancode

russeree · Jan 11, 2024 · 1ff17d4 · 1ff17d4
1 parent eeb700a
commit 1ff17d4
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 1,112 deletions.
diff --git a/Core/Src/main.c b/Core/Src/main.c
@@ -159,13 +159,16 @@ int main(void)
   while (1)
   {
     if(nos_fpga.configured && !keys_dma_started) {
-      NyanGetKeys((NyanKeys*)&nyan_keys);
       keys_dma_started = true;
+      NyanGetKeys((NyanKeys*)&nyan_keys);
     } else if (!nos_fpga.configured) {
       FPGAInit(&nos_fpga);
+    } else if (nos.dfu_mode) {
+      HAL_GPIO_WritePin(Nyan_DFU_Enable_GPIO_Port, Nyan_DFU_Enable_Pin, GPIO_PIN_SET);
+      HAL_Delay(1000);
+      NVIC_SystemReset();
     }
     /* USER CODE END WHILE */
-
     /* USER CODE BEGIN 3 */
   }
   /* USER CODE END 3 */

diff --git a/Core/Src/nyan_keys.c b/Core/Src/nyan_keys.c
@@ -221,7 +221,7 @@ NyanKeysReturn NyanBuildHidReportFromKeyStates(NyanKeys *keys, volatile NyanKeyB
                     NyanStuctAllocator(keys, desc, alt_fn ? KEY_RIGHT : KEY_APOSTROPHE);
                     break;
                 case MENU:
-                    NyanStuctAllocator(keys, desc, alt_fn ? KEY_PROPS : KEY_PROPS);
+                    NyanStuctAllocator(keys, desc, alt_fn ? KEY_COMPOSE : KEY_COMPOSE);;
                     break;
                 case R_SQUARE_BRACKET:
                     NyanStuctAllocator(keys, desc, alt_fn ? KEY_RIGHTBRACE : KEY_RIGHTBRACE);

diff --git a/Core/Src/nyan_os.c b/Core/Src/nyan_os.c
@@ -16,6 +16,8 @@
 #include "nyan_sha256.h"
 #include "nyan_strings.h"
 
+#include "usbd_cdc_acm_if.h"
+
 NyanReturn NyanOsInit(volatile NyanOS* nos)
 {
     // Set the operational state

diff --git a/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_conf_template.h b/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_conf_template.h
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_desc_template.h b/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_desc_template.h