diff --git a/.github/workflows/hardware-ci.yaml b/.github/workflows/hardware-ci.yaml index 16cbbf1ee6..d7ad96ac38 100644 --- a/.github/workflows/hardware-ci.yaml +++ b/.github/workflows/hardware-ci.yaml @@ -16,7 +16,7 @@ jobs: # folder: config/boards/f407-discovery # config-name: all # openocd-script: ../.github/workflows/openocd_ci_f4_discovery.cfg - # serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_2B003B000A51343033393930-if01 + # serial-device: /dev/serial/by-id/usb-FOME_FOME_Engine_Management_ECU_2B003B000A51343033393930-if01 - build-target: f407-discovery script: hardware_ci_f4_discovery @@ -25,7 +25,7 @@ jobs: folder: config/boards/f407-discovery config-name: all openocd-script: ../.github/workflows/openocd_ci_f4_discovery_2.cfg - serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_1E0032000851353238333131-if01 + serial-device: /dev/serial/by-id/usb-FOME_FOME_Engine_Management_ECU_1E0032000851353238333131-if01 # - build-target: proteus_f4 # script: hardware_ci_proteus @@ -34,7 +34,7 @@ jobs: # folder: config/boards/proteus # config-name: proteus_f4 # openocd-script: ../.github/workflows/openocd_ci_proteus.cfg - # serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_41003D000451383037343335-if01 + # serial-device: /dev/serial/by-id/usb-FOME_FOME_Engine_Management_ECU_41003D000451383037343335-if01 runs-on: ${{matrix.runs-on}} diff --git a/firmware/console/eficonsole.cpp b/firmware/console/eficonsole.cpp index c5c2786195..32712674df 100644 --- a/firmware/console/eficonsole.cpp +++ b/firmware/console/eficonsole.cpp @@ -78,7 +78,7 @@ static void sayHello() { int flashSize = TM_ID_GetFlashSize(); if (flashSize < MIN_FLASH_SIZE) { - firmwareError(OBD_PCM_Processor_Fault, "rusEFI expected at least %dK of flash", MIN_FLASH_SIZE); + firmwareError(OBD_PCM_Processor_Fault, "Expected at least %dK of flash but found %dK", MIN_FLASH_SIZE, flashSize); } // todo: bug, at the moment we report 1MB on dual-bank F7 diff --git a/firmware/hw_layer/mass_storage/mass_storage_init.cpp b/firmware/hw_layer/mass_storage/mass_storage_init.cpp index 04e0d411b5..a7a6df81dd 100644 --- a/firmware/hw_layer/mass_storage/mass_storage_init.cpp +++ b/firmware/hw_layer/mass_storage/mass_storage_init.cpp @@ -53,7 +53,7 @@ static const scsi_inquiry_response_t iniDriveInquiry = { 0x00, 0x00, 0x00, - "rusEFI", + "FOME", "INI Drive", {'v',CH_KERNEL_MAJOR+'0','.',CH_KERNEL_MINOR+'0'} }; @@ -67,7 +67,7 @@ static const scsi_inquiry_response_t sdCardInquiry = { 0x00, 0x00, 0x00, - "rusEFI", + "FOME", "SD Card", {'v',CH_KERNEL_MAJOR+'0','.',CH_KERNEL_MINOR+'0'} }; diff --git a/firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.cpp b/firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.cpp index 95dac8612d..f0582b1f5e 100644 --- a/firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.cpp +++ b/firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.cpp @@ -203,22 +203,21 @@ static const uint8_t vcom_string0[] = { * Vendor string. */ static const uint8_t vcom_string1[] = { - USB_DESC_BYTE(22), /* bLength. */ + USB_DESC_BYTE(8), /* bLength. */ USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */ - 'r', 0, 'u', 0, 's', 0, 'E', 0, 'F', 0, 'I', 0, ' ', 0, 'L', 0, - 'L', 0, 'C', 0 + 'F', 0, 'O', 0, 'M', 0, 'E', 0 }; /* * Device Description string. */ static const uint8_t vcom_string2[] = { - USB_DESC_BYTE(58), /* bLength. */ + USB_DESC_BYTE(54), /* bLength. */ USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */ - 'r', 0, 'u', 0, 's', 0, 'E', 0, 'F', 0, 'I', 0, ' ', 0, 'E', 0, - 'n', 0, 'g', 0, 'i', 0, 'n', 0, 'e', 0, ' ', 0, 'M', 0, 'a', 0, - 'n', 0, 'a', 0, 'g', 0, 'e', 0, 'm', 0, 'e', 0, 'n', 0, 't', 0, - ' ', 0, 'E', 0, 'C', 0, 'U', 0 + 'F', 0, 'O', 0, 'M', 0, 'E', 0, ' ', 0, 'E', 0, 'n', 0, 'g', 0, + 'i', 0, 'n', 0, 'e', 0, ' ', 0, 'M', 0, 'a', 0, 'n', 0, 'a', 0, + 'g', 0, 'e', 0, 'm', 0, 'e', 0, 'n', 0, 't', 0, ' ', 0, 'E', 0, + 'C', 0, 'U', 0 }; /*