From 55545406304add9e69bd6617bb06890255322643 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 11 Dec 2015 10:00:03 +0100 Subject: [PATCH] Lowercase again in all directories to simplify things --- .../firmwares/opentx/simulator/CMakeLists.txt | 40 +-- .../opentx/simulator/opentxsimulator.cpp | 298 +++++++++--------- radio/src/Makefile | 222 ++++++------- radio/src/bitmaps/{9X => 9x}/about.png | Bin radio/src/bitmaps/{9X => 9x}/asterisk.png | Bin radio/src/bitmaps/{9X => 9x}/asterisk.xbm | 0 radio/src/bitmaps/{9X => 9x}/splash.png | Bin radio/src/bitmaps/{9X => 9x}/splash.xbm | 0 .../src/bitmaps/{Horus => horus}/asterisk.png | Bin .../bitmaps/{Horus => horus}/background.png | Bin .../src/bitmaps/{Horus => horus}/corsair.png | Bin .../{Horus => horus}/mainview_flat.png | Bin .../bitmaps/{Horus => horus}/mask_analogs.png | Bin .../{Horus => horus}/mask_calibration.png | Bin .../{Horus => horus}/mask_coord_shadow.png | Bin .../{Horus => horus}/mask_current_bg.png | Bin .../{Horus => horus}/mask_current_dot.png | Bin .../{Horus => horus}/mask_current_shadow.png | Bin .../bitmaps/{Horus => horus}/mask_curves.png | Bin .../bitmaps/{Horus => horus}/mask_cvpoint.png | Bin .../{Horus => horus}/mask_cvpoint_center.png | Bin .../src/bitmaps/{Horus => horus}/mask_dot.png | Bin .../{Horus => horus}/mask_flight_modes.png | Bin .../mask_global_functions.png | Bin .../bitmaps/{Horus => horus}/mask_gvars.png | Bin .../{Horus => horus}/mask_hardware.png | Bin .../bitmaps/{Horus => horus}/mask_heli.png | Bin .../{Horus => horus}/mask_htrim_frame.png | Bin .../bitmaps/{Horus => horus}/mask_inputs.png | Bin .../bitmaps/{Horus => horus}/mask_library.png | Bin .../mask_library_active_model.png | Bin .../mask_library_category_index.png | Bin .../{Horus => horus}/mask_library_score_0.png | Bin .../{Horus => horus}/mask_library_score_1.png | Bin .../{Horus => horus}/mask_library_slot.png | Bin .../{Horus => horus}/mask_library_star_0.png | Bin .../{Horus => horus}/mask_library_star_1.png | Bin .../mask_logical_switches.png | Bin .../{Horus => horus}/mask_lua_scripts.png | Bin .../{Horus => horus}/mask_menu_model.png | Bin .../{Horus => horus}/mask_menu_radio.png | Bin .../bitmaps/{Horus => horus}/mask_mixer.png | Bin .../{Horus => horus}/mask_model_setup.png | Bin .../{Horus => horus}/mask_noscale_ico.png | Bin .../bitmaps/{Horus => horus}/mask_outputs.png | Bin .../bitmaps/{Horus => horus}/mask_point.png | Bin .../{Horus => horus}/mask_radio_setup.png | Bin .../bitmaps/{Horus => horus}/mask_rscale.png | Bin .../{Horus => horus}/mask_sd_browser.png | Bin .../mask_special_functions.png | Bin .../{Horus => horus}/mask_switches.png | Bin .../{Horus => horus}/mask_telemetry.png | Bin .../{Horus => horus}/mask_timer_bg.png | Bin .../mask_topmenu_altitude_ico.png | Bin .../mask_topmenu_masterpart_ico.png | Bin .../{Horus => horus}/mask_topmenu_opentx.png | Bin .../{Horus => horus}/mask_topmenu_polygon.png | Bin .../{Horus => horus}/mask_topmenu_sdcard.png | Bin .../mask_topmenu_slavepart_ico.png | Bin .../{Horus => horus}/mask_topmenu_usb.png | Bin .../mask_topmenu_volume_ico.png | Bin .../bitmaps/{Horus => horus}/mask_trainer.png | Bin .../{Horus => horus}/mask_trim_shadow.png | Bin .../bitmaps/{Horus => horus}/mask_version.png | Bin .../{Horus => horus}/mask_vtrim_frame.png | Bin radio/src/bitmaps/{Horus => horus}/splash.png | Bin .../bitmaps/{Horus => horus}/std/bar_bg.png | Bin .../{Horus => horus}/std/bar_group_bg.png | Bin .../std/bat_indicator_back.png | Bin .../std/bat_indicator_back_alert.png | Bin .../bitmaps/{Horus => horus}/std/menu_ico.png | Bin .../{Horus => horus}/std/model_img_f4U.png | Bin .../std/signal_indicator_back.png | Bin .../std/signal_indicator_back_alert.png | Bin .../std/trim_activarea_horizontal.png | Bin .../std/trim_activarea_vertical.png | Bin .../std/trim_bg_horizontal.png | Bin .../{Horus => horus}/std/trim_bg_vertical.png | Bin .../std/trim_center_horizontal.png | Bin .../std/trim_center_vertical.png | Bin .../std/trim_down_vertical.png | Bin .../std/trim_left_horizontal.png | Bin .../std/trim_right_horizontal.png | Bin .../{Horus => horus}/std/trim_up_vertical.png | Bin .../std/volume_indicator_back.png | Bin .../bitmaps/{Taranis => taranis}/.gitignore | 0 .../bitmaps/{Taranis => taranis}/about.png | Bin .../bitmaps/{Taranis => taranis}/asterisk.png | Bin .../bitmaps/{Taranis => taranis}/icons.png | Bin .../src/bitmaps/{Taranis => taranis}/lock.png | Bin .../src/bitmaps/{Taranis => taranis}/logo.png | Bin .../bitmaps/{Taranis => taranis}/shutdown.png | Bin .../bitmaps/{Taranis => taranis}/sleep.png | Bin .../bitmaps/{Taranis => taranis}/splash.png | Bin .../bitmaps/{Taranis => taranis}/startup.png | Bin .../std/analog_inputs.png | Bin .../{Taranis => taranis}/std/calibration.png | Bin .../{Taranis => taranis}/std/curves.png | Bin .../{Taranis => taranis}/std/files.png | Bin .../{Taranis => taranis}/std/flight_modes.png | Bin .../std/global_functions.png | Bin .../{Taranis => taranis}/std/global_vars.png | Bin .../{Taranis => taranis}/std/hardware.png | Bin .../{Taranis => taranis}/std/heli_setup.png | Bin .../{Taranis => taranis}/std/inputs.png | Bin .../{Taranis => taranis}/std/logical_sw.png | Bin .../{Taranis => taranis}/std/lua_scripts.png | Bin .../std/mainview_setup.png | Bin .../{Taranis => taranis}/std/mixer.png | Bin .../{Taranis => taranis}/std/model_select.png | Bin .../std/model_settings.png | Bin .../{Taranis => taranis}/std/model_setup.png | Bin .../{Taranis => taranis}/std/radio_setup.png | Bin .../{Taranis => taranis}/std/servos.png | Bin .../std/special_functions.png | Bin .../{Taranis => taranis}/std/switch_test.png | Bin .../{Taranis => taranis}/std/telemetry.png | Bin .../{Taranis => taranis}/std/trainer.png | Bin .../{Taranis => taranis}/std/version.png | Bin .../fonts/{Horus => horus}/font_dblsize.png | Bin .../fonts/{Horus => horus}/font_dblsize.specs | 0 .../fonts/{Horus => horus}/font_midsize.png | Bin .../fonts/{Horus => horus}/font_midsize.specs | 0 .../fonts/{Horus => horus}/font_smlsize.png | Bin .../fonts/{Horus => horus}/font_smlsize.specs | 0 .../fonts/{Horus => horus}/font_stdsize.png | Bin .../fonts/{Horus => horus}/font_stdsize.specs | 0 .../fonts/{Horus => horus}/font_tinsize.png | Bin .../fonts/{Horus => horus}/font_tinsize.specs | 0 .../fonts/{Horus => horus}/font_xxlsize.png | Bin .../fonts/{Horus => horus}/font_xxlsize.specs | 0 radio/src/gui/{9X => 9x}/fonts.cpp | 0 radio/src/gui/{9X => 9x}/gui.h | 4 +- radio/src/gui/{9X => 9x}/helpers.cpp | 0 radio/src/gui/{9X => 9x}/lcd.cpp | 0 radio/src/gui/{9X => 9x}/lcd.h | 0 radio/src/gui/{9X => 9x}/menu_general.cpp | 0 .../src/gui/{9X => 9x}/menu_general_calib.cpp | 0 .../gui/{9X => 9x}/menu_general_diaganas.cpp | 0 .../gui/{9X => 9x}/menu_general_diagkeys.cpp | 0 .../gui/{9X => 9x}/menu_general_hardware.cpp | 0 .../gui/{9X => 9x}/menu_general_sdmanager.cpp | 0 .../src/gui/{9X => 9x}/menu_general_setup.cpp | 0 .../gui/{9X => 9x}/menu_general_trainer.cpp | 0 .../gui/{9X => 9x}/menu_general_version.cpp | 0 radio/src/gui/{9X => 9x}/menu_model.cpp | 2 +- .../src/gui/{9X => 9x}/menu_model_curves.cpp | 0 .../menu_model_custom_functions.cpp | 0 .../gui/{9X => 9x}/menu_model_flightmodes.cpp | 0 radio/src/gui/{9X => 9x}/menu_model_heli.cpp | 0 .../{9X => 9x}/menu_model_inputs_mixes.cpp | 0 .../src/gui/{9X => 9x}/menu_model_limits.cpp | 0 .../menu_model_logical_switches.cpp | 0 .../src/gui/{9X => 9x}/menu_model_select.cpp | 0 radio/src/gui/{9X => 9x}/menu_model_setup.cpp | 0 .../gui/{9X => 9x}/menu_model_telemetry.cpp | 0 .../gui/{9X => 9x}/menu_model_templates.cpp | 0 radio/src/gui/{9X => 9x}/menus.cpp | 0 radio/src/gui/{9X => 9x}/menus.h | 0 radio/src/gui/{9X => 9x}/navigation.cpp | 0 radio/src/gui/{9X => 9x}/popups.cpp | 0 radio/src/gui/{9X => 9x}/splash.cpp | 2 +- radio/src/gui/{9X => 9x}/view_about.cpp | 2 +- radio/src/gui/{9X => 9x}/view_main.cpp | 0 radio/src/gui/{9X => 9x}/view_mavlink.cpp | 2 +- radio/src/gui/{9X => 9x}/view_mavlink.h | 2 +- radio/src/gui/{9X => 9x}/view_statistics.cpp | 0 radio/src/gui/{9X => 9x}/view_telemetry.cpp | 0 radio/src/gui/{9X => 9x}/view_text.cpp | 0 radio/src/gui/{9X => 9x}/widgets.cpp | 0 radio/src/gui/gui.h | 8 +- radio/src/gui/{Horus => horus}/bitmaps.cpp | 90 +++--- radio/src/gui/{Horus => horus}/curves.cpp | 0 radio/src/gui/{Horus => horus}/fonts.cpp | 24 +- radio/src/gui/{Horus => horus}/gui.h | 4 +- radio/src/gui/{Horus => horus}/helpers.cpp | 0 radio/src/gui/{Horus => horus}/lcd.cpp | 0 radio/src/gui/{Horus => horus}/lcd.h | 0 .../src/gui/{Horus => horus}/menu_general.cpp | 0 .../{Horus => horus}/menu_general_calib.cpp | 0 .../menu_general_sdmanager.cpp | 0 .../{Horus => horus}/menu_general_setup.cpp | 0 .../{Horus => horus}/menu_general_trainer.cpp | 0 .../{Horus => horus}/menu_general_version.cpp | 0 radio/src/gui/{Horus => horus}/menu_model.cpp | 0 .../{Horus => horus}/menu_model_curves.cpp | 0 .../menu_model_custom_functions.cpp | 0 .../menu_model_custom_scripts.cpp | 0 .../menu_model_flightmodes.cpp | 0 .../gui/{Horus => horus}/menu_model_gvars.cpp | 0 .../gui/{Horus => horus}/menu_model_heli.cpp | 0 .../menu_model_inputs_mixes.cpp | 0 .../{Horus => horus}/menu_model_limits.cpp | 0 .../menu_model_logical_switches.cpp | 0 .../{Horus => horus}/menu_model_select.cpp | 0 .../gui/{Horus => horus}/menu_model_setup.cpp | 0 .../{Horus => horus}/menu_model_telemetry.cpp | 0 radio/src/gui/{Horus => horus}/menus.cpp | 0 radio/src/gui/{Horus => horus}/menus.h | 0 radio/src/gui/{Horus => horus}/navigation.cpp | 0 radio/src/gui/{Horus => horus}/popups.cpp | 0 radio/src/gui/{Horus => horus}/splash.cpp | 2 +- radio/src/gui/{Horus => horus}/view_about.cpp | 0 .../gui/{Horus => horus}/view_channels.cpp | 0 radio/src/gui/{Horus => horus}/view_main.cpp | 0 .../gui/{Horus => horus}/view_statistics.cpp | 0 .../gui/{Horus => horus}/view_telemetry.cpp | 0 radio/src/gui/{Horus => horus}/view_text.cpp | 0 radio/src/gui/{Horus => horus}/widgets.cpp | 0 radio/src/gui/{Taranis => taranis}/fonts.cpp | 0 radio/src/gui/{Taranis => taranis}/gui.h | 4 +- .../src/gui/{Taranis => taranis}/helpers.cpp | 0 radio/src/gui/{Taranis => taranis}/lcd.cpp | 0 radio/src/gui/{Taranis => taranis}/lcd.h | 0 .../gui/{Taranis => taranis}/menu_general.cpp | 0 .../menu_general_calib.cpp | 0 .../menu_general_diaganas.cpp | 0 .../menu_general_diagkeys.cpp | 0 .../menu_general_hardware.cpp | 0 .../menu_general_sdmanager.cpp | 0 .../menu_general_setup.cpp | 0 .../menu_general_trainer.cpp | 0 .../menu_general_version.cpp | 0 .../gui/{Taranis => taranis}/menu_model.cpp | 0 .../menu_model_curves.cpp | 0 .../menu_model_custom_functions.cpp | 0 .../menu_model_custom_scripts.cpp | 0 .../menu_model_flightmodes.cpp | 0 .../{Taranis => taranis}/menu_model_gvars.cpp | 0 .../{Taranis => taranis}/menu_model_heli.cpp | 0 .../menu_model_inputs_mixes.cpp | 0 .../menu_model_limits.cpp | 0 .../menu_model_logical_switches.cpp | 0 .../menu_model_select.cpp | 0 .../{Taranis => taranis}/menu_model_setup.cpp | 0 .../menu_model_telemetry.cpp | 0 radio/src/gui/{Taranis => taranis}/menus.cpp | 0 radio/src/gui/{Taranis => taranis}/menus.h | 0 .../gui/{Taranis => taranis}/navigation.cpp | 0 radio/src/gui/{Taranis => taranis}/popups.cpp | 0 radio/src/gui/{Taranis => taranis}/splash.cpp | 2 +- .../gui/{Taranis => taranis}/view_about.cpp | 2 +- .../{Taranis => taranis}/view_channels.cpp | 0 .../gui/{Taranis => taranis}/view_main.cpp | 4 +- .../{Taranis => taranis}/view_statistics.cpp | 0 .../{Taranis => taranis}/view_telemetry.cpp | 0 .../gui/{Taranis => taranis}/view_text.cpp | 0 .../src/gui/{Taranis => taranis}/widgets.cpp | 2 +- radio/src/loadboot.cpp | 2 +- radio/src/opentx.cpp | 6 +- radio/src/opentx.h | 14 +- .../{Gruvin9x => gruvin9x}/board_gruvin9x.cpp | 0 .../{Gruvin9x => gruvin9x}/board_gruvin9x.h | 0 .../targets/{Gruvin9x => gruvin9x}/diskio.cpp | 0 .../{Gruvin9x => gruvin9x}/fuses_2561.txt | 0 .../{Gruvin9x => gruvin9x}/rtc_driver.cpp | 0 .../{Gruvin9x => gruvin9x}/somo14d.cpp | 0 .../targets/{Gruvin9x => gruvin9x}/somo14d.h | 0 .../targets/{Horus => horus}/adc_driver.cpp | 0 .../targets/{Horus => horus}/audio_driver.cpp | 0 .../targets/{Horus => horus}/board_horus.cpp | 0 .../targets/{Horus => horus}/board_horus.h | 8 +- radio/src/targets/{Horus => horus}/delays.c | 2 +- radio/src/targets/{Horus => horus}/diskio.cpp | 3 +- radio/src/targets/{Horus => horus}/hal.h | 0 .../{Horus => horus}/haptic_driver.cpp | 0 .../targets/{Horus => horus}/i2c_driver.cpp | 2 +- .../targets/{Horus => horus}/keys_driver.cpp | 0 .../targets/{Horus => horus}/lcd_driver.cpp | 0 .../targets/{Horus => horus}/led_driver.cpp | 2 +- .../{Horus => horus}/pulses_driver.cpp | 0 .../src/targets/{Horus => horus}/pwr_driver.c | 2 +- radio/src/targets/{Horus => horus}/sdio_sd.c | 3 +- radio/src/targets/{Horus => horus}/sdio_sd.h | 2 +- .../targets/{Horus => horus}/sdram_driver.c | 2 +- .../{Horus => horus}/serial2_driver.cpp | 0 .../targets/{Horus => horus}/stm32f4_flash.ld | 0 .../{Horus => horus}/system_stm32f4xx.c | 0 .../{Horus => horus}/telemetry_driver.cpp | 0 .../{Horus => horus}/trainer_driver.cpp | 0 .../src/targets/{Taranis => horus}/usb_bsp.c | 4 +- radio/src/targets/{Horus => horus}/usb_conf.h | 0 .../src/targets/{Horus => horus}/usb_driver.c | 2 +- .../targets/{Taranis => horus}/usbd_cdc.cpp | 2 +- .../targets/{Taranis => horus}/usbd_conf.h | 2 +- .../src/targets/{Horus => horus}/usbd_desc.c | 8 +- .../src/targets/{Horus => horus}/usbd_desc.h | 0 .../{Horus => horus}/usbd_desc.h~origin_next | 0 .../{Taranis => horus}/usbd_hid_joystick.c | 2 +- .../{Horus => horus}/usbd_storage_msd.cpp | 6 +- .../src/targets/{Horus => horus}/usbd_usr.cpp | 0 .../{Mega2560 => mega2560}/00readme.txt | 0 .../{Mega2560 => mega2560}/board_mega2560.cpp | 0 .../{Mega2560 => mega2560}/board_mega2560.h | 0 .../src/targets/{Sky9x => sky9x}/AT91SAM3S2.h | 0 .../src/targets/{Sky9x => sky9x}/AT91SAM3S4.h | 0 .../src/targets/{Sky9x => sky9x}/MEDSdcard.c | 4 +- radio/src/targets/{Sky9x => sky9x}/Media.h | 0 .../targets/{Sky9x => sky9x}/adc_driver.cpp | 0 .../targets/{Sky9x => sky9x}/audio_driver.cpp | 0 .../targets/{Sky9x => sky9x}/audio_driver.h | 6 +- .../targets/{Sky9x => sky9x}/bluetooth.cpp | 0 radio/src/targets/{Sky9x => sky9x}/board.h | 8 +- .../targets/{Sky9x => sky9x}/board_lowlevel.c | 2 +- .../targets/{Sky9x => sky9x}/board_sky9x.cpp | 0 .../targets/{Sky9x => sky9x}/board_sky9x.h | 0 .../{Sky9x => sky9x}/buzzer_driver.cpp | 0 radio/src/targets/{Sky9x => sky9x}/chip.h | 0 .../{Sky9x => sky9x}/coproc_driver.cpp | 0 radio/src/targets/{Sky9x => sky9x}/core_cm3.c | 0 radio/src/targets/{Sky9x => sky9x}/core_cm3.h | 0 radio/src/targets/{Sky9x => sky9x}/crt.c | 0 radio/src/targets/{Sky9x => sky9x}/diskio.cpp | 2 +- .../{Sky9x => sky9x}/eeprom_driver.cpp | 0 .../targets/{Sky9x => sky9x}/flash_driver.cpp | 0 .../{Sky9x => sky9x}/haptic_driver.cpp | 0 .../targets/{Sky9x => sky9x}/keys_driver.cpp | 0 .../targets/{Sky9x => sky9x}/lcd_driver.cpp | 0 .../targets/{Sky9x => sky9x}/massstorage.cpp | 2 +- .../{Sky9x => sky9x}/pulses_driver.cpp | 0 .../targets/{Sky9x => sky9x}/pwr_driver.cpp | 0 .../{Sky9x => sky9x}/rotenc_driver.cpp | 0 .../targets/{Sky9x => sky9x}/rtc_driver.cpp | 0 .../targets/{Sky9x => sky9x}/sam3s2c_flash.ld | 0 .../targets/{Sky9x => sky9x}/sam3s4c_flash.ld | 0 .../targets/{Sky9x => sky9x}/sam3s8c_flash.ld | 0 .../{Sky9x => sky9x}/sdcard_driver.cpp | 0 .../{Sky9x => sky9x}/serial2_driver.cpp | 0 .../{Sky9x => sky9x}/telemetry_driver.cpp | 0 .../common/core/USBConfigurationDescriptor.c | 2 +- .../common/core/USBConfigurationDescriptor.h | 6 +- .../usb/common/core/USBDeviceDescriptor.h | 2 +- .../core/USBDeviceQualifierDescriptor.h | 0 .../usb/common/core/USBEndpointDescriptor.c | 2 +- .../usb/common/core/USBEndpointDescriptor.h | 0 .../usb/common/core/USBFeatureRequest.c | 2 +- .../usb/common/core/USBFeatureRequest.h | 2 +- .../usb/common/core/USBGenericDescriptor.c | 2 +- .../usb/common/core/USBGenericDescriptor.h | 0 .../usb/common/core/USBGenericRequest.c | 2 +- .../usb/common/core/USBGenericRequest.h | 0 .../usb/common/core/USBGetDescriptorRequest.c | 2 +- .../usb/common/core/USBGetDescriptorRequest.h | 2 +- .../core/USBInterfaceAssociationDescriptor.h | 0 .../usb/common/core/USBInterfaceDescriptor.h | 0 .../usb/common/core/USBInterfaceRequest.c | 2 +- .../usb/common/core/USBInterfaceRequest.h | 2 +- .../usb/common/core/USBIrqHandler.c | 5 +- .../usb/common/core/USBIrqHandler.h | 0 .../usb/common/core/USBSetAddressRequest.c | 2 +- .../usb/common/core/USBSetAddressRequest.h | 2 +- .../common/core/USBSetConfigurationRequest.c | 2 +- .../common/core/USBSetConfigurationRequest.h | 2 +- .../usb/common/core/USBStringDescriptor.h | 0 .../common/massstorage/MSDeviceDescriptor.h | 0 .../massstorage/MSInterfaceDescriptor.h | 0 .../{Sky9x => sky9x}/usb/device/core/USBD.h | 4 +- .../usb/device/core/USBDDriver.c | 27 +- .../usb/device/core/USBDDriver.h | 4 +- .../usb/device/core/USBDDriverDescriptors.h | 6 +- .../usb/device/core/USBD_UDP.c | 8 +- .../usb/device/massstorage/MSD.h | 0 .../usb/device/massstorage/MSDDStateMachine.c | 4 +- .../usb/device/massstorage/MSDDStateMachine.h | 4 +- .../usb/device/massstorage/MSDDriver.c | 16 +- .../usb/device/massstorage/MSDDriver.h | 4 +- .../device/massstorage/MSDDriverDescriptors.c | 20 +- .../device/massstorage/MSDDriverDescriptors.h | 2 +- .../usb/device/massstorage/MSDIOFifo.h | 0 .../usb/device/massstorage/MSDLun.c | 4 +- .../usb/device/massstorage/MSDLun.h | 8 +- .../usb/device/massstorage/SBC.h | 0 .../usb/device/massstorage/SBCMethods.c | 8 +- .../usb/device/massstorage/SBCMethods.h | 4 +- .../targets/{Sky9x => sky9x}/vectors_sam3s.c | 0 .../{Taranis => taranis}/adc_driver.cpp | 0 radio/src/targets/{Taranis => taranis}/aspi.c | 2 +- radio/src/targets/{Taranis => taranis}/aspi.h | 0 .../{Taranis => taranis}/audio_driver.cpp | 0 .../{Taranis => taranis}/bluetooth_driver.cpp | 2 +- .../{Taranis => taranis}/board_taranis.cpp | 4 +- .../{Taranis => taranis}/board_taranis.h | 10 +- .../bootloader/.gitignore | 0 .../{Taranis => taranis}/bootloader/Makefile | 2 +- .../{Taranis => taranis}/bootloader/boot.cpp | 4 +- .../{Taranis => taranis}/bootloader/init.c | 0 .../{Taranis => taranis}/configure_pins.cpp | 0 .../src/targets/{Taranis => taranis}/delays.c | 2 +- .../targets/{Taranis => taranis}/diskio.cpp | 2 +- .../{Taranis => taranis}/flash_driver.cpp | 0 radio/src/targets/{Taranis => taranis}/hal.h | 0 .../{Taranis => taranis}/haptic_driver.cpp | 0 .../{Taranis => taranis}/i2c_driver.cpp | 2 +- .../{Taranis => taranis}/keys_driver.cpp | 0 .../{Taranis => taranis}/lcd_driver.cpp | 0 .../{Taranis => taranis}/pulses_driver.cpp | 0 .../targets/{Taranis => taranis}/pwr_driver.c | 2 +- .../{Taranis => taranis}/rtc_driver.cpp | 0 .../{Taranis => taranis}/serial2_driver.cpp | 0 .../{Taranis => taranis}/stm32_ramboot.ld | 0 .../{Taranis => taranis}/stm32f2_flash.ld | 0 .../{Taranis => taranis}/stm32f4_flash.ld | 0 .../{Taranis => taranis}/system_stm32f2xx.c | 0 .../{Taranis => taranis}/system_stm32f4xx.c | 0 .../{Taranis => taranis}/telemetry_driver.cpp | 0 .../{Taranis => taranis}/top_lcd_driver.cpp | 2 +- .../{Taranis => taranis}/trainer_driver.cpp | 0 .../src/targets/{Horus => taranis}/usb_bsp.c | 4 +- .../targets/{Taranis => taranis}/usb_conf.h | 0 .../targets/{Taranis => taranis}/usb_driver.c | 2 +- .../targets/{Horus => taranis}/usbd_cdc.cpp | 2 +- .../targets/{Horus => taranis}/usbd_conf.h | 2 +- .../targets/{Taranis => taranis}/usbd_desc.c | 8 +- .../targets/{Taranis => taranis}/usbd_desc.h | 0 .../{Horus => taranis}/usbd_hid_joystick.c | 2 +- .../{Taranis => taranis}/usbd_storage_msd.cpp | 4 +- .../targets/{Taranis => taranis}/usbd_usr.cpp | 0 radio/util/taranisicons.py | 4 +- 418 files changed, 524 insertions(+), 516 deletions(-) rename radio/src/bitmaps/{9X => 9x}/about.png (100%) rename radio/src/bitmaps/{9X => 9x}/asterisk.png (100%) rename radio/src/bitmaps/{9X => 9x}/asterisk.xbm (100%) rename radio/src/bitmaps/{9X => 9x}/splash.png (100%) rename radio/src/bitmaps/{9X => 9x}/splash.xbm (100%) rename radio/src/bitmaps/{Horus => horus}/asterisk.png (100%) rename radio/src/bitmaps/{Horus => horus}/background.png (100%) rename radio/src/bitmaps/{Horus => horus}/corsair.png (100%) rename radio/src/bitmaps/{Horus => horus}/mainview_flat.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_analogs.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_calibration.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_coord_shadow.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_current_bg.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_current_dot.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_current_shadow.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_curves.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_cvpoint.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_cvpoint_center.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_dot.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_flight_modes.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_global_functions.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_gvars.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_hardware.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_heli.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_htrim_frame.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_inputs.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_library.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_library_active_model.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_library_category_index.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_library_score_0.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_library_score_1.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_library_slot.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_library_star_0.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_library_star_1.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_logical_switches.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_lua_scripts.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_menu_model.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_menu_radio.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_mixer.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_model_setup.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_noscale_ico.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_outputs.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_point.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_radio_setup.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_rscale.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_sd_browser.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_special_functions.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_switches.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_telemetry.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_timer_bg.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_topmenu_altitude_ico.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_topmenu_masterpart_ico.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_topmenu_opentx.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_topmenu_polygon.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_topmenu_sdcard.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_topmenu_slavepart_ico.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_topmenu_usb.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_topmenu_volume_ico.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_trainer.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_trim_shadow.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_version.png (100%) rename radio/src/bitmaps/{Horus => horus}/mask_vtrim_frame.png (100%) rename radio/src/bitmaps/{Horus => horus}/splash.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/bar_bg.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/bar_group_bg.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/bat_indicator_back.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/bat_indicator_back_alert.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/menu_ico.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/model_img_f4U.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/signal_indicator_back.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/signal_indicator_back_alert.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/trim_activarea_horizontal.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/trim_activarea_vertical.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/trim_bg_horizontal.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/trim_bg_vertical.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/trim_center_horizontal.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/trim_center_vertical.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/trim_down_vertical.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/trim_left_horizontal.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/trim_right_horizontal.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/trim_up_vertical.png (100%) rename radio/src/bitmaps/{Horus => horus}/std/volume_indicator_back.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/.gitignore (100%) rename radio/src/bitmaps/{Taranis => taranis}/about.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/asterisk.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/icons.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/lock.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/logo.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/shutdown.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/sleep.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/splash.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/startup.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/analog_inputs.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/calibration.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/curves.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/files.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/flight_modes.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/global_functions.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/global_vars.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/hardware.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/heli_setup.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/inputs.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/logical_sw.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/lua_scripts.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/mainview_setup.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/mixer.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/model_select.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/model_settings.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/model_setup.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/radio_setup.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/servos.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/special_functions.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/switch_test.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/telemetry.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/trainer.png (100%) rename radio/src/bitmaps/{Taranis => taranis}/std/version.png (100%) rename radio/src/fonts/{Horus => horus}/font_dblsize.png (100%) rename radio/src/fonts/{Horus => horus}/font_dblsize.specs (100%) rename radio/src/fonts/{Horus => horus}/font_midsize.png (100%) rename radio/src/fonts/{Horus => horus}/font_midsize.specs (100%) rename radio/src/fonts/{Horus => horus}/font_smlsize.png (100%) rename radio/src/fonts/{Horus => horus}/font_smlsize.specs (100%) rename radio/src/fonts/{Horus => horus}/font_stdsize.png (100%) rename radio/src/fonts/{Horus => horus}/font_stdsize.specs (100%) rename radio/src/fonts/{Horus => horus}/font_tinsize.png (100%) rename radio/src/fonts/{Horus => horus}/font_tinsize.specs (100%) rename radio/src/fonts/{Horus => horus}/font_xxlsize.png (100%) rename radio/src/fonts/{Horus => horus}/font_xxlsize.specs (100%) rename radio/src/gui/{9X => 9x}/fonts.cpp (100%) rename radio/src/gui/{9X => 9x}/gui.h (97%) rename radio/src/gui/{9X => 9x}/helpers.cpp (100%) rename radio/src/gui/{9X => 9x}/lcd.cpp (100%) rename radio/src/gui/{9X => 9x}/lcd.h (100%) rename radio/src/gui/{9X => 9x}/menu_general.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_general_calib.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_general_diaganas.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_general_diagkeys.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_general_hardware.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_general_sdmanager.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_general_setup.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_general_trainer.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_general_version.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_model.cpp (99%) rename radio/src/gui/{9X => 9x}/menu_model_curves.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_model_custom_functions.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_model_flightmodes.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_model_heli.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_model_inputs_mixes.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_model_limits.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_model_logical_switches.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_model_select.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_model_setup.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_model_telemetry.cpp (100%) rename radio/src/gui/{9X => 9x}/menu_model_templates.cpp (100%) rename radio/src/gui/{9X => 9x}/menus.cpp (100%) rename radio/src/gui/{9X => 9x}/menus.h (100%) rename radio/src/gui/{9X => 9x}/navigation.cpp (100%) rename radio/src/gui/{9X => 9x}/popups.cpp (100%) rename radio/src/gui/{9X => 9x}/splash.cpp (97%) rename radio/src/gui/{9X => 9x}/view_about.cpp (96%) rename radio/src/gui/{9X => 9x}/view_main.cpp (100%) rename radio/src/gui/{9X => 9x}/view_mavlink.cpp (99%) rename radio/src/gui/{9X => 9x}/view_mavlink.h (99%) rename radio/src/gui/{9X => 9x}/view_statistics.cpp (100%) rename radio/src/gui/{9X => 9x}/view_telemetry.cpp (100%) rename radio/src/gui/{9X => 9x}/view_text.cpp (100%) rename radio/src/gui/{9X => 9x}/widgets.cpp (100%) rename radio/src/gui/{Horus => horus}/bitmaps.cpp (62%) rename radio/src/gui/{Horus => horus}/curves.cpp (100%) rename radio/src/gui/{Horus => horus}/fonts.cpp (77%) rename radio/src/gui/{Horus => horus}/gui.h (98%) rename radio/src/gui/{Horus => horus}/helpers.cpp (100%) rename radio/src/gui/{Horus => horus}/lcd.cpp (100%) rename radio/src/gui/{Horus => horus}/lcd.h (100%) rename radio/src/gui/{Horus => horus}/menu_general.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_general_calib.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_general_sdmanager.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_general_setup.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_general_trainer.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_general_version.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_model.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_model_curves.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_model_custom_functions.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_model_custom_scripts.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_model_flightmodes.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_model_gvars.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_model_heli.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_model_inputs_mixes.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_model_limits.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_model_logical_switches.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_model_select.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_model_setup.cpp (100%) rename radio/src/gui/{Horus => horus}/menu_model_telemetry.cpp (100%) rename radio/src/gui/{Horus => horus}/menus.cpp (100%) rename radio/src/gui/{Horus => horus}/menus.h (100%) rename radio/src/gui/{Horus => horus}/navigation.cpp (100%) rename radio/src/gui/{Horus => horus}/popups.cpp (100%) rename radio/src/gui/{Horus => horus}/splash.cpp (97%) rename radio/src/gui/{Horus => horus}/view_about.cpp (100%) rename radio/src/gui/{Horus => horus}/view_channels.cpp (100%) rename radio/src/gui/{Horus => horus}/view_main.cpp (100%) rename radio/src/gui/{Horus => horus}/view_statistics.cpp (100%) rename radio/src/gui/{Horus => horus}/view_telemetry.cpp (100%) rename radio/src/gui/{Horus => horus}/view_text.cpp (100%) rename radio/src/gui/{Horus => horus}/widgets.cpp (100%) rename radio/src/gui/{Taranis => taranis}/fonts.cpp (100%) rename radio/src/gui/{Taranis => taranis}/gui.h (97%) rename radio/src/gui/{Taranis => taranis}/helpers.cpp (100%) rename radio/src/gui/{Taranis => taranis}/lcd.cpp (100%) rename radio/src/gui/{Taranis => taranis}/lcd.h (100%) rename radio/src/gui/{Taranis => taranis}/menu_general.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_general_calib.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_general_diaganas.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_general_diagkeys.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_general_hardware.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_general_sdmanager.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_general_setup.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_general_trainer.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_general_version.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_model.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_model_curves.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_model_custom_functions.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_model_custom_scripts.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_model_flightmodes.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_model_gvars.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_model_heli.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_model_inputs_mixes.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_model_limits.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_model_logical_switches.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_model_select.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_model_setup.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menu_model_telemetry.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menus.cpp (100%) rename radio/src/gui/{Taranis => taranis}/menus.h (100%) rename radio/src/gui/{Taranis => taranis}/navigation.cpp (100%) rename radio/src/gui/{Taranis => taranis}/popups.cpp (100%) rename radio/src/gui/{Taranis => taranis}/splash.cpp (97%) rename radio/src/gui/{Taranis => taranis}/view_about.cpp (96%) rename radio/src/gui/{Taranis => taranis}/view_channels.cpp (100%) rename radio/src/gui/{Taranis => taranis}/view_main.cpp (96%) rename radio/src/gui/{Taranis => taranis}/view_statistics.cpp (100%) rename radio/src/gui/{Taranis => taranis}/view_telemetry.cpp (100%) rename radio/src/gui/{Taranis => taranis}/view_text.cpp (100%) rename radio/src/gui/{Taranis => taranis}/widgets.cpp (99%) rename radio/src/targets/{Gruvin9x => gruvin9x}/board_gruvin9x.cpp (100%) rename radio/src/targets/{Gruvin9x => gruvin9x}/board_gruvin9x.h (100%) rename radio/src/targets/{Gruvin9x => gruvin9x}/diskio.cpp (100%) rename radio/src/targets/{Gruvin9x => gruvin9x}/fuses_2561.txt (100%) rename radio/src/targets/{Gruvin9x => gruvin9x}/rtc_driver.cpp (100%) rename radio/src/targets/{Gruvin9x => gruvin9x}/somo14d.cpp (100%) rename radio/src/targets/{Gruvin9x => gruvin9x}/somo14d.h (100%) rename radio/src/targets/{Horus => horus}/adc_driver.cpp (100%) rename radio/src/targets/{Horus => horus}/audio_driver.cpp (100%) rename radio/src/targets/{Horus => horus}/board_horus.cpp (100%) rename radio/src/targets/{Horus => horus}/board_horus.h (96%) rename radio/src/targets/{Horus => horus}/delays.c (94%) rename radio/src/targets/{Horus => horus}/diskio.cpp (95%) rename radio/src/targets/{Horus => horus}/hal.h (100%) rename radio/src/targets/{Horus => horus}/haptic_driver.cpp (100%) rename radio/src/targets/{Horus => horus}/i2c_driver.cpp (95%) rename radio/src/targets/{Horus => horus}/keys_driver.cpp (100%) rename radio/src/targets/{Horus => horus}/lcd_driver.cpp (100%) rename radio/src/targets/{Horus => horus}/led_driver.cpp (98%) rename radio/src/targets/{Horus => horus}/pulses_driver.cpp (100%) rename radio/src/targets/{Horus => horus}/pwr_driver.c (95%) rename radio/src/targets/{Horus => horus}/sdio_sd.c (96%) rename radio/src/targets/{Horus => horus}/sdio_sd.h (97%) rename radio/src/targets/{Horus => horus}/sdram_driver.c (97%) rename radio/src/targets/{Horus => horus}/serial2_driver.cpp (100%) rename radio/src/targets/{Horus => horus}/stm32f4_flash.ld (100%) rename radio/src/targets/{Horus => horus}/system_stm32f4xx.c (100%) rename radio/src/targets/{Horus => horus}/telemetry_driver.cpp (100%) rename radio/src/targets/{Horus => horus}/trainer_driver.cpp (100%) rename radio/src/targets/{Taranis => horus}/usb_bsp.c (95%) rename radio/src/targets/{Horus => horus}/usb_conf.h (100%) rename radio/src/targets/{Horus => horus}/usb_driver.c (98%) rename radio/src/targets/{Taranis => horus}/usbd_cdc.cpp (96%) rename radio/src/targets/{Taranis => horus}/usbd_conf.h (96%) rename radio/src/targets/{Horus => horus}/usbd_desc.c (95%) rename radio/src/targets/{Horus => horus}/usbd_desc.h (100%) rename radio/src/targets/{Horus => horus}/usbd_desc.h~origin_next (100%) rename radio/src/targets/{Taranis => horus}/usbd_hid_joystick.c (96%) rename radio/src/targets/{Horus => horus}/usbd_storage_msd.cpp (94%) rename radio/src/targets/{Horus => horus}/usbd_usr.cpp (100%) rename radio/src/targets/{Mega2560 => mega2560}/00readme.txt (100%) rename radio/src/targets/{Mega2560 => mega2560}/board_mega2560.cpp (100%) rename radio/src/targets/{Mega2560 => mega2560}/board_mega2560.h (100%) rename radio/src/targets/{Sky9x => sky9x}/AT91SAM3S2.h (100%) rename radio/src/targets/{Sky9x => sky9x}/AT91SAM3S4.h (100%) rename radio/src/targets/{Sky9x => sky9x}/MEDSdcard.c (96%) rename radio/src/targets/{Sky9x => sky9x}/Media.h (100%) rename radio/src/targets/{Sky9x => sky9x}/adc_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/audio_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/audio_driver.h (92%) rename radio/src/targets/{Sky9x => sky9x}/bluetooth.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/board.h (96%) rename radio/src/targets/{Sky9x => sky9x}/board_lowlevel.c (96%) rename radio/src/targets/{Sky9x => sky9x}/board_sky9x.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/board_sky9x.h (100%) rename radio/src/targets/{Sky9x => sky9x}/buzzer_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/chip.h (100%) rename radio/src/targets/{Sky9x => sky9x}/coproc_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/core_cm3.c (100%) rename radio/src/targets/{Sky9x => sky9x}/core_cm3.h (100%) rename radio/src/targets/{Sky9x => sky9x}/crt.c (100%) rename radio/src/targets/{Sky9x => sky9x}/diskio.cpp (96%) rename radio/src/targets/{Sky9x => sky9x}/eeprom_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/flash_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/haptic_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/keys_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/lcd_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/massstorage.cpp (94%) rename radio/src/targets/{Sky9x => sky9x}/pulses_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/pwr_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/rotenc_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/rtc_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/sam3s2c_flash.ld (100%) rename radio/src/targets/{Sky9x => sky9x}/sam3s4c_flash.ld (100%) rename radio/src/targets/{Sky9x => sky9x}/sam3s8c_flash.ld (100%) rename radio/src/targets/{Sky9x => sky9x}/sdcard_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/serial2_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/telemetry_driver.cpp (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBConfigurationDescriptor.c (96%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBConfigurationDescriptor.h (94%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBDeviceDescriptor.h (96%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBDeviceQualifierDescriptor.h (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBEndpointDescriptor.c (96%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBEndpointDescriptor.h (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBFeatureRequest.c (95%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBFeatureRequest.h (96%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBGenericDescriptor.c (95%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBGenericDescriptor.h (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBGenericRequest.c (96%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBGenericRequest.h (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBGetDescriptorRequest.c (95%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBGetDescriptorRequest.h (95%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBInterfaceAssociationDescriptor.h (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBInterfaceDescriptor.h (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBInterfaceRequest.c (95%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBInterfaceRequest.h (95%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBIrqHandler.c (94%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBIrqHandler.h (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBSetAddressRequest.c (95%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBSetAddressRequest.h (94%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBSetConfigurationRequest.c (95%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBSetConfigurationRequest.h (95%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/core/USBStringDescriptor.h (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/massstorage/MSDeviceDescriptor.h (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/common/massstorage/MSInterfaceDescriptor.h (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/core/USBD.h (96%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/core/USBDDriver.c (94%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/core/USBDDriver.h (94%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/core/USBDDriverDescriptors.h (92%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/core/USBD_UDP.c (96%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/massstorage/MSD.h (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/massstorage/MSDDStateMachine.c (96%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/massstorage/MSDDStateMachine.h (96%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/massstorage/MSDDriver.c (93%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/massstorage/MSDDriver.h (94%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/massstorage/MSDDriverDescriptors.c (93%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/massstorage/MSDDriverDescriptors.h (95%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/massstorage/MSDIOFifo.h (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/massstorage/MSDLun.c (96%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/massstorage/MSDLun.h (94%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/massstorage/SBC.h (100%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/massstorage/SBCMethods.c (96%) rename radio/src/targets/{Sky9x => sky9x}/usb/device/massstorage/SBCMethods.h (95%) rename radio/src/targets/{Sky9x => sky9x}/vectors_sam3s.c (100%) rename radio/src/targets/{Taranis => taranis}/adc_driver.cpp (100%) rename radio/src/targets/{Taranis => taranis}/aspi.c (92%) rename radio/src/targets/{Taranis => taranis}/aspi.h (100%) rename radio/src/targets/{Taranis => taranis}/audio_driver.cpp (100%) rename radio/src/targets/{Taranis => taranis}/bluetooth_driver.cpp (95%) rename radio/src/targets/{Taranis => taranis}/board_taranis.cpp (95%) rename radio/src/targets/{Taranis => taranis}/board_taranis.h (95%) rename radio/src/targets/{Taranis => taranis}/bootloader/.gitignore (100%) rename radio/src/targets/{Taranis => taranis}/bootloader/Makefile (99%) rename radio/src/targets/{Taranis => taranis}/bootloader/boot.cpp (99%) rename radio/src/targets/{Taranis => taranis}/bootloader/init.c (100%) rename radio/src/targets/{Taranis => taranis}/configure_pins.cpp (100%) rename radio/src/targets/{Taranis => taranis}/delays.c (94%) rename radio/src/targets/{Taranis => taranis}/diskio.cpp (96%) rename radio/src/targets/{Taranis => taranis}/flash_driver.cpp (100%) rename radio/src/targets/{Taranis => taranis}/hal.h (100%) rename radio/src/targets/{Taranis => taranis}/haptic_driver.cpp (100%) rename radio/src/targets/{Taranis => taranis}/i2c_driver.cpp (96%) rename radio/src/targets/{Taranis => taranis}/keys_driver.cpp (100%) rename radio/src/targets/{Taranis => taranis}/lcd_driver.cpp (100%) rename radio/src/targets/{Taranis => taranis}/pulses_driver.cpp (100%) rename radio/src/targets/{Taranis => taranis}/pwr_driver.c (95%) rename radio/src/targets/{Taranis => taranis}/rtc_driver.cpp (100%) rename radio/src/targets/{Taranis => taranis}/serial2_driver.cpp (100%) rename radio/src/targets/{Taranis => taranis}/stm32_ramboot.ld (100%) rename radio/src/targets/{Taranis => taranis}/stm32f2_flash.ld (100%) rename radio/src/targets/{Taranis => taranis}/stm32f4_flash.ld (100%) rename radio/src/targets/{Taranis => taranis}/system_stm32f2xx.c (100%) rename radio/src/targets/{Taranis => taranis}/system_stm32f4xx.c (100%) rename radio/src/targets/{Taranis => taranis}/telemetry_driver.cpp (100%) rename radio/src/targets/{Taranis => taranis}/top_lcd_driver.cpp (99%) rename radio/src/targets/{Taranis => taranis}/trainer_driver.cpp (100%) rename radio/src/targets/{Horus => taranis}/usb_bsp.c (95%) rename radio/src/targets/{Taranis => taranis}/usb_conf.h (100%) rename radio/src/targets/{Taranis => taranis}/usb_driver.c (98%) rename radio/src/targets/{Horus => taranis}/usbd_cdc.cpp (96%) rename radio/src/targets/{Horus => taranis}/usbd_conf.h (96%) rename radio/src/targets/{Taranis => taranis}/usbd_desc.c (95%) rename radio/src/targets/{Taranis => taranis}/usbd_desc.h (100%) rename radio/src/targets/{Horus => taranis}/usbd_hid_joystick.c (96%) rename radio/src/targets/{Taranis => taranis}/usbd_storage_msd.cpp (96%) rename radio/src/targets/{Taranis => taranis}/usbd_usr.cpp (100%) diff --git a/companion/src/firmwares/opentx/simulator/CMakeLists.txt b/companion/src/firmwares/opentx/simulator/CMakeLists.txt index d154e8d98..c2f3cfbc0 100644 --- a/companion/src/firmwares/opentx/simulator/CMakeLists.txt +++ b/companion/src/firmwares/opentx/simulator/CMakeLists.txt @@ -22,8 +22,8 @@ endmacro(add_bitmaps_target) add_bitmaps_target(lbm_xbm_1bit ${RADIO_SRC_DIRECTORY}/bitmaps/*.xbm 128 1bit) add_bitmaps_target(lbm_fonts_1bit ${RADIO_SRC_DIRECTORY}/fonts/std/*.png 128 "") -add_bitmaps_target(lbm_9x_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/9X/*.png 128 1bit) -add_bitmaps_target(lbm_taranis_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/Taranis/*.png 212 4bits) +add_bitmaps_target(lbm_9x_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/9x/*.png 128 1bit) +add_bitmaps_target(lbm_taranis_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/taranis/*.png 212 4bits) add_dependencies(lbm_9x_bitmaps lbm_fonts_1bit lbm_xbm_1bit) add_dependencies(lbm_taranis_bitmaps lbm_fonts_1bit lbm_xbm_1bit) @@ -39,16 +39,16 @@ macro(add_truetype_font_target radio name font size) add_custom_target(ttf_${radio}_${name} DEPENDS ${target}.png ${target}.specs) endmacro(add_truetype_font_target) -add_truetype_font_target(Horus tinsize "DejaVu Sans" 9) -add_truetype_font_target(Horus smlsize "DejaVu Sans" 13) -add_truetype_font_target(Horus stdsize "DejaVu Sans" 16) -add_truetype_font_target(Horus midsize "DejaVu Sans" 24) -add_truetype_font_target(Horus dblsize "DejaVu Sans" 32) -add_truetype_font_target(Horus xxlsize "DejaVu Sans" 48) +add_truetype_font_target(horus tinsize "DejaVu Sans" 9) +add_truetype_font_target(horus smlsize "DejaVu Sans" 13) +add_truetype_font_target(horus stdsize "DejaVu Sans" 16) +add_truetype_font_target(horus midsize "DejaVu Sans" 24) +add_truetype_font_target(horus dblsize "DejaVu Sans" 32) +add_truetype_font_target(horus xxlsize "DejaVu Sans" 48) -add_bitmaps_target(lbm_horus_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/Horus/????[^_]*.png" 480 5/6/5/8) -add_bitmaps_target(lbm_horus_masks ${RADIO_SRC_DIRECTORY}/bitmaps/Horus/mask_*.png 480 8bits) -add_bitmaps_target(lbm_horus_fonts ${RADIO_SRC_DIRECTORY}/fonts/Horus/*.png 480 8bits) +add_bitmaps_target(lbm_horus_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/????[^_]*.png" 480 5/6/5/8) +add_bitmaps_target(lbm_horus_masks ${RADIO_SRC_DIRECTORY}/bitmaps/horus/mask_*.png 480 8bits) +add_bitmaps_target(lbm_horus_fonts ${RADIO_SRC_DIRECTORY}/fonts/horus/*.png 480 8bits) add_dependencies(lbm_horus_fonts ttf_Horus_tinsize ttf_Horus_smlsize ttf_Horus_stdsize ttf_Horus_midsize ttf_Horus_dblsize ttf_Horus_xxlsize) add_dependencies(lbm_horus_bitmaps lbm_horus_masks lbm_horus_fonts) @@ -207,47 +207,47 @@ target_compile_definitions(opentx-9xr128${SUFFIX}-simulator PRIVATE PCBSTD PCB9X target_link_libraries(opentx-9xr128${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES}) # Gruvin9x -target_include_directories(opentx-gruvin9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/Gruvin9x) +target_include_directories(opentx-gruvin9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/gruvin9x) target_compile_definitions(opentx-gruvin9x${SUFFIX}-simulator PRIVATE PCBGRUVIN9X CPUM2560 EEPROM EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS}) target_link_libraries(opentx-gruvin9x${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES}) # Mega2560 -target_include_directories(opentx-mega2560${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/Mega2560) +target_include_directories(opentx-mega2560${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/mega2560) target_compile_definitions(opentx-mega2560${SUFFIX}-simulator PRIVATE PCBMEGA2560 CPUM2560 EEPROM EEPROM_RLC SDCARD ROTARY_ENCODERS=2 ${COMMON_DEFINITIONS}) target_link_libraries(opentx-mega2560${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES}) # Sky9x -target_include_directories(opentx-sky9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/Sky9x) +target_include_directories(opentx-sky9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/sky9x) target_compile_definitions(opentx-sky9x${SUFFIX}-simulator PRIVATE PCBSKY9X CPUARM VOICE EEPROM SDCARD ${COMMON_DEFINITIONS}) target_link_libraries(opentx-sky9x${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES}) # 9XR-PRO -target_include_directories(opentx-9xrpro${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/Sky9x) +target_include_directories(opentx-9xrpro${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/sky9x) target_compile_definitions(opentx-9xrpro${SUFFIX}-simulator PRIVATE PCBSKY9X REVX CPUARM VOICE EEPROM SDCARD ${COMMON_DEFINITIONS}) target_link_libraries(opentx-9xrpro${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES}) # AR9X -target_include_directories(opentx-ar9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/Sky9x) +target_include_directories(opentx-ar9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/sky9x) target_compile_definitions(opentx-ar9x${SUFFIX}-simulator PRIVATE PCBSKY9X AR9X CPUARM VOICE EEPROM SDCARD ${COMMON_DEFINITIONS}) target_link_libraries(opentx-ar9x${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES}) # Taranis standard -target_include_directories(opentx-taranis${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/Taranis) +target_include_directories(opentx-taranis${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/taranis) target_compile_definitions(opentx-taranis${SUFFIX}-simulator PRIVATE PCBTARANIS CPUARM CPUSTM32 EEPROM EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS}) target_link_libraries(opentx-taranis${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES}) # Taranis Plus -target_include_directories(opentx-taranisplus${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/Taranis) +target_include_directories(opentx-taranisplus${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/taranis) target_compile_definitions(opentx-taranisplus${SUFFIX}-simulator PRIVATE PCBTARANIS REVPLUS CPUARM CPUSTM32 EEPROM EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS}) target_link_libraries(opentx-taranisplus${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES}) # Taranis X9E -target_include_directories(opentx-taranisx9e${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/Taranis) +target_include_directories(opentx-taranisx9e${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/taranis) target_compile_definitions(opentx-taranisx9e${SUFFIX}-simulator PRIVATE PCBTARANIS REVPLUS REV9E CPUARM CPUSTM32 STM32F40_41xxx EEPROM EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS}) target_link_libraries(opentx-taranisx9e${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES}) # Horus -target_include_directories(opentx-horus${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/Horus) +target_include_directories(opentx-horus${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/horus) target_compile_definitions(opentx-horus${SUFFIX}-simulator PRIVATE PCBHORUS CPUARM CPUSTM32 STM32F40_41xxx COLORLCD VOICE SDCARD ${COMMON_DEFINITIONS}) target_link_libraries(opentx-horus${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES}) diff --git a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp index 96c35f879..19efaa450 100644 --- a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp +++ b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp @@ -134,42 +134,42 @@ namespace NAMESPACE { #if defined(PCBHORUS) #include "radio/src/bmp.cpp" -#include "radio/src/gui/Horus/bitmaps.cpp" -#include "radio/src/gui/Horus/curves.cpp" -#include "radio/src/gui/Horus/fonts.cpp" -#include "radio/src/gui/Horus/widgets.cpp" -#include "radio/src/gui/Horus/navigation.cpp" -#include "radio/src/gui/Horus/popups.cpp" -#include "radio/src/gui/Horus/helpers.cpp" -#include "radio/src/gui/Horus/menus.cpp" -#include "radio/src/gui/Horus/menu_model.cpp" -#include "radio/src/gui/Horus/menu_model_select.cpp" -#include "radio/src/gui/Horus/menu_model_setup.cpp" -#include "radio/src/gui/Horus/menu_model_heli.cpp" -#include "radio/src/gui/Horus/menu_model_flightmodes.cpp" -#include "radio/src/gui/Horus/menu_model_inputs_mixes.cpp" -#include "radio/src/gui/Horus/menu_model_curves.cpp" -#include "radio/src/gui/Horus/menu_model_logical_switches.cpp" -#include "radio/src/gui/Horus/menu_model_custom_functions.cpp" -#include "radio/src/gui/Horus/menu_model_custom_scripts.cpp" -#include "radio/src/gui/Horus/menu_model_gvars.cpp" -#include "radio/src/gui/Horus/menu_model_limits.cpp" -#include "radio/src/gui/Horus/menu_model_telemetry.cpp" -#include "radio/src/gui/Horus/menu_general.cpp" -#include "radio/src/gui/Horus/menu_general_setup.cpp" -#include "radio/src/gui/Horus/menu_general_sdmanager.cpp" -#include "radio/src/gui/Horus/menu_general_trainer.cpp" -#include "radio/src/gui/Horus/menu_general_version.cpp" -// #include "radio/src/gui/Horus/menu_general_hardware.cpp" -#include "radio/src/gui/Horus/menu_general_calib.cpp" -#include "radio/src/gui/Horus/view_main.cpp" -#include "radio/src/gui/Horus/view_statistics.cpp" -#include "radio/src/gui/Horus/view_channels.cpp" -#include "radio/src/gui/Horus/view_telemetry.cpp" -#include "radio/src/gui/Horus/view_text.cpp" -#include "radio/src/gui/Horus/view_about.cpp" -#include "radio/src/gui/Horus/lcd.cpp" -#include "radio/src/gui/Horus/splash.cpp" +#include "radio/src/gui/horus/bitmaps.cpp" +#include "radio/src/gui/horus/curves.cpp" +#include "radio/src/gui/horus/fonts.cpp" +#include "radio/src/gui/horus/widgets.cpp" +#include "radio/src/gui/horus/navigation.cpp" +#include "radio/src/gui/horus/popups.cpp" +#include "radio/src/gui/horus/helpers.cpp" +#include "radio/src/gui/horus/menus.cpp" +#include "radio/src/gui/horus/menu_model.cpp" +#include "radio/src/gui/horus/menu_model_select.cpp" +#include "radio/src/gui/horus/menu_model_setup.cpp" +#include "radio/src/gui/horus/menu_model_heli.cpp" +#include "radio/src/gui/horus/menu_model_flightmodes.cpp" +#include "radio/src/gui/horus/menu_model_inputs_mixes.cpp" +#include "radio/src/gui/horus/menu_model_curves.cpp" +#include "radio/src/gui/horus/menu_model_logical_switches.cpp" +#include "radio/src/gui/horus/menu_model_custom_functions.cpp" +#include "radio/src/gui/horus/menu_model_custom_scripts.cpp" +#include "radio/src/gui/horus/menu_model_gvars.cpp" +#include "radio/src/gui/horus/menu_model_limits.cpp" +#include "radio/src/gui/horus/menu_model_telemetry.cpp" +#include "radio/src/gui/horus/menu_general.cpp" +#include "radio/src/gui/horus/menu_general_setup.cpp" +#include "radio/src/gui/horus/menu_general_sdmanager.cpp" +#include "radio/src/gui/horus/menu_general_trainer.cpp" +#include "radio/src/gui/horus/menu_general_version.cpp" +// #include "radio/src/gui/horus/menu_general_hardware.cpp" +#include "radio/src/gui/horus/menu_general_calib.cpp" +#include "radio/src/gui/horus/view_main.cpp" +#include "radio/src/gui/horus/view_statistics.cpp" +#include "radio/src/gui/horus/view_channels.cpp" +#include "radio/src/gui/horus/view_telemetry.cpp" +#include "radio/src/gui/horus/view_text.cpp" +#include "radio/src/gui/horus/view_about.cpp" +#include "radio/src/gui/horus/lcd.cpp" +#include "radio/src/gui/horus/splash.cpp" #elif defined(PCBFLAMENCO) #include "radio/src/gui/Flamenco/fonts.cpp" #include "radio/src/gui/Flamenco/widgets.cpp" @@ -205,86 +205,86 @@ namespace NAMESPACE { #include "radio/src/gui/Flamenco/view_about.cpp" #include "radio/src/gui/Flamenco/lcd.cpp" #include "radio/src/gui/Flamenco/splash.cpp" -#include "radio/src/targets/Flamenco/tw8823_driver.cpp" +#include "radio/src/targets/flamenco/tw8823_driver.cpp" #elif defined(PCBTARANIS) #include "radio/src/bmp.cpp" -#include "radio/src/gui/Taranis/fonts.cpp" -#include "radio/src/gui/Taranis/widgets.cpp" -#include "radio/src/gui/Taranis/navigation.cpp" -#include "radio/src/gui/Taranis/popups.cpp" -#include "radio/src/gui/Taranis/helpers.cpp" -#include "radio/src/gui/Taranis/menus.cpp" -#include "radio/src/gui/Taranis/menu_model.cpp" -#include "radio/src/gui/Taranis/menu_model_select.cpp" -#include "radio/src/gui/Taranis/menu_model_setup.cpp" -#include "radio/src/gui/Taranis/menu_model_heli.cpp" -#include "radio/src/gui/Taranis/menu_model_flightmodes.cpp" -#include "radio/src/gui/Taranis/menu_model_inputs_mixes.cpp" -#include "radio/src/gui/Taranis/menu_model_curves.cpp" -#include "radio/src/gui/Taranis/menu_model_logical_switches.cpp" -#include "radio/src/gui/Taranis/menu_model_custom_functions.cpp" -#include "radio/src/gui/Taranis/menu_model_custom_scripts.cpp" -#include "radio/src/gui/Taranis/menu_model_gvars.cpp" -#include "radio/src/gui/Taranis/menu_model_limits.cpp" -#include "radio/src/gui/Taranis/menu_model_telemetry.cpp" -#include "radio/src/gui/Taranis/menu_general.cpp" -#include "radio/src/gui/Taranis/menu_general_setup.cpp" -#include "radio/src/gui/Taranis/menu_general_sdmanager.cpp" -#include "radio/src/gui/Taranis/menu_general_trainer.cpp" -#include "radio/src/gui/Taranis/menu_general_version.cpp" -#include "radio/src/gui/Taranis/menu_general_diagkeys.cpp" -#include "radio/src/gui/Taranis/menu_general_diaganas.cpp" -#include "radio/src/gui/Taranis/menu_general_hardware.cpp" -#include "radio/src/gui/Taranis/menu_general_calib.cpp" -#include "radio/src/gui/Taranis/view_main.cpp" -#include "radio/src/gui/Taranis/view_statistics.cpp" -#include "radio/src/gui/Taranis/view_channels.cpp" -#include "radio/src/gui/Taranis/view_telemetry.cpp" -#include "radio/src/gui/Taranis/view_text.cpp" -#include "radio/src/gui/Taranis/view_about.cpp" -#include "radio/src/gui/Taranis/lcd.cpp" -#include "radio/src/gui/Taranis/splash.cpp" +#include "radio/src/gui/taranis/fonts.cpp" +#include "radio/src/gui/taranis/widgets.cpp" +#include "radio/src/gui/taranis/navigation.cpp" +#include "radio/src/gui/taranis/popups.cpp" +#include "radio/src/gui/taranis/helpers.cpp" +#include "radio/src/gui/taranis/menus.cpp" +#include "radio/src/gui/taranis/menu_model.cpp" +#include "radio/src/gui/taranis/menu_model_select.cpp" +#include "radio/src/gui/taranis/menu_model_setup.cpp" +#include "radio/src/gui/taranis/menu_model_heli.cpp" +#include "radio/src/gui/taranis/menu_model_flightmodes.cpp" +#include "radio/src/gui/taranis/menu_model_inputs_mixes.cpp" +#include "radio/src/gui/taranis/menu_model_curves.cpp" +#include "radio/src/gui/taranis/menu_model_logical_switches.cpp" +#include "radio/src/gui/taranis/menu_model_custom_functions.cpp" +#include "radio/src/gui/taranis/menu_model_custom_scripts.cpp" +#include "radio/src/gui/taranis/menu_model_gvars.cpp" +#include "radio/src/gui/taranis/menu_model_limits.cpp" +#include "radio/src/gui/taranis/menu_model_telemetry.cpp" +#include "radio/src/gui/taranis/menu_general.cpp" +#include "radio/src/gui/taranis/menu_general_setup.cpp" +#include "radio/src/gui/taranis/menu_general_sdmanager.cpp" +#include "radio/src/gui/taranis/menu_general_trainer.cpp" +#include "radio/src/gui/taranis/menu_general_version.cpp" +#include "radio/src/gui/taranis/menu_general_diagkeys.cpp" +#include "radio/src/gui/taranis/menu_general_diaganas.cpp" +#include "radio/src/gui/taranis/menu_general_hardware.cpp" +#include "radio/src/gui/taranis/menu_general_calib.cpp" +#include "radio/src/gui/taranis/view_main.cpp" +#include "radio/src/gui/taranis/view_statistics.cpp" +#include "radio/src/gui/taranis/view_channels.cpp" +#include "radio/src/gui/taranis/view_telemetry.cpp" +#include "radio/src/gui/taranis/view_text.cpp" +#include "radio/src/gui/taranis/view_about.cpp" +#include "radio/src/gui/taranis/lcd.cpp" +#include "radio/src/gui/taranis/splash.cpp" #else -#include "radio/src/gui/9X/fonts.cpp" -#include "radio/src/gui/9X/widgets.cpp" -#include "radio/src/gui/9X/navigation.cpp" -#include "radio/src/gui/9X/popups.cpp" -#include "radio/src/gui/9X/helpers.cpp" -#include "radio/src/gui/9X/menus.cpp" -#include "radio/src/gui/9X/menu_model.cpp" -#include "radio/src/gui/9X/menu_model_select.cpp" -#include "radio/src/gui/9X/menu_model_setup.cpp" -#include "radio/src/gui/9X/menu_model_heli.cpp" -#include "radio/src/gui/9X/menu_model_flightmodes.cpp" -#include "radio/src/gui/9X/menu_model_inputs_mixes.cpp" -#include "radio/src/gui/9X/menu_model_curves.cpp" -#include "radio/src/gui/9X/menu_model_logical_switches.cpp" -#include "radio/src/gui/9X/menu_model_custom_functions.cpp" -#include "radio/src/gui/9X/menu_model_limits.cpp" -#include "radio/src/gui/9X/menu_model_telemetry.cpp" -#include "radio/src/gui/9X/menu_model_templates.cpp" -#include "radio/src/gui/9X/menu_general.cpp" -#include "radio/src/gui/9X/menu_general_setup.cpp" +#include "radio/src/gui/9x/fonts.cpp" +#include "radio/src/gui/9x/widgets.cpp" +#include "radio/src/gui/9x/navigation.cpp" +#include "radio/src/gui/9x/popups.cpp" +#include "radio/src/gui/9x/helpers.cpp" +#include "radio/src/gui/9x/menus.cpp" +#include "radio/src/gui/9x/menu_model.cpp" +#include "radio/src/gui/9x/menu_model_select.cpp" +#include "radio/src/gui/9x/menu_model_setup.cpp" +#include "radio/src/gui/9x/menu_model_heli.cpp" +#include "radio/src/gui/9x/menu_model_flightmodes.cpp" +#include "radio/src/gui/9x/menu_model_inputs_mixes.cpp" +#include "radio/src/gui/9x/menu_model_curves.cpp" +#include "radio/src/gui/9x/menu_model_logical_switches.cpp" +#include "radio/src/gui/9x/menu_model_custom_functions.cpp" +#include "radio/src/gui/9x/menu_model_limits.cpp" +#include "radio/src/gui/9x/menu_model_telemetry.cpp" +#include "radio/src/gui/9x/menu_model_templates.cpp" +#include "radio/src/gui/9x/menu_general.cpp" +#include "radio/src/gui/9x/menu_general_setup.cpp" #if defined(SDCARD) -#include "radio/src/gui/9X/menu_general_sdmanager.cpp" -#include "radio/src/gui/9X/view_text.cpp" +#include "radio/src/gui/9x/menu_general_sdmanager.cpp" +#include "radio/src/gui/9x/view_text.cpp" #endif -#include "radio/src/gui/9X/menu_general_trainer.cpp" -#include "radio/src/gui/9X/menu_general_version.cpp" -#include "radio/src/gui/9X/menu_general_diagkeys.cpp" -#include "radio/src/gui/9X/menu_general_diaganas.cpp" +#include "radio/src/gui/9x/menu_general_trainer.cpp" +#include "radio/src/gui/9x/menu_general_version.cpp" +#include "radio/src/gui/9x/menu_general_diagkeys.cpp" +#include "radio/src/gui/9x/menu_general_diaganas.cpp" #if defined(CPUARM) -#include "radio/src/gui/9X/menu_general_hardware.cpp" +#include "radio/src/gui/9x/menu_general_hardware.cpp" #endif -#include "radio/src/gui/9X/menu_general_calib.cpp" -#include "radio/src/gui/9X/view_main.cpp" -#include "radio/src/gui/9X/view_statistics.cpp" -#include "radio/src/gui/9X/view_telemetry.cpp" +#include "radio/src/gui/9x/menu_general_calib.cpp" +#include "radio/src/gui/9x/view_main.cpp" +#include "radio/src/gui/9x/view_statistics.cpp" +#include "radio/src/gui/9x/view_telemetry.cpp" #if !defined(CPUM64) -#include "radio/src/gui/9X/view_about.cpp" +#include "radio/src/gui/9x/view_about.cpp" #endif -#include "radio/src/gui/9X/lcd.cpp" -#include "radio/src/gui/9X/splash.cpp" +#include "radio/src/gui/9x/lcd.cpp" +#include "radio/src/gui/9x/splash.cpp" #endif #if !defined(VIRTUALINPUTS) @@ -304,55 +304,55 @@ namespace NAMESPACE { #endif #if defined(PCBHORUS) -#include "radio/src/targets/Horus/board_horus.cpp" -#include "radio/src/targets/Horus/keys_driver.cpp" -#include "radio/src/targets/Horus/audio_driver.cpp" -#include "radio/src/targets/Horus/telemetry_driver.cpp" -#include "radio/src/targets/Horus/haptic_driver.cpp" -#include "radio/src/targets/Horus/pulses_driver.cpp" -#include "radio/src/targets/Taranis/rtc_driver.cpp" -#include "radio/src/targets/Horus/trainer_driver.cpp" -#include "radio/src/targets/Horus/serial2_driver.cpp" +#include "radio/src/targets/horus/board_horus.cpp" +#include "radio/src/targets/horus/keys_driver.cpp" +#include "radio/src/targets/horus/audio_driver.cpp" +#include "radio/src/targets/horus/telemetry_driver.cpp" +#include "radio/src/targets/horus/haptic_driver.cpp" +#include "radio/src/targets/horus/pulses_driver.cpp" +#include "radio/src/targets/taranis/rtc_driver.cpp" +#include "radio/src/targets/horus/trainer_driver.cpp" +#include "radio/src/targets/horus/serial2_driver.cpp" #elif defined(PCBFLAMENCO) -#include "radio/src/targets/Flamenco/board_flamenco.cpp" -#include "radio/src/targets/Flamenco/keys_driver.cpp" -#include "radio/src/targets/Flamenco/audio_driver.cpp" -#include "radio/src/targets/Flamenco/telemetry_driver.cpp" -#include "radio/src/targets/Flamenco/eeprom_driver.cpp" -// #include "radio/src/targets/Flamenco/haptic_driver.cpp" -#include "radio/src/targets/Flamenco/pulses_driver.cpp" -#include "radio/src/targets/Flamenco/rtc_driver.cpp" -#include "radio/src/targets/Flamenco/trainer_driver.cpp" +#include "radio/src/targets/flamenco/board_flamenco.cpp" +#include "radio/src/targets/flamenco/keys_driver.cpp" +#include "radio/src/targets/flamenco/audio_driver.cpp" +#include "radio/src/targets/flamenco/telemetry_driver.cpp" +#include "radio/src/targets/flamenco/eeprom_driver.cpp" +// #include "radio/src/targets/flamenco/haptic_driver.cpp" +#include "radio/src/targets/flamenco/pulses_driver.cpp" +#include "radio/src/targets/flamenco/rtc_driver.cpp" +#include "radio/src/targets/flamenco/trainer_driver.cpp" #elif defined(PCBTARANIS) -#include "radio/src/targets/Taranis/board_taranis.cpp" -#include "radio/src/targets/Taranis/keys_driver.cpp" -#include "radio/src/targets/Taranis/audio_driver.cpp" -#include "radio/src/targets/Taranis/telemetry_driver.cpp" -#include "radio/src/targets/Taranis/haptic_driver.cpp" +#include "radio/src/targets/taranis/board_taranis.cpp" +#include "radio/src/targets/taranis/keys_driver.cpp" +#include "radio/src/targets/taranis/audio_driver.cpp" +#include "radio/src/targets/taranis/telemetry_driver.cpp" +#include "radio/src/targets/taranis/haptic_driver.cpp" #if defined(REV9E) -#include "radio/src/targets/Taranis/top_lcd_driver.cpp" +#include "radio/src/targets/taranis/top_lcd_driver.cpp" #endif -#include "radio/src/targets/Taranis/pulses_driver.cpp" -#include "radio/src/targets/Taranis/rtc_driver.cpp" -#include "radio/src/targets/Taranis/trainer_driver.cpp" -#include "radio/src/targets/Taranis/serial2_driver.cpp" +#include "radio/src/targets/taranis/pulses_driver.cpp" +#include "radio/src/targets/taranis/rtc_driver.cpp" +#include "radio/src/targets/taranis/trainer_driver.cpp" +#include "radio/src/targets/taranis/serial2_driver.cpp" #elif defined(PCBSKY9X) -#include "radio/src/targets/Sky9x/board_sky9x.cpp" -#include "radio/src/targets/Sky9x/telemetry_driver.cpp" -#include "radio/src/targets/Sky9x/pwr_driver.cpp" -#include "radio/src/targets/Sky9x/eeprom_driver.cpp" -#include "radio/src/targets/Sky9x/keys_driver.cpp" -#include "radio/src/targets/Sky9x/audio_driver.cpp" -#include "radio/src/targets/Sky9x/sdcard_driver.cpp" -#include "radio/src/targets/Sky9x/coproc_driver.cpp" -#include "radio/src/targets/Sky9x/haptic_driver.cpp" -#include "radio/src/targets/Sky9x/serial2_driver.cpp" -#include "radio/src/targets/Sky9x/pulses_driver.cpp" +#include "radio/src/targets/sky9x/board_sky9x.cpp" +#include "radio/src/targets/sky9x/telemetry_driver.cpp" +#include "radio/src/targets/sky9x/pwr_driver.cpp" +#include "radio/src/targets/sky9x/eeprom_driver.cpp" +#include "radio/src/targets/sky9x/keys_driver.cpp" +#include "radio/src/targets/sky9x/audio_driver.cpp" +#include "radio/src/targets/sky9x/sdcard_driver.cpp" +#include "radio/src/targets/sky9x/coproc_driver.cpp" +#include "radio/src/targets/sky9x/haptic_driver.cpp" +#include "radio/src/targets/sky9x/serial2_driver.cpp" +#include "radio/src/targets/sky9x/pulses_driver.cpp" #elif defined(PCBGRUVIN9X) -#include "radio/src/targets/Gruvin9x/board_gruvin9x.cpp" -#include "radio/src/targets/Gruvin9x/somo14d.cpp" +#include "radio/src/targets/gruvin9x/board_gruvin9x.cpp" +#include "radio/src/targets/gruvin9x/somo14d.cpp" #elif defined(PCBMEGA2560) -#include "radio/src/targets/Mega2560/board_mega2560.cpp" +#include "radio/src/targets/mega2560/board_mega2560.cpp" #else #include "radio/src/targets/9x/board_stock.cpp" #endif diff --git a/radio/src/Makefile b/radio/src/Makefile index fda5b34d0..4733b1adf 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -443,7 +443,7 @@ FONTS = $(patsubst %.png,%.lbm,$(wildcard fonts/std/*.png)) ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR)) # 9x/9xr radio - GUIDIRECTORY = 9X + GUIDIRECTORY = 9x ARCH = AVR LCDSIZE = 128 TRGT = avr- @@ -461,7 +461,7 @@ ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR)) EEPROMSRC = storage/storage_common.cpp storage/eeprom_common.cpp storage/eeprom_rlc.cpp PULSESSRC = pulses/pulses_avr.cpp CPPSRC += debug.cpp - BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm + BITMAPS += bitmaps/9x/splash.lbm bitmaps/9x/asterisk.lbm bitmaps/9x/about.lbm GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp ifeq ($(PCB), 9XR) @@ -524,7 +524,7 @@ endif ifeq ($(PCB), $(filter $(PCB), STD128 9X128 9XR128)) # 9X/9XR radio with ATmega64 replaced by ATmega128 - GUIDIRECTORY = 9X + GUIDIRECTORY = 9x ARCH = AVR LCDSIZE = 128 TRGT = avr- @@ -540,7 +540,7 @@ ifeq ($(PCB), $(filter $(PCB), STD128 9X128 9XR128)) EEPROMSRC = storage/storage_common.cpp storage/eeprom_common.cpp storage/eeprom_rlc.cpp PULSESSRC = pulses/pulses_avr.cpp CPPSRC += debug.cpp - BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm + BITMAPS += bitmaps/9x/splash.lbm bitmaps/9x/asterisk.lbm bitmaps/9x/about.lbm GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp ifeq ($(PCB), 9XR128) @@ -599,7 +599,7 @@ endif ifeq ($(PCB), $(filter $(PCB), 9X2561)) # 9X/9XR radio with ATmega64 replaced by ATmega2561 - GUIDIRECTORY = 9X + GUIDIRECTORY = 9x ARCH = AVR LCDSIZE = 128 TRGT = avr- @@ -615,7 +615,7 @@ ifeq ($(PCB), $(filter $(PCB), 9X2561)) EEPROMSRC = storage/storage_common.cpp storage/eeprom_common.cpp storage/eeprom_rlc.cpp PULSESSRC = pulses/pulses_avr.cpp CPPSRC += debug.cpp - BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm + BITMAPS += bitmaps/9x/splash.lbm bitmaps/9x/asterisk.lbm bitmaps/9x/about.lbm GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp ifeq ($(PCB), 9XR2561) @@ -666,7 +666,7 @@ endif ifeq ($(PCB), GRUVIN9X) # 9x radio with a gruvin9x replacement board - GUIDIRECTORY = 9X + GUIDIRECTORY = 9x FLAVOUR = gruvin9x ARCH = AVR LCDSIZE = 128 @@ -682,20 +682,20 @@ ifeq ($(PCB), GRUVIN9X) SDCARD = NO BUZZER = NO THR_TRACE = YES - INCDIRS += targets/Gruvin9x targets/9x $(FATFSDIR) $(FATFSDIR)/option - BOARDSRC = main_avr.cpp targets/Gruvin9x/board_gruvin9x.cpp + INCDIRS += targets/gruvin9x targets/9x $(FATFSDIR) $(FATFSDIR)/option + BOARDSRC = main_avr.cpp targets/gruvin9x/board_gruvin9x.cpp EXTRABOARDSRC = targets/common_avr/adc_driver.cpp targets/9x/lcd_driver.cpp targets/common_avr/telemetry_driver.cpp EEPROMSRC = storage/storage_common.cpp storage/eeprom_common.cpp storage/eeprom_rlc.cpp PULSESSRC = pulses/pulses_avr.cpp CPPSRC += audio_avr.cpp haptic.cpp debug.cpp - BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm + BITMAPS += bitmaps/9x/splash.lbm bitmaps/9x/asterisk.lbm bitmaps/9x/about.lbm GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp ifeq ($(SDCARD), YES) CPPDEFS += -DRTCLOCK -DSDCARD - CPPSRC += rtc.cpp sdcard.cpp logs.cpp targets/Gruvin9x/rtc_driver.cpp + CPPSRC += rtc.cpp sdcard.cpp logs.cpp targets/gruvin9x/rtc_driver.cpp GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_sdmanager.cpp - EXTRABOARDSRC += $(FATFSDIR)/ff.c $(FATFSDIR)/fattime.c $(FATFSDIR)/option/ccsbcs.c targets/Gruvin9x/diskio.cpp + EXTRABOARDSRC += $(FATFSDIR)/ff.c $(FATFSDIR)/fattime.c $(FATFSDIR)/option/ccsbcs.c targets/gruvin9x/diskio.cpp endif ifeq ($(BUZZER), YES) @@ -705,7 +705,7 @@ ifeq ($(PCB), GRUVIN9X) ifeq ($(VOICE), YES) CPPDEFS += -DVOICE - CPPSRC += targets/Gruvin9x/somo14d.cpp + CPPSRC += targets/gruvin9x/somo14d.cpp endif # Enable extra rotary encoders (Gruvin9x board only) @@ -716,7 +716,7 @@ endif ifeq ($(PCB), MEGA2560) # ARDUINO2560 DIY RADIO - GUIDIRECTORY = 9X + GUIDIRECTORY = 9x FLAVOUR = mega2560 ARCH = AVR LCDSIZE = 128 @@ -728,12 +728,12 @@ ifeq ($(PCB), MEGA2560) BUZZER = YES THR_TRACE = YES PWRMANAGE = NO - INCDIRS += targets/Mega2560 targets/9x $(FATFSDIR) $(FATFSDIR)/option - BOARDSRC = main_avr.cpp targets/Mega2560/board_mega2560.cpp + INCDIRS += targets/mega2560 targets/9x $(FATFSDIR) $(FATFSDIR)/option + BOARDSRC = main_avr.cpp targets/mega2560/board_mega2560.cpp EEPROMSRC = storage/storage_common.cpp storage/eeprom_common.cpp storage/eeprom_rlc.cpp PULSESSRC = pulses/pulses_avr.cpp CPPSRC += audio_avr.cpp debug.cpp - BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm + BITMAPS += bitmaps/9x/splash.lbm bitmaps/9x/asterisk.lbm bitmaps/9x/about.lbm GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp EXTRABOARDSRC = targets/common_avr/adc_driver.cpp targets/9x/lcd_driver.cpp targets/common_avr/telemetry_driver.cpp @@ -743,10 +743,10 @@ ifeq ($(PCB), MEGA2560) endif ifeq ($(SDCARD), YES) - EXTRABOARDSRC += $(FATFSDIR)/ff.c $(FATFSDIR)/fattime.c $(FATFSDIR)/option/ccsbcs.c targets/Gruvin9x/diskio.cpp + EXTRABOARDSRC += $(FATFSDIR)/ff.c $(FATFSDIR)/fattime.c $(FATFSDIR)/option/ccsbcs.c targets/gruvin9x/diskio.cpp CPPDEFS += -DSDCARD -DRTCLOCK GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_sdmanager.cpp - CPPSRC += rtc.cpp sdcard.cpp logs.cpp targets/Gruvin9x/rtc_driver.cpp + CPPSRC += rtc.cpp sdcard.cpp logs.cpp targets/gruvin9x/rtc_driver.cpp endif ifeq ($(AUDIO), YES) @@ -764,7 +764,7 @@ ifeq ($(PCB), MEGA2560) ifeq ($(VOICE), YES) CPPDEFS += -DVOICE - CPPSRC += targets/Gruvin9x/somo14d.cpp + CPPSRC += targets/gruvin9x/somo14d.cpp endif ifeq ($(HAPTIC), YES) @@ -779,7 +779,7 @@ endif ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO AR9X)) # 9x/9XR radio with a sky9x replacement board - GUIDIRECTORY = 9X + GUIDIRECTORY = 9x ARCH = ARM LCDSIZE = 128 CPPDEFS = -Dat91sam3s4 -DPPM_PIN_HW_SERIAL @@ -787,27 +787,27 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO AR9X)) CPPDEFS = -Dat91sam3s8 FLAVOUR = 9xrpro CPPDEFS += -DREVX - LDSCRIPT = targets/Sky9x/sam3s8c_flash.ld + LDSCRIPT = targets/sky9x/sam3s8c_flash.ld else ifeq ($(PCB), AR9X) CPPDEFS = -Dat91sam3s8 FLAVOUR = ar9x CPPDEFS += -DAR9X - LDSCRIPT = targets/Sky9x/sam3s8c_flash.ld + LDSCRIPT = targets/sky9x/sam3s8c_flash.ld else ifeq ($(PCBREV), REVA) FLAVOUR = sky9x CPPDEFS += -DREVA - LDSCRIPT = targets/Sky9x/sam3s2c_flash.ld - CPPSRC += targets/Sky9x/coproc_driver.cpp + LDSCRIPT = targets/sky9x/sam3s2c_flash.ld + CPPSRC += targets/sky9x/coproc_driver.cpp else ifeq ($(PCBREV), REVB) FLAVOUR = sky9x CPPDEFS += -DREVB -DCOPROCESSOR - LDSCRIPT = targets/Sky9x/sam3s4c_flash.ld - CPPSRC += targets/Sky9x/coproc_driver.cpp + LDSCRIPT = targets/sky9x/sam3s4c_flash.ld + CPPSRC += targets/sky9x/coproc_driver.cpp else FLAVOUR = sky9x CPPDEFS += -DREVC -DCOPROCESSOR - LDSCRIPT = targets/Sky9x/sam3s4c_flash.ld - CPPSRC += targets/Sky9x/coproc_driver.cpp + LDSCRIPT = targets/sky9x/sam3s4c_flash.ld + CPPSRC += targets/sky9x/coproc_driver.cpp endif TRGT = arm-none-eabi- MCU = cortex-m3 @@ -819,33 +819,33 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO AR9X)) CPPDEFS += -DPCBSKY9X -DCPUARM -DEEPROM -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DDSM2 -DDSM2_PPM -DPXX ifeq ($(PCB), SKY9X) CPPDEFS += -DROTARY_ENCODERS=1 - CPPSRC += targets/Sky9x/rotenc_driver.cpp + CPPSRC += targets/sky9x/rotenc_driver.cpp endif ifeq ($(SPORT_FILE_LOG), YES) CPPDEFS += -DSPORT_FILE_LOG endif - INCDIRS += targets/Sky9x $(COOSDIR) $(COOSDIR)/kernel $(COOSDIR)/portable + INCDIRS += targets/sky9x $(COOSDIR) $(COOSDIR)/kernel $(COOSDIR)/portable GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_hardware.cpp gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp - BOARDSRC = main_arm.cpp targets/Sky9x/board_sky9x.cpp - EXTRABOARDSRC = targets/Sky9x/lcd_driver.cpp - SRC += targets/Sky9x/core_cm3.c targets/Sky9x/board_lowlevel.c targets/Sky9x/crt.c targets/Sky9x/vectors_sam3s.c + BOARDSRC = main_arm.cpp targets/sky9x/board_sky9x.cpp + EXTRABOARDSRC = targets/sky9x/lcd_driver.cpp + SRC += targets/sky9x/core_cm3.c targets/sky9x/board_lowlevel.c targets/sky9x/crt.c targets/sky9x/vectors_sam3s.c SRC += $(COOSDIR)/kernel/core.c $(COOSDIR)/kernel/hook.c $(COOSDIR)/kernel/task.c $(COOSDIR)/kernel/event.c $(COOSDIR)/kernel/time.c $(COOSDIR)/kernel/timer.c $(COOSDIR)/kernel/flag.c $(COOSDIR)/kernel/mutex.c $(COOSDIR)/kernel/serviceReq.c $(COOSDIR)/portable/GCC/port.c $(COOSDIR)/portable/arch.c - SRC += targets/Sky9x/usb/device/core/USBD_UDP.c targets/Sky9x/usb/device/core/USBDDriver.c - SRC += targets/Sky9x/usb/device/massstorage/MSDDriver.c targets/Sky9x/usb/device/massstorage/MSDDStateMachine.c targets/Sky9x/usb/device/massstorage/MSDLun.c targets/Sky9x/usb/device/massstorage/MSDDriverDescriptors.c targets/Sky9x/usb/device/massstorage/SBCMethods.c - SRC += targets/Sky9x/usb/common/core/USBEndpointDescriptor.c targets/Sky9x/usb/common/core/USBGenericRequest.c targets/Sky9x/usb/common/core/USBFeatureRequest.c targets/Sky9x/usb/common/core/USBInterfaceRequest.c targets/Sky9x/usb/common/core/USBGetDescriptorRequest.c targets/Sky9x/usb/common/core/USBSetAddressRequest.c targets/Sky9x/usb/common/core/USBSetConfigurationRequest.c targets/Sky9x/usb/common/core/USBConfigurationDescriptor.c targets/Sky9x/usb/common/core/USBGenericDescriptor.c - SRC += targets/Sky9x/MEDSdcard.c + SRC += targets/sky9x/usb/device/core/USBD_UDP.c targets/sky9x/usb/device/core/USBDDriver.c + SRC += targets/sky9x/usb/device/massstorage/MSDDriver.c targets/sky9x/usb/device/massstorage/MSDDStateMachine.c targets/sky9x/usb/device/massstorage/MSDLun.c targets/sky9x/usb/device/massstorage/MSDDriverDescriptors.c targets/sky9x/usb/device/massstorage/SBCMethods.c + SRC += targets/sky9x/usb/common/core/USBEndpointDescriptor.c targets/sky9x/usb/common/core/USBGenericRequest.c targets/sky9x/usb/common/core/USBFeatureRequest.c targets/sky9x/usb/common/core/USBInterfaceRequest.c targets/sky9x/usb/common/core/USBGetDescriptorRequest.c targets/sky9x/usb/common/core/USBSetAddressRequest.c targets/sky9x/usb/common/core/USBSetConfigurationRequest.c targets/sky9x/usb/common/core/USBConfigurationDescriptor.c targets/sky9x/usb/common/core/USBGenericDescriptor.c + SRC += targets/sky9x/MEDSdcard.c EEPROMSRC = storage/storage_common.cpp storage/eeprom_common.cpp storage/eeprom_raw.cpp storage/eeprom_conversions.cpp PULSESSRC = pulses/pulses_arm.cpp pulses/ppm_arm.cpp pulses/pxx_arm.cpp pulses/dsm2_arm.cpp CPPSRC += tasks_arm.cpp audio_arm.cpp haptic.cpp gui/$(GUIDIRECTORY)/view_about.cpp gui/$(GUIDIRECTORY)/view_text.cpp telemetry/telemetry.cpp - CPPSRC += targets/Sky9x/telemetry_driver.cpp targets/Sky9x/serial2_driver.cpp targets/Sky9x/pwr_driver.cpp targets/Sky9x/adc_driver.cpp targets/Sky9x/eeprom_driver.cpp targets/Sky9x/pulses_driver.cpp targets/Sky9x/keys_driver.cpp targets/Sky9x/audio_driver.cpp targets/Sky9x/buzzer_driver.cpp targets/Sky9x/haptic_driver.cpp targets/Sky9x/sdcard_driver.cpp targets/Sky9x/massstorage.cpp + CPPSRC += targets/sky9x/telemetry_driver.cpp targets/sky9x/serial2_driver.cpp targets/sky9x/pwr_driver.cpp targets/sky9x/adc_driver.cpp targets/sky9x/eeprom_driver.cpp targets/sky9x/pulses_driver.cpp targets/sky9x/keys_driver.cpp targets/sky9x/audio_driver.cpp targets/sky9x/buzzer_driver.cpp targets/sky9x/haptic_driver.cpp targets/sky9x/sdcard_driver.cpp targets/sky9x/massstorage.cpp CPPSRC += loadboot.cpp debug.cpp - BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm + BITMAPS += bitmaps/9x/splash.lbm bitmaps/9x/asterisk.lbm bitmaps/9x/about.lbm ifeq ($(SDCARD), YES) CPPDEFS += -DSDCARD -DVOICE INCDIRS += $(FATFSDIR) $(FATFSDIR)/option CPPSRC += sdcard.cpp logs.cpp GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_sdmanager.cpp - EXTRABOARDSRC += $(FATFSDIR)/ff.c $(FATFSDIR)/fattime.c $(FATFSDIR)/option/ccsbcs.c targets/Sky9x/diskio.cpp + EXTRABOARDSRC += $(FATFSDIR)/ff.c $(FATFSDIR)/fattime.c $(FATFSDIR)/option/ccsbcs.c targets/sky9x/diskio.cpp endif ifeq ($(BUZZER), YES) CPPDEFS += -DBUZZER @@ -853,11 +853,11 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO AR9X)) endif ifeq ($(RTCLOCK), YES) CPPDEFS += -DRTCLOCK - CPPSRC += rtc.cpp targets/Sky9x/rtc_driver.cpp + CPPSRC += rtc.cpp targets/sky9x/rtc_driver.cpp endif ifeq ($(BLUETOOTH), YES) CPPDEFS += -DBLUETOOTH - CPPSRC += targets/Sky9x/bluetooth.cpp + CPPSRC += targets/sky9x/bluetooth.cpp endif ifeq ($(DEBUG), YES) SRC += syscalls.c @@ -871,7 +871,7 @@ ifeq ($(PCB), TARANIS) # TARANIS radio ARCH = ARM LCDSIZE = 212 - GUIDIRECTORY = Taranis + GUIDIRECTORY = taranis ifeq ($(PCBREV), REV9E) MCU = cortex-m4 FLAVOUR = taranis-x9e @@ -880,7 +880,7 @@ ifeq ($(PCB), TARANIS) CPPDEFS += -DLCD_DUAL_BUFFER endif HAPTIC = YES - EXTRABOARDSRC += targets/Taranis/bluetooth_driver.cpp + EXTRABOARDSRC += targets/taranis/bluetooth_driver.cpp else ifeq ($(PCBREV), REVPLUS) MCU = cortex-m3 FLAVOUR = taranis-plus @@ -927,7 +927,7 @@ ifeq ($(PCB), TARANIS) endif TRGT = arm-none-eabi- OPT = s - BITMAPS += $(patsubst %.png,%.lbm,$(wildcard bitmaps/Taranis/*.png)) + BITMAPS += $(patsubst %.png,%.lbm,$(wildcard bitmaps/taranis/*.png)) SDCARD = YES THR_TRACE = YES EXT = FRSKY_SPORT @@ -940,18 +940,18 @@ ifeq ($(PCB), TARANIS) PPM_CENTER_ADJUSTABLE = YES DSM2 = PPM CPPDEFS += -DPCBTARANIS -DCPUARM -DCPUSTM32 -DVIRTUALINPUTS -DLUAINPUTS -DXCURVES -DEEPROM -DEEPROM_RLC -DAUDIO -DPXX - INCDIRS += targets/Taranis $(THIRDPARTY) $(COOSDIR) $(COOSDIR)/kernel $(COOSDIR)/portable + INCDIRS += targets/taranis $(THIRDPARTY) $(COOSDIR) $(COOSDIR)/kernel $(COOSDIR)/portable CPPDEFS += -DHSE_VALUE=12000000 ifeq ($(PCBREV), REV9E) STM32LIBPATH = $(THIRDPARTY)/STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries CPPDEFS += -DSTM32F4 -DSTM32F40_41xxx -DEEPROM_VARIANT=32768 INCDIRS += $(STM32LIBPATH)/CMSIS/Device/ST/STM32F4xx/Include $(STM32LIBPATH)/CMSIS/Include $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/inc - LDSCRIPT = targets/Taranis/stm32f4_flash.ld + LDSCRIPT = targets/taranis/stm32f4_flash.ld else STM32LIBPATH= $(THIRDPARTY)/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries CPPDEFS += -DEEPROM_VARIANT=0 INCDIRS += $(STM32LIBPATH)/STM32F2xx_StdPeriph_Driver/inc $(STM32LIBPATH)/CMSIS/Device/ST/STM32F2xx/Include $(STM32LIBPATH)/CMSIS/include - LDSCRIPT = targets/Taranis/stm32f2_flash.ld + LDSCRIPT = targets/taranis/stm32f2_flash.ld endif STM32USBPATH = $(THIRDPARTY)/STM32_USB-Host-Device_Lib_V2.1.0/Libraries INCDIRS += $(STM32USBPATH)/STM32_USB_OTG_Driver/inc @@ -960,19 +960,19 @@ ifeq ($(PCB), TARANIS) INCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/hid/inc INCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/cdc/inc GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_hardware.cpp - BOARDSRC = main_arm.cpp targets/Taranis/board_taranis.cpp - EXTRABOARDSRC += targets/Taranis/configure_pins.cpp targets/Taranis/lcd_driver.cpp targets/Taranis/flash_driver.cpp targets/Taranis/i2c_driver.cpp targets/Taranis/aspi.c targets/Taranis/delays.c serial.cpp + BOARDSRC = main_arm.cpp targets/taranis/board_taranis.cpp + EXTRABOARDSRC += targets/taranis/configure_pins.cpp targets/taranis/lcd_driver.cpp targets/taranis/flash_driver.cpp targets/taranis/i2c_driver.cpp targets/taranis/aspi.c targets/taranis/delays.c serial.cpp SRC += $(COOSDIR)/kernel/core.c $(COOSDIR)/kernel/hook.c $(COOSDIR)/kernel/task.c $(COOSDIR)/kernel/event.c $(COOSDIR)/kernel/time.c $(COOSDIR)/kernel/timer.c $(COOSDIR)/kernel/flag.c $(COOSDIR)/kernel/mutex.c $(COOSDIR)/kernel/serviceReq.c $(COOSDIR)/portable/GCC/port.c $(COOSDIR)/portable/arch.c - SRC += targets/Taranis/pwr_driver.c targets/Taranis/usb_driver.c + SRC += targets/taranis/pwr_driver.c targets/taranis/usb_driver.c EEPROMSRC = storage/storage_common.cpp storage/eeprom_common.cpp storage/eeprom_rlc.cpp storage/eeprom_conversions.cpp PULSESSRC = pulses/pulses_arm.cpp pulses/ppm_arm.cpp pulses/pxx_arm.cpp CPPSRC += tasks_arm.cpp audio_arm.cpp sbus.cpp telemetry/telemetry.cpp - CPPSRC += targets/Taranis/pulses_driver.cpp targets/Taranis/keys_driver.cpp targets/Taranis/adc_driver.cpp targets/Taranis/trainer_driver.cpp targets/Taranis/audio_driver.cpp targets/Taranis/serial2_driver.cpp targets/Taranis/telemetry_driver.cpp + CPPSRC += targets/taranis/pulses_driver.cpp targets/taranis/keys_driver.cpp targets/taranis/adc_driver.cpp targets/taranis/trainer_driver.cpp targets/taranis/audio_driver.cpp targets/taranis/serial2_driver.cpp targets/taranis/telemetry_driver.cpp CPPSRC += bmp.cpp gui/$(GUIDIRECTORY)/view_channels.cpp gui/$(GUIDIRECTORY)/view_about.cpp gui/$(GUIDIRECTORY)/view_text.cpp debug.cpp CPPSRC += loadboot.cpp ifeq ($(PCBREV), REV9E) - CPPSRC += targets/Taranis/top_lcd_driver.cpp - SRC += targets/Taranis/system_stm32f4xx.c + CPPSRC += targets/taranis/top_lcd_driver.cpp + SRC += targets/taranis/system_stm32f4xx.c SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/misc.c SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_gpio.c SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dbgmcu.c @@ -985,7 +985,7 @@ ifeq ($(PCB), TARANIS) SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_usart.c SRC += $(STM32LIBPATH)/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f40_41xxx.s else - SRC += targets/Taranis/system_stm32f2xx.c + SRC += targets/taranis/system_stm32f2xx.c SRC += $(STM32LIBPATH)/STM32F2xx_StdPeriph_Driver/src/misc.c SRC += $(STM32LIBPATH)/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_gpio.c SRC += $(STM32LIBPATH)/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_dbgmcu.c @@ -998,29 +998,29 @@ ifeq ($(PCB), TARANIS) SRC += $(STM32LIBPATH)/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_usart.c SRC += $(STM32LIBPATH)/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc_ride7/startup_stm32f2xx.s endif - SRC += targets/Taranis/usb_bsp.c targets/Taranis/usbd_desc.c + SRC += targets/taranis/usb_bsp.c targets/taranis/usbd_desc.c SRC += $(STM32USBPATH)/STM32_USB_OTG_Driver/src/usb_core.c SRC += $(STM32USBPATH)/STM32_USB_OTG_Driver/src/usb_dcd.c SRC += $(STM32USBPATH)/STM32_USB_OTG_Driver/src/usb_dcd_int.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Core/src/usbd_core.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Core/src/usbd_ioreq.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Core/src/usbd_req.c - EXTRABOARDSRC += targets/Taranis/usbd_usr.cpp + EXTRABOARDSRC += targets/taranis/usbd_usr.cpp SRC += syscalls.c ifeq ($(USB), JOYSTICK) CPPDEFS += -DUSB_JOYSTICK - SRC += targets/Taranis/usbd_hid_joystick.c + SRC += targets/taranis/usbd_hid_joystick.c else ifeq ($(USB), SERIAL) CPPDEFS += -DUSB_SERIAL SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c - EXTRABOARDSRC += targets/Taranis/usbd_cdc.cpp + EXTRABOARDSRC += targets/taranis/usbd_cdc.cpp else CPPDEFS += -DUSB_MASS_STORAGE SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/src/usbd_msc_scsi.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c - EXTRABOARDSRC += targets/Taranis/usbd_storage_msd.cpp + EXTRABOARDSRC += targets/taranis/usbd_storage_msd.cpp endif ifeq ($(NANO), YES) # use newlib-nano for linking @@ -1052,8 +1052,8 @@ ifeq ($(PCB), TARANIS) CPPSRC += bin_allocator.cpp endif endif - EXTRABOARDSRC += $(FATFSDIR)/ff.c $(FATFSDIR)/fattime.c $(FATFSDIR)/option/ccsbcs.c targets/Taranis/diskio.cpp - CPPSRC += sdcard.cpp logs.cpp rtc.cpp targets/Taranis/rtc_driver.cpp + EXTRABOARDSRC += $(FATFSDIR)/ff.c $(FATFSDIR)/fattime.c $(FATFSDIR)/option/ccsbcs.c targets/taranis/diskio.cpp + CPPSRC += sdcard.cpp logs.cpp rtc.cpp targets/taranis/rtc_driver.cpp GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_sdmanager.cpp gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp CPPDEFS += -DSDCARD -DVOICE -DRTCLOCK INCDIRS += $(FATFSDIR) $(FATFSDIR)/option @@ -1063,12 +1063,12 @@ ifeq ($(PCB), TARANIS) ifeq ($(HUBSAN), YES) CPPDEFS += -DHUBSAN CPPSRC += pulses/hubsan.cpp - CPPSRC += targets/Taranis/a7105_driver.cpp + CPPSRC += targets/taranis/a7105_driver.cpp endif ifeq ($(HAPTIC), YES) CPPDEFS += -DHAPTIC CPPSRC += haptic.cpp - CPPSRC += targets/Taranis/haptic_driver.cpp + CPPSRC += targets/taranis/haptic_driver.cpp endif ifeq ($(MIXERS_MONITOR), YES) CPPDEFS += -DMIXERS_MONITOR @@ -1082,17 +1082,17 @@ ifeq ($(PCB), FLAMENCO) # FLAMENCO radio ARCH = ARM LCDSIZE = 320 - GUIDIRECTORY = Flamenco + GUIDIRECTORY = flamenco FLAVOUR = FLAMENCO - LDSCRIPT = targets/Flamenco/stm32f4_flash.ld + LDSCRIPT = targets/flamenco/stm32f4_flash.ld STM32LIBPATH = $(THIRDPARTY)/STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries STM32USBPATH = $(THIRDPARTY)/STM32_USB-Host-Device_Lib_V2.1.0/Libraries TRGT = arm-none-eabi- MCU = cortex-m4 OPT = 2 CPPDEFS += -DHSE_VALUE=12000000 -DCOLORLCD -DSTM32F40_41xxx -DPPM_PIN_HW_SERIAL - BITMAPS += $(patsubst %.png,%.lbm,$(wildcard bitmaps/Flamenco/*.png)) - FONTS = fonts/Flamenco/font_stdsize.lbm fonts/Flamenco/font_tinsize.lbm fonts/Flamenco/font_smlsize.lbm fonts/Flamenco/font_midsize.lbm fonts/Flamenco/font_dblsize.lbm fonts/Flamenco/font_xxlsize.lbm + BITMAPS += $(patsubst %.png,%.lbm,$(wildcard bitmaps/flamenco/*.png)) + FONTS = fonts/flamenco/font_stdsize.lbm fonts/flamenco/font_tinsize.lbm fonts/flamenco/font_smlsize.lbm fonts/flamenco/font_midsize.lbm fonts/flamenco/font_dblsize.lbm fonts/flamenco/font_xxlsize.lbm SDCARD = YES THR_TRACE = YES EXT = FRSKY_SPORT @@ -1105,7 +1105,7 @@ ifeq ($(PCB), FLAMENCO) TIMERS = 2 CPPDEFS += -DTIMERS=$(TIMERS) CPPDEFS += -DPCBFLAMENCO -DCPUARM -DCPUSTM32 -DEEPROM -DVIRTUALINPUTS -DLUAINPUTS -DXCURVES -DEEPROM_VARIANT=0 -DAUDIO -DPXX - INCDIRS += targets/Flamenco $(THIRDPARTY) $(COOSDIR) $(COOSDIR)/kernel $(COOSDIR)/portable + INCDIRS += targets/flamenco $(THIRDPARTY) $(COOSDIR) $(COOSDIR)/kernel $(COOSDIR)/portable INCDIRS += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/inc $(STM32LIBPATH)/CMSIS/Device/ST/STM32F4xx/Include $(STM32LIBPATH)/CMSIS/include STM32USBPATH = $(THIRDPARTY)/STM32_USB-Host-Device_Lib_V2.1.0/Libraries INCDIRS += $(STM32USBPATH)/STM32_USB_OTG_Driver/inc @@ -1113,16 +1113,16 @@ ifeq ($(PCB), FLAMENCO) INCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/inc INCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/hid/inc INCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/cdc/inc - BOARDSRC = main_arm.cpp targets/Flamenco/board_flamenco.cpp - EXTRABOARDSRC += targets/Flamenco/lcd_driver.cpp targets/Flamenco/delays.c targets/Flamenco/i2c_driver.cpp targets/Taranis/configure_pins.cpp serial.cpp # targets/Taranis/flash_driver.cpp + BOARDSRC = main_arm.cpp targets/flamenco/board_flamenco.cpp + EXTRABOARDSRC += targets/flamenco/lcd_driver.cpp targets/flamenco/delays.c targets/flamenco/i2c_driver.cpp targets/taranis/configure_pins.cpp serial.cpp # targets/taranis/flash_driver.cpp SRC += $(COOSDIR)/kernel/core.c $(COOSDIR)/kernel/hook.c $(COOSDIR)/kernel/task.c $(COOSDIR)/kernel/event.c $(COOSDIR)/kernel/time.c $(COOSDIR)/kernel/timer.c $(COOSDIR)/kernel/flag.c $(COOSDIR)/kernel/mutex.c $(COOSDIR)/kernel/serviceReq.c $(COOSDIR)/portable/GCC/port.c $(COOSDIR)/portable/arch.c - SRC += targets/Flamenco/pwr_driver.c targets/Flamenco/usb_driver.c + SRC += targets/flamenco/pwr_driver.c targets/flamenco/usb_driver.c EEPROMSRC = storage/storage_common.cpp storage/eeprom_common.cpp storage/eeprom_raw.cpp PULSESSRC = pulses/pulses_arm.cpp pulses/ppm_arm.cpp pulses/pxx_arm.cpp CPPSRC += tasks_arm.cpp audio_arm.cpp sbus.cpp telemetry/telemetry.cpp - CPPSRC += targets/Flamenco/tw8823_driver.cpp targets/Flamenco/pulses_driver.cpp targets/Flamenco/keys_driver.cpp targets/Flamenco/adc_driver.cpp targets/Flamenco/eeprom_driver.cpp targets/Flamenco/trainer_driver.cpp targets/Flamenco/audio_driver.cpp targets/Flamenco/serial2_driver.cpp targets/Flamenco/telemetry_driver.cpp + CPPSRC += targets/flamenco/tw8823_driver.cpp targets/flamenco/pulses_driver.cpp targets/flamenco/keys_driver.cpp targets/flamenco/adc_driver.cpp targets/flamenco/eeprom_driver.cpp targets/flamenco/trainer_driver.cpp targets/flamenco/audio_driver.cpp targets/flamenco/serial2_driver.cpp targets/flamenco/telemetry_driver.cpp CPPSRC += gui/$(GUIDIRECTORY)/view_channels.cpp gui/$(GUIDIRECTORY)/view_about.cpp gui/$(GUIDIRECTORY)/view_text.cpp debug.cpp - SRC += targets/Flamenco/system_stm32f4xx.c + SRC += targets/flamenco/system_stm32f4xx.c SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/misc.c SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_gpio.c SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dbgmcu.c @@ -1135,25 +1135,25 @@ ifeq ($(PCB), FLAMENCO) SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_usart.c SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sdio.c SRC += $(STM32LIBPATH)/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f40_41xxx.s - SRC += targets/Flamenco/sdio_sd.c targets/Flamenco/usb_bsp.c targets/Flamenco/usbd_desc.c + SRC += targets/flamenco/sdio_sd.c targets/flamenco/usb_bsp.c targets/flamenco/usbd_desc.c SRC += $(STM32USBPATH)/STM32_USB_OTG_Driver/src/usb_core.c SRC += $(STM32USBPATH)/STM32_USB_OTG_Driver/src/usb_dcd.c SRC += $(STM32USBPATH)/STM32_USB_OTG_Driver/src/usb_dcd_int.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Core/src/usbd_core.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Core/src/usbd_ioreq.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Core/src/usbd_req.c - EXTRABOARDSRC += targets/Flamenco/usbd_usr.cpp + EXTRABOARDSRC += targets/flamenco/usbd_usr.cpp SRC += syscalls.c ifeq ($(USB), JOYSTICK) CPPDEFS += -DUSB_JOYSTICK - SRC += targets/Flamenco/usbd_hid_joystick.c + SRC += targets/flamenco/usbd_hid_joystick.c else CPPDEFS += -DUSB_MASS_STORAGE SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/src/usbd_msc_scsi.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c - EXTRABOARDSRC += targets/Flamenco/usbd_storage_msd.cpp + EXTRABOARDSRC += targets/flamenco/usbd_storage_msd.cpp endif ifeq ($(GVARS), YES) GUIMODELSRC += gui/$(GUIDIRECTORY)/menu_model_gvars.cpp @@ -1173,9 +1173,9 @@ ifeq ($(PCB), FLAMENCO) LUADEP = lua/lua_exports_flamenco.inc endif - EXTRABOARDSRC += $(FATFSDIR)/ff.c $(FATFSDIR)/fattime.c $(FATFSDIR)/option/ccsbcs.c targets/Flamenco/diskio.cpp + EXTRABOARDSRC += $(FATFSDIR)/ff.c $(FATFSDIR)/fattime.c $(FATFSDIR)/option/ccsbcs.c targets/flamenco/diskio.cpp CPPDEFS += -DSDCARD -DVOICE -DRTCLOCK - CPPSRC += sdcard.cpp rtc.cpp logs.cpp targets/Taranis/rtc_driver.cpp + CPPSRC += sdcard.cpp rtc.cpp logs.cpp targets/taranis/rtc_driver.cpp GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_sdmanager.cpp INCDIRS += $(FATFSDIR) $(FATFSDIR)/option @@ -1185,7 +1185,7 @@ ifeq ($(PCB), FLAMENCO) CPPDEFS += -DHAPTIC CPPSRC += haptic.cpp - CPPSRC += targets/Flamenco/haptic_driver.cpp + CPPSRC += targets/flamenco/haptic_driver.cpp EXTRABOARDSRC += ifeq ($(TW8823_TRACES), YES) @@ -1205,17 +1205,17 @@ ifeq ($(PCB), HORUS) # HORUS radio ARCH = ARM LCDSIZE = 480 - GUIDIRECTORY = Horus + GUIDIRECTORY = horus FLAVOUR = HORUS - LDSCRIPT = targets/Horus/stm32f4_flash.ld + LDSCRIPT = targets/horus/stm32f4_flash.ld STM32LIBPATH = $(THIRDPARTY)/STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries STM32USBPATH = $(THIRDPARTY)/STM32_USB-Host-Device_Lib_V2.1.0/Libraries TRGT = arm-none-eabi- MCU = cortex-m4 OPT = 2 CPPDEFS += -DHSE_VALUE=12000000 -DCOLORLCD -DSTM32F429_439xx - BITMAPS += $(patsubst %.png,%.lbm,$(wildcard bitmaps/Horus/*.png)) - FONTS = fonts/Horus/font_stdsize.lbm fonts/Horus/font_tinsize.lbm fonts/Horus/font_smlsize.lbm fonts/Horus/font_midsize.lbm fonts/Horus/font_dblsize.lbm fonts/Horus/font_xxlsize.lbm + BITMAPS += $(patsubst %.png,%.lbm,$(wildcard bitmaps/horus/*.png)) + FONTS = fonts/horus/font_stdsize.lbm fonts/horus/font_tinsize.lbm fonts/horus/font_smlsize.lbm fonts/horus/font_midsize.lbm fonts/horus/font_dblsize.lbm fonts/horus/font_xxlsize.lbm SDCARD = YES THR_TRACE = YES EXT = FRSKY_SPORT @@ -1228,7 +1228,7 @@ ifeq ($(PCB), HORUS) TIMERS = 2 CPPDEFS += -DTIMERS=$(TIMERS) CPPDEFS += -DPCBHORUS -DCPUARM -DCPUSTM32 -DVIRTUALINPUTS -DLUAINPUTS -DXCURVES -DEEPROM_VARIANT=0 -DAUDIO -DPXX - INCDIRS += targets/Horus $(THIRDPARTY) $(COOSDIR) $(COOSDIR)/kernel $(COOSDIR)/portable + INCDIRS += targets/horus $(THIRDPARTY) $(COOSDIR) $(COOSDIR)/kernel $(COOSDIR)/portable INCDIRS += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/inc $(STM32LIBPATH)/CMSIS/Device/ST/STM32F4xx/Include $(STM32LIBPATH)/CMSIS/include STM32USBPATH = $(THIRDPARTY)/STM32_USB-Host-Device_Lib_V2.1.0/Libraries INCDIRS += $(STM32USBPATH)/STM32_USB_OTG_Driver/inc @@ -1236,15 +1236,15 @@ ifeq ($(PCB), HORUS) INCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/inc INCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/hid/inc INCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/cdc/inc - BOARDSRC = main_arm.cpp targets/Horus/board_horus.cpp targets/Horus/led_driver.cpp - EXTRABOARDSRC += targets/Horus/lcd_driver.cpp targets/Horus/delays.c targets/Horus/i2c_driver.cpp targets/Taranis/configure_pins.cpp serial.cpp # targets/Taranis/flash_driver.cpp + BOARDSRC = main_arm.cpp targets/horus/board_horus.cpp targets/horus/led_driver.cpp + EXTRABOARDSRC += targets/horus/lcd_driver.cpp targets/horus/delays.c targets/horus/i2c_driver.cpp targets/taranis/configure_pins.cpp serial.cpp # targets/taranis/flash_driver.cpp SRC += $(COOSDIR)/kernel/core.c $(COOSDIR)/kernel/hook.c $(COOSDIR)/kernel/task.c $(COOSDIR)/kernel/event.c $(COOSDIR)/kernel/time.c $(COOSDIR)/kernel/timer.c $(COOSDIR)/kernel/flag.c $(COOSDIR)/kernel/mutex.c $(COOSDIR)/kernel/serviceReq.c $(COOSDIR)/portable/GCC/port.c $(COOSDIR)/portable/arch.c - SRC += targets/Horus/pwr_driver.c targets/Horus/usb_driver.c targets/Horus/sdram_driver.c + SRC += targets/horus/pwr_driver.c targets/horus/usb_driver.c targets/horus/sdram_driver.c PULSESSRC = pulses/pulses_arm.cpp pulses/ppm_arm.cpp pulses/pxx_arm.cpp CPPSRC += tasks_arm.cpp audio_arm.cpp sbus.cpp telemetry/telemetry.cpp - CPPSRC += targets/Horus/pulses_driver.cpp targets/Horus/keys_driver.cpp targets/Horus/adc_driver.cpp targets/Horus/trainer_driver.cpp targets/Horus/audio_driver.cpp targets/Horus/serial2_driver.cpp targets/Horus/telemetry_driver.cpp + CPPSRC += targets/horus/pulses_driver.cpp targets/horus/keys_driver.cpp targets/horus/adc_driver.cpp targets/horus/trainer_driver.cpp targets/horus/audio_driver.cpp targets/horus/serial2_driver.cpp targets/horus/telemetry_driver.cpp CPPSRC += bmp.cpp gui/$(GUIDIRECTORY)/curves.cpp gui/$(GUIDIRECTORY)/bitmaps.cpp gui/$(GUIDIRECTORY)/view_channels.cpp gui/$(GUIDIRECTORY)/view_about.cpp gui/$(GUIDIRECTORY)/view_text.cpp debug.cpp - SRC += targets/Horus/system_stm32f4xx.c + SRC += targets/horus/system_stm32f4xx.c CPPSRC += storage/storage_common.cpp storage/sdcard_raw.cpp SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/misc.c SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_gpio.c @@ -1262,29 +1262,29 @@ ifeq ($(PCB), HORUS) SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma2d.c SRC += $(STM32LIBPATH)/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f40_41xxx.s - SRC += targets/Horus/sdio_sd.c targets/Horus/usb_bsp.c targets/Horus/usbd_desc.c + SRC += targets/horus/sdio_sd.c targets/horus/usb_bsp.c targets/horus/usbd_desc.c SRC += $(STM32USBPATH)/STM32_USB_OTG_Driver/src/usb_core.c SRC += $(STM32USBPATH)/STM32_USB_OTG_Driver/src/usb_dcd.c SRC += $(STM32USBPATH)/STM32_USB_OTG_Driver/src/usb_dcd_int.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Core/src/usbd_core.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Core/src/usbd_ioreq.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Core/src/usbd_req.c - EXTRABOARDSRC += targets/Horus/usbd_usr.cpp + EXTRABOARDSRC += targets/horus/usbd_usr.cpp SRC += syscalls.c ifeq ($(USB), JOYSTICK) CPPDEFS += -DUSB_JOYSTICK - SRC += targets/Horus/usbd_hid_joystick.c + SRC += targets/horus/usbd_hid_joystick.c else ifeq ($(USB), SERIAL) CPPDEFS += -DUSB_SERIAL SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c - EXTRABOARDSRC += targets/Horus/usbd_cdc.cpp + EXTRABOARDSRC += targets/horus/usbd_cdc.cpp else CPPDEFS += -DUSB_MASS_STORAGE SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/src/usbd_msc_scsi.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c - EXTRABOARDSRC += targets/Horus/usbd_storage_msd.cpp + EXTRABOARDSRC += targets/horus/usbd_storage_msd.cpp endif ifeq ($(GVARS), YES) GUIMODELSRC += gui/$(GUIDIRECTORY)/menu_model_gvars.cpp @@ -1304,9 +1304,9 @@ ifeq ($(PCB), HORUS) LUADEP = lua/lua_exports_horus.inc endif - EXTRABOARDSRC += $(FATFSDIR)/ff.c $(FATFSDIR)/fattime.c $(FATFSDIR)/option/ccsbcs.c targets/Horus/diskio.cpp + EXTRABOARDSRC += $(FATFSDIR)/ff.c $(FATFSDIR)/fattime.c $(FATFSDIR)/option/ccsbcs.c targets/horus/diskio.cpp CPPDEFS += -DSDCARD -DVOICE -DRTCLOCK - CPPSRC += sdcard.cpp rtc.cpp logs.cpp targets/Taranis/rtc_driver.cpp + CPPSRC += sdcard.cpp rtc.cpp logs.cpp targets/taranis/rtc_driver.cpp GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_sdmanager.cpp INCDIRS += $(FATFSDIR) $(FATFSDIR)/option @@ -1316,7 +1316,7 @@ ifeq ($(PCB), HORUS) CPPDEFS += -DHAPTIC CPPSRC += haptic.cpp - CPPSRC += targets/Horus/haptic_driver.cpp + CPPSRC += targets/horus/haptic_driver.cpp EXTRABOARDSRC += endif @@ -1766,11 +1766,11 @@ endif # build bootloader ifeq ($(PCB), $(filter $(PCB), TARANIS)) -bootloader.lbm: targets/Taranis/bootloader/bootloader_ramBoot.bin +bootloader.lbm: targets/taranis/bootloader/bootloader_ramBoot.bin $(BIN2LBM) $^ $@ -.PHONY targets/Taranis/bootloader/bootloader_ramBoot.bin: +.PHONY targets/taranis/bootloader/bootloader_ramBoot.bin: @echo "Building bootloader..." - $(MAKE) -C targets/Taranis/bootloader PCB=$(PCB) PCBREV=$(PCBREV) NANO=$(NANO) WARNINGS_AS_ERRORS=$(WARNINGS_AS_ERRORS) + $(MAKE) -C targets/taranis/bootloader PCB=$(PCB) PCBREV=$(PCBREV) NANO=$(NANO) WARNINGS_AS_ERRORS=$(WARNINGS_AS_ERRORS) else ifeq ($(PCB), $(filter $(PCB), 9XRPRO AR9X)) bootloader.lbm: @echo "Fetching Mike's bootloader..." @@ -1872,7 +1872,7 @@ translations/se.h: translations/se.h.txt $(TRANSLATE) translations/se.h.txt translations/se.h se ifeq ($(PCB), $(filter $(PCB), HORUS)) - FONTDIR = Horus + FONTDIR = horus FONTNAME = DejaVu\ Sans TINSIZE = 9 SMLSIZE = 13 @@ -1883,7 +1883,7 @@ ifeq ($(PCB), $(filter $(PCB), HORUS)) XXLSIZE = 48 MASKFORMAT = 8bits else - FONTDIR = Flamenco + FONTDIR = flamenco FONTNAME = Roboto TINSIZE = 5 SMLSIZE = 7 @@ -1928,19 +1928,19 @@ bitmaps: $(BITMAPS) bitmaps/sticks.lbm: bitmaps/sticks.xbm $(IMG2LBM) $^ $@ $(LCDSIZE) 1bit 4 -bitmaps/9X/%.lbm: bitmaps/9X/%.png +bitmaps/9x/%.lbm: bitmaps/9x/%.png $(IMG2LBM) $^ $@ $(LCDSIZE) 1bit -bitmaps/Taranis/%.lbm: bitmaps/Taranis/%.png +bitmaps/taranis/%.lbm: bitmaps/taranis/%.png $(IMG2LBM) $^ $@ $(LCDSIZE) 4bits -bitmaps/Flamenco/%.lbm: bitmaps/Flamenco/%.png +bitmaps/flamenco/%.lbm: bitmaps/flamenco/%.png $(IMG2LBM) $^ $@ $(LCDSIZE) 4/4/4/4 -bitmaps/Horus/mask_%.lbm: bitmaps/Horus/mask_%.png +bitmaps/horus/mask_%.lbm: bitmaps/horus/mask_%.png $(IMG2LBM) $^ $@ $(LCDSIZE) $(MASKFORMAT) -bitmaps/Horus/%.lbm: bitmaps/Horus/%.png +bitmaps/horus/%.lbm: bitmaps/horus/%.png $(IMG2LBM) $^ $@ $(LCDSIZE) 5/6/5/8 ifeq ($(OS),Windows_NT) @@ -2136,7 +2136,7 @@ clean_list : $(REMOVE) fonts/*/*.lbm $(REMOVE) translations/*.h $(REMOVE) lua/lua_exports*.txt lua/lua_fields*.txt lua/lua_exports*.inc - $(MAKE) -C targets/Taranis/bootloader clean + $(MAKE) -C targets/taranis/bootloader clean #### Install diff --git a/radio/src/bitmaps/9X/about.png b/radio/src/bitmaps/9x/about.png similarity index 100% rename from radio/src/bitmaps/9X/about.png rename to radio/src/bitmaps/9x/about.png diff --git a/radio/src/bitmaps/9X/asterisk.png b/radio/src/bitmaps/9x/asterisk.png similarity index 100% rename from radio/src/bitmaps/9X/asterisk.png rename to radio/src/bitmaps/9x/asterisk.png diff --git a/radio/src/bitmaps/9X/asterisk.xbm b/radio/src/bitmaps/9x/asterisk.xbm similarity index 100% rename from radio/src/bitmaps/9X/asterisk.xbm rename to radio/src/bitmaps/9x/asterisk.xbm diff --git a/radio/src/bitmaps/9X/splash.png b/radio/src/bitmaps/9x/splash.png similarity index 100% rename from radio/src/bitmaps/9X/splash.png rename to radio/src/bitmaps/9x/splash.png diff --git a/radio/src/bitmaps/9X/splash.xbm b/radio/src/bitmaps/9x/splash.xbm similarity index 100% rename from radio/src/bitmaps/9X/splash.xbm rename to radio/src/bitmaps/9x/splash.xbm diff --git a/radio/src/bitmaps/Horus/asterisk.png b/radio/src/bitmaps/horus/asterisk.png similarity index 100% rename from radio/src/bitmaps/Horus/asterisk.png rename to radio/src/bitmaps/horus/asterisk.png diff --git a/radio/src/bitmaps/Horus/background.png b/radio/src/bitmaps/horus/background.png similarity index 100% rename from radio/src/bitmaps/Horus/background.png rename to radio/src/bitmaps/horus/background.png diff --git a/radio/src/bitmaps/Horus/corsair.png b/radio/src/bitmaps/horus/corsair.png similarity index 100% rename from radio/src/bitmaps/Horus/corsair.png rename to radio/src/bitmaps/horus/corsair.png diff --git a/radio/src/bitmaps/Horus/mainview_flat.png b/radio/src/bitmaps/horus/mainview_flat.png similarity index 100% rename from radio/src/bitmaps/Horus/mainview_flat.png rename to radio/src/bitmaps/horus/mainview_flat.png diff --git a/radio/src/bitmaps/Horus/mask_analogs.png b/radio/src/bitmaps/horus/mask_analogs.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_analogs.png rename to radio/src/bitmaps/horus/mask_analogs.png diff --git a/radio/src/bitmaps/Horus/mask_calibration.png b/radio/src/bitmaps/horus/mask_calibration.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_calibration.png rename to radio/src/bitmaps/horus/mask_calibration.png diff --git a/radio/src/bitmaps/Horus/mask_coord_shadow.png b/radio/src/bitmaps/horus/mask_coord_shadow.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_coord_shadow.png rename to radio/src/bitmaps/horus/mask_coord_shadow.png diff --git a/radio/src/bitmaps/Horus/mask_current_bg.png b/radio/src/bitmaps/horus/mask_current_bg.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_current_bg.png rename to radio/src/bitmaps/horus/mask_current_bg.png diff --git a/radio/src/bitmaps/Horus/mask_current_dot.png b/radio/src/bitmaps/horus/mask_current_dot.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_current_dot.png rename to radio/src/bitmaps/horus/mask_current_dot.png diff --git a/radio/src/bitmaps/Horus/mask_current_shadow.png b/radio/src/bitmaps/horus/mask_current_shadow.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_current_shadow.png rename to radio/src/bitmaps/horus/mask_current_shadow.png diff --git a/radio/src/bitmaps/Horus/mask_curves.png b/radio/src/bitmaps/horus/mask_curves.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_curves.png rename to radio/src/bitmaps/horus/mask_curves.png diff --git a/radio/src/bitmaps/Horus/mask_cvpoint.png b/radio/src/bitmaps/horus/mask_cvpoint.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_cvpoint.png rename to radio/src/bitmaps/horus/mask_cvpoint.png diff --git a/radio/src/bitmaps/Horus/mask_cvpoint_center.png b/radio/src/bitmaps/horus/mask_cvpoint_center.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_cvpoint_center.png rename to radio/src/bitmaps/horus/mask_cvpoint_center.png diff --git a/radio/src/bitmaps/Horus/mask_dot.png b/radio/src/bitmaps/horus/mask_dot.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_dot.png rename to radio/src/bitmaps/horus/mask_dot.png diff --git a/radio/src/bitmaps/Horus/mask_flight_modes.png b/radio/src/bitmaps/horus/mask_flight_modes.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_flight_modes.png rename to radio/src/bitmaps/horus/mask_flight_modes.png diff --git a/radio/src/bitmaps/Horus/mask_global_functions.png b/radio/src/bitmaps/horus/mask_global_functions.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_global_functions.png rename to radio/src/bitmaps/horus/mask_global_functions.png diff --git a/radio/src/bitmaps/Horus/mask_gvars.png b/radio/src/bitmaps/horus/mask_gvars.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_gvars.png rename to radio/src/bitmaps/horus/mask_gvars.png diff --git a/radio/src/bitmaps/Horus/mask_hardware.png b/radio/src/bitmaps/horus/mask_hardware.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_hardware.png rename to radio/src/bitmaps/horus/mask_hardware.png diff --git a/radio/src/bitmaps/Horus/mask_heli.png b/radio/src/bitmaps/horus/mask_heli.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_heli.png rename to radio/src/bitmaps/horus/mask_heli.png diff --git a/radio/src/bitmaps/Horus/mask_htrim_frame.png b/radio/src/bitmaps/horus/mask_htrim_frame.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_htrim_frame.png rename to radio/src/bitmaps/horus/mask_htrim_frame.png diff --git a/radio/src/bitmaps/Horus/mask_inputs.png b/radio/src/bitmaps/horus/mask_inputs.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_inputs.png rename to radio/src/bitmaps/horus/mask_inputs.png diff --git a/radio/src/bitmaps/Horus/mask_library.png b/radio/src/bitmaps/horus/mask_library.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_library.png rename to radio/src/bitmaps/horus/mask_library.png diff --git a/radio/src/bitmaps/Horus/mask_library_active_model.png b/radio/src/bitmaps/horus/mask_library_active_model.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_library_active_model.png rename to radio/src/bitmaps/horus/mask_library_active_model.png diff --git a/radio/src/bitmaps/Horus/mask_library_category_index.png b/radio/src/bitmaps/horus/mask_library_category_index.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_library_category_index.png rename to radio/src/bitmaps/horus/mask_library_category_index.png diff --git a/radio/src/bitmaps/Horus/mask_library_score_0.png b/radio/src/bitmaps/horus/mask_library_score_0.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_library_score_0.png rename to radio/src/bitmaps/horus/mask_library_score_0.png diff --git a/radio/src/bitmaps/Horus/mask_library_score_1.png b/radio/src/bitmaps/horus/mask_library_score_1.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_library_score_1.png rename to radio/src/bitmaps/horus/mask_library_score_1.png diff --git a/radio/src/bitmaps/Horus/mask_library_slot.png b/radio/src/bitmaps/horus/mask_library_slot.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_library_slot.png rename to radio/src/bitmaps/horus/mask_library_slot.png diff --git a/radio/src/bitmaps/Horus/mask_library_star_0.png b/radio/src/bitmaps/horus/mask_library_star_0.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_library_star_0.png rename to radio/src/bitmaps/horus/mask_library_star_0.png diff --git a/radio/src/bitmaps/Horus/mask_library_star_1.png b/radio/src/bitmaps/horus/mask_library_star_1.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_library_star_1.png rename to radio/src/bitmaps/horus/mask_library_star_1.png diff --git a/radio/src/bitmaps/Horus/mask_logical_switches.png b/radio/src/bitmaps/horus/mask_logical_switches.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_logical_switches.png rename to radio/src/bitmaps/horus/mask_logical_switches.png diff --git a/radio/src/bitmaps/Horus/mask_lua_scripts.png b/radio/src/bitmaps/horus/mask_lua_scripts.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_lua_scripts.png rename to radio/src/bitmaps/horus/mask_lua_scripts.png diff --git a/radio/src/bitmaps/Horus/mask_menu_model.png b/radio/src/bitmaps/horus/mask_menu_model.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_menu_model.png rename to radio/src/bitmaps/horus/mask_menu_model.png diff --git a/radio/src/bitmaps/Horus/mask_menu_radio.png b/radio/src/bitmaps/horus/mask_menu_radio.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_menu_radio.png rename to radio/src/bitmaps/horus/mask_menu_radio.png diff --git a/radio/src/bitmaps/Horus/mask_mixer.png b/radio/src/bitmaps/horus/mask_mixer.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_mixer.png rename to radio/src/bitmaps/horus/mask_mixer.png diff --git a/radio/src/bitmaps/Horus/mask_model_setup.png b/radio/src/bitmaps/horus/mask_model_setup.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_model_setup.png rename to radio/src/bitmaps/horus/mask_model_setup.png diff --git a/radio/src/bitmaps/Horus/mask_noscale_ico.png b/radio/src/bitmaps/horus/mask_noscale_ico.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_noscale_ico.png rename to radio/src/bitmaps/horus/mask_noscale_ico.png diff --git a/radio/src/bitmaps/Horus/mask_outputs.png b/radio/src/bitmaps/horus/mask_outputs.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_outputs.png rename to radio/src/bitmaps/horus/mask_outputs.png diff --git a/radio/src/bitmaps/Horus/mask_point.png b/radio/src/bitmaps/horus/mask_point.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_point.png rename to radio/src/bitmaps/horus/mask_point.png diff --git a/radio/src/bitmaps/Horus/mask_radio_setup.png b/radio/src/bitmaps/horus/mask_radio_setup.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_radio_setup.png rename to radio/src/bitmaps/horus/mask_radio_setup.png diff --git a/radio/src/bitmaps/Horus/mask_rscale.png b/radio/src/bitmaps/horus/mask_rscale.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_rscale.png rename to radio/src/bitmaps/horus/mask_rscale.png diff --git a/radio/src/bitmaps/Horus/mask_sd_browser.png b/radio/src/bitmaps/horus/mask_sd_browser.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_sd_browser.png rename to radio/src/bitmaps/horus/mask_sd_browser.png diff --git a/radio/src/bitmaps/Horus/mask_special_functions.png b/radio/src/bitmaps/horus/mask_special_functions.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_special_functions.png rename to radio/src/bitmaps/horus/mask_special_functions.png diff --git a/radio/src/bitmaps/Horus/mask_switches.png b/radio/src/bitmaps/horus/mask_switches.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_switches.png rename to radio/src/bitmaps/horus/mask_switches.png diff --git a/radio/src/bitmaps/Horus/mask_telemetry.png b/radio/src/bitmaps/horus/mask_telemetry.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_telemetry.png rename to radio/src/bitmaps/horus/mask_telemetry.png diff --git a/radio/src/bitmaps/Horus/mask_timer_bg.png b/radio/src/bitmaps/horus/mask_timer_bg.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_timer_bg.png rename to radio/src/bitmaps/horus/mask_timer_bg.png diff --git a/radio/src/bitmaps/Horus/mask_topmenu_altitude_ico.png b/radio/src/bitmaps/horus/mask_topmenu_altitude_ico.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_topmenu_altitude_ico.png rename to radio/src/bitmaps/horus/mask_topmenu_altitude_ico.png diff --git a/radio/src/bitmaps/Horus/mask_topmenu_masterpart_ico.png b/radio/src/bitmaps/horus/mask_topmenu_masterpart_ico.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_topmenu_masterpart_ico.png rename to radio/src/bitmaps/horus/mask_topmenu_masterpart_ico.png diff --git a/radio/src/bitmaps/Horus/mask_topmenu_opentx.png b/radio/src/bitmaps/horus/mask_topmenu_opentx.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_topmenu_opentx.png rename to radio/src/bitmaps/horus/mask_topmenu_opentx.png diff --git a/radio/src/bitmaps/Horus/mask_topmenu_polygon.png b/radio/src/bitmaps/horus/mask_topmenu_polygon.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_topmenu_polygon.png rename to radio/src/bitmaps/horus/mask_topmenu_polygon.png diff --git a/radio/src/bitmaps/Horus/mask_topmenu_sdcard.png b/radio/src/bitmaps/horus/mask_topmenu_sdcard.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_topmenu_sdcard.png rename to radio/src/bitmaps/horus/mask_topmenu_sdcard.png diff --git a/radio/src/bitmaps/Horus/mask_topmenu_slavepart_ico.png b/radio/src/bitmaps/horus/mask_topmenu_slavepart_ico.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_topmenu_slavepart_ico.png rename to radio/src/bitmaps/horus/mask_topmenu_slavepart_ico.png diff --git a/radio/src/bitmaps/Horus/mask_topmenu_usb.png b/radio/src/bitmaps/horus/mask_topmenu_usb.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_topmenu_usb.png rename to radio/src/bitmaps/horus/mask_topmenu_usb.png diff --git a/radio/src/bitmaps/Horus/mask_topmenu_volume_ico.png b/radio/src/bitmaps/horus/mask_topmenu_volume_ico.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_topmenu_volume_ico.png rename to radio/src/bitmaps/horus/mask_topmenu_volume_ico.png diff --git a/radio/src/bitmaps/Horus/mask_trainer.png b/radio/src/bitmaps/horus/mask_trainer.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_trainer.png rename to radio/src/bitmaps/horus/mask_trainer.png diff --git a/radio/src/bitmaps/Horus/mask_trim_shadow.png b/radio/src/bitmaps/horus/mask_trim_shadow.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_trim_shadow.png rename to radio/src/bitmaps/horus/mask_trim_shadow.png diff --git a/radio/src/bitmaps/Horus/mask_version.png b/radio/src/bitmaps/horus/mask_version.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_version.png rename to radio/src/bitmaps/horus/mask_version.png diff --git a/radio/src/bitmaps/Horus/mask_vtrim_frame.png b/radio/src/bitmaps/horus/mask_vtrim_frame.png similarity index 100% rename from radio/src/bitmaps/Horus/mask_vtrim_frame.png rename to radio/src/bitmaps/horus/mask_vtrim_frame.png diff --git a/radio/src/bitmaps/Horus/splash.png b/radio/src/bitmaps/horus/splash.png similarity index 100% rename from radio/src/bitmaps/Horus/splash.png rename to radio/src/bitmaps/horus/splash.png diff --git a/radio/src/bitmaps/Horus/std/bar_bg.png b/radio/src/bitmaps/horus/std/bar_bg.png similarity index 100% rename from radio/src/bitmaps/Horus/std/bar_bg.png rename to radio/src/bitmaps/horus/std/bar_bg.png diff --git a/radio/src/bitmaps/Horus/std/bar_group_bg.png b/radio/src/bitmaps/horus/std/bar_group_bg.png similarity index 100% rename from radio/src/bitmaps/Horus/std/bar_group_bg.png rename to radio/src/bitmaps/horus/std/bar_group_bg.png diff --git a/radio/src/bitmaps/Horus/std/bat_indicator_back.png b/radio/src/bitmaps/horus/std/bat_indicator_back.png similarity index 100% rename from radio/src/bitmaps/Horus/std/bat_indicator_back.png rename to radio/src/bitmaps/horus/std/bat_indicator_back.png diff --git a/radio/src/bitmaps/Horus/std/bat_indicator_back_alert.png b/radio/src/bitmaps/horus/std/bat_indicator_back_alert.png similarity index 100% rename from radio/src/bitmaps/Horus/std/bat_indicator_back_alert.png rename to radio/src/bitmaps/horus/std/bat_indicator_back_alert.png diff --git a/radio/src/bitmaps/Horus/std/menu_ico.png b/radio/src/bitmaps/horus/std/menu_ico.png similarity index 100% rename from radio/src/bitmaps/Horus/std/menu_ico.png rename to radio/src/bitmaps/horus/std/menu_ico.png diff --git a/radio/src/bitmaps/Horus/std/model_img_f4U.png b/radio/src/bitmaps/horus/std/model_img_f4U.png similarity index 100% rename from radio/src/bitmaps/Horus/std/model_img_f4U.png rename to radio/src/bitmaps/horus/std/model_img_f4U.png diff --git a/radio/src/bitmaps/Horus/std/signal_indicator_back.png b/radio/src/bitmaps/horus/std/signal_indicator_back.png similarity index 100% rename from radio/src/bitmaps/Horus/std/signal_indicator_back.png rename to radio/src/bitmaps/horus/std/signal_indicator_back.png diff --git a/radio/src/bitmaps/Horus/std/signal_indicator_back_alert.png b/radio/src/bitmaps/horus/std/signal_indicator_back_alert.png similarity index 100% rename from radio/src/bitmaps/Horus/std/signal_indicator_back_alert.png rename to radio/src/bitmaps/horus/std/signal_indicator_back_alert.png diff --git a/radio/src/bitmaps/Horus/std/trim_activarea_horizontal.png b/radio/src/bitmaps/horus/std/trim_activarea_horizontal.png similarity index 100% rename from radio/src/bitmaps/Horus/std/trim_activarea_horizontal.png rename to radio/src/bitmaps/horus/std/trim_activarea_horizontal.png diff --git a/radio/src/bitmaps/Horus/std/trim_activarea_vertical.png b/radio/src/bitmaps/horus/std/trim_activarea_vertical.png similarity index 100% rename from radio/src/bitmaps/Horus/std/trim_activarea_vertical.png rename to radio/src/bitmaps/horus/std/trim_activarea_vertical.png diff --git a/radio/src/bitmaps/Horus/std/trim_bg_horizontal.png b/radio/src/bitmaps/horus/std/trim_bg_horizontal.png similarity index 100% rename from radio/src/bitmaps/Horus/std/trim_bg_horizontal.png rename to radio/src/bitmaps/horus/std/trim_bg_horizontal.png diff --git a/radio/src/bitmaps/Horus/std/trim_bg_vertical.png b/radio/src/bitmaps/horus/std/trim_bg_vertical.png similarity index 100% rename from radio/src/bitmaps/Horus/std/trim_bg_vertical.png rename to radio/src/bitmaps/horus/std/trim_bg_vertical.png diff --git a/radio/src/bitmaps/Horus/std/trim_center_horizontal.png b/radio/src/bitmaps/horus/std/trim_center_horizontal.png similarity index 100% rename from radio/src/bitmaps/Horus/std/trim_center_horizontal.png rename to radio/src/bitmaps/horus/std/trim_center_horizontal.png diff --git a/radio/src/bitmaps/Horus/std/trim_center_vertical.png b/radio/src/bitmaps/horus/std/trim_center_vertical.png similarity index 100% rename from radio/src/bitmaps/Horus/std/trim_center_vertical.png rename to radio/src/bitmaps/horus/std/trim_center_vertical.png diff --git a/radio/src/bitmaps/Horus/std/trim_down_vertical.png b/radio/src/bitmaps/horus/std/trim_down_vertical.png similarity index 100% rename from radio/src/bitmaps/Horus/std/trim_down_vertical.png rename to radio/src/bitmaps/horus/std/trim_down_vertical.png diff --git a/radio/src/bitmaps/Horus/std/trim_left_horizontal.png b/radio/src/bitmaps/horus/std/trim_left_horizontal.png similarity index 100% rename from radio/src/bitmaps/Horus/std/trim_left_horizontal.png rename to radio/src/bitmaps/horus/std/trim_left_horizontal.png diff --git a/radio/src/bitmaps/Horus/std/trim_right_horizontal.png b/radio/src/bitmaps/horus/std/trim_right_horizontal.png similarity index 100% rename from radio/src/bitmaps/Horus/std/trim_right_horizontal.png rename to radio/src/bitmaps/horus/std/trim_right_horizontal.png diff --git a/radio/src/bitmaps/Horus/std/trim_up_vertical.png b/radio/src/bitmaps/horus/std/trim_up_vertical.png similarity index 100% rename from radio/src/bitmaps/Horus/std/trim_up_vertical.png rename to radio/src/bitmaps/horus/std/trim_up_vertical.png diff --git a/radio/src/bitmaps/Horus/std/volume_indicator_back.png b/radio/src/bitmaps/horus/std/volume_indicator_back.png similarity index 100% rename from radio/src/bitmaps/Horus/std/volume_indicator_back.png rename to radio/src/bitmaps/horus/std/volume_indicator_back.png diff --git a/radio/src/bitmaps/Taranis/.gitignore b/radio/src/bitmaps/taranis/.gitignore similarity index 100% rename from radio/src/bitmaps/Taranis/.gitignore rename to radio/src/bitmaps/taranis/.gitignore diff --git a/radio/src/bitmaps/Taranis/about.png b/radio/src/bitmaps/taranis/about.png similarity index 100% rename from radio/src/bitmaps/Taranis/about.png rename to radio/src/bitmaps/taranis/about.png diff --git a/radio/src/bitmaps/Taranis/asterisk.png b/radio/src/bitmaps/taranis/asterisk.png similarity index 100% rename from radio/src/bitmaps/Taranis/asterisk.png rename to radio/src/bitmaps/taranis/asterisk.png diff --git a/radio/src/bitmaps/Taranis/icons.png b/radio/src/bitmaps/taranis/icons.png similarity index 100% rename from radio/src/bitmaps/Taranis/icons.png rename to radio/src/bitmaps/taranis/icons.png diff --git a/radio/src/bitmaps/Taranis/lock.png b/radio/src/bitmaps/taranis/lock.png similarity index 100% rename from radio/src/bitmaps/Taranis/lock.png rename to radio/src/bitmaps/taranis/lock.png diff --git a/radio/src/bitmaps/Taranis/logo.png b/radio/src/bitmaps/taranis/logo.png similarity index 100% rename from radio/src/bitmaps/Taranis/logo.png rename to radio/src/bitmaps/taranis/logo.png diff --git a/radio/src/bitmaps/Taranis/shutdown.png b/radio/src/bitmaps/taranis/shutdown.png similarity index 100% rename from radio/src/bitmaps/Taranis/shutdown.png rename to radio/src/bitmaps/taranis/shutdown.png diff --git a/radio/src/bitmaps/Taranis/sleep.png b/radio/src/bitmaps/taranis/sleep.png similarity index 100% rename from radio/src/bitmaps/Taranis/sleep.png rename to radio/src/bitmaps/taranis/sleep.png diff --git a/radio/src/bitmaps/Taranis/splash.png b/radio/src/bitmaps/taranis/splash.png similarity index 100% rename from radio/src/bitmaps/Taranis/splash.png rename to radio/src/bitmaps/taranis/splash.png diff --git a/radio/src/bitmaps/Taranis/startup.png b/radio/src/bitmaps/taranis/startup.png similarity index 100% rename from radio/src/bitmaps/Taranis/startup.png rename to radio/src/bitmaps/taranis/startup.png diff --git a/radio/src/bitmaps/Taranis/std/analog_inputs.png b/radio/src/bitmaps/taranis/std/analog_inputs.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/analog_inputs.png rename to radio/src/bitmaps/taranis/std/analog_inputs.png diff --git a/radio/src/bitmaps/Taranis/std/calibration.png b/radio/src/bitmaps/taranis/std/calibration.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/calibration.png rename to radio/src/bitmaps/taranis/std/calibration.png diff --git a/radio/src/bitmaps/Taranis/std/curves.png b/radio/src/bitmaps/taranis/std/curves.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/curves.png rename to radio/src/bitmaps/taranis/std/curves.png diff --git a/radio/src/bitmaps/Taranis/std/files.png b/radio/src/bitmaps/taranis/std/files.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/files.png rename to radio/src/bitmaps/taranis/std/files.png diff --git a/radio/src/bitmaps/Taranis/std/flight_modes.png b/radio/src/bitmaps/taranis/std/flight_modes.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/flight_modes.png rename to radio/src/bitmaps/taranis/std/flight_modes.png diff --git a/radio/src/bitmaps/Taranis/std/global_functions.png b/radio/src/bitmaps/taranis/std/global_functions.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/global_functions.png rename to radio/src/bitmaps/taranis/std/global_functions.png diff --git a/radio/src/bitmaps/Taranis/std/global_vars.png b/radio/src/bitmaps/taranis/std/global_vars.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/global_vars.png rename to radio/src/bitmaps/taranis/std/global_vars.png diff --git a/radio/src/bitmaps/Taranis/std/hardware.png b/radio/src/bitmaps/taranis/std/hardware.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/hardware.png rename to radio/src/bitmaps/taranis/std/hardware.png diff --git a/radio/src/bitmaps/Taranis/std/heli_setup.png b/radio/src/bitmaps/taranis/std/heli_setup.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/heli_setup.png rename to radio/src/bitmaps/taranis/std/heli_setup.png diff --git a/radio/src/bitmaps/Taranis/std/inputs.png b/radio/src/bitmaps/taranis/std/inputs.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/inputs.png rename to radio/src/bitmaps/taranis/std/inputs.png diff --git a/radio/src/bitmaps/Taranis/std/logical_sw.png b/radio/src/bitmaps/taranis/std/logical_sw.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/logical_sw.png rename to radio/src/bitmaps/taranis/std/logical_sw.png diff --git a/radio/src/bitmaps/Taranis/std/lua_scripts.png b/radio/src/bitmaps/taranis/std/lua_scripts.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/lua_scripts.png rename to radio/src/bitmaps/taranis/std/lua_scripts.png diff --git a/radio/src/bitmaps/Taranis/std/mainview_setup.png b/radio/src/bitmaps/taranis/std/mainview_setup.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/mainview_setup.png rename to radio/src/bitmaps/taranis/std/mainview_setup.png diff --git a/radio/src/bitmaps/Taranis/std/mixer.png b/radio/src/bitmaps/taranis/std/mixer.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/mixer.png rename to radio/src/bitmaps/taranis/std/mixer.png diff --git a/radio/src/bitmaps/Taranis/std/model_select.png b/radio/src/bitmaps/taranis/std/model_select.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/model_select.png rename to radio/src/bitmaps/taranis/std/model_select.png diff --git a/radio/src/bitmaps/Taranis/std/model_settings.png b/radio/src/bitmaps/taranis/std/model_settings.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/model_settings.png rename to radio/src/bitmaps/taranis/std/model_settings.png diff --git a/radio/src/bitmaps/Taranis/std/model_setup.png b/radio/src/bitmaps/taranis/std/model_setup.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/model_setup.png rename to radio/src/bitmaps/taranis/std/model_setup.png diff --git a/radio/src/bitmaps/Taranis/std/radio_setup.png b/radio/src/bitmaps/taranis/std/radio_setup.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/radio_setup.png rename to radio/src/bitmaps/taranis/std/radio_setup.png diff --git a/radio/src/bitmaps/Taranis/std/servos.png b/radio/src/bitmaps/taranis/std/servos.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/servos.png rename to radio/src/bitmaps/taranis/std/servos.png diff --git a/radio/src/bitmaps/Taranis/std/special_functions.png b/radio/src/bitmaps/taranis/std/special_functions.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/special_functions.png rename to radio/src/bitmaps/taranis/std/special_functions.png diff --git a/radio/src/bitmaps/Taranis/std/switch_test.png b/radio/src/bitmaps/taranis/std/switch_test.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/switch_test.png rename to radio/src/bitmaps/taranis/std/switch_test.png diff --git a/radio/src/bitmaps/Taranis/std/telemetry.png b/radio/src/bitmaps/taranis/std/telemetry.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/telemetry.png rename to radio/src/bitmaps/taranis/std/telemetry.png diff --git a/radio/src/bitmaps/Taranis/std/trainer.png b/radio/src/bitmaps/taranis/std/trainer.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/trainer.png rename to radio/src/bitmaps/taranis/std/trainer.png diff --git a/radio/src/bitmaps/Taranis/std/version.png b/radio/src/bitmaps/taranis/std/version.png similarity index 100% rename from radio/src/bitmaps/Taranis/std/version.png rename to radio/src/bitmaps/taranis/std/version.png diff --git a/radio/src/fonts/Horus/font_dblsize.png b/radio/src/fonts/horus/font_dblsize.png similarity index 100% rename from radio/src/fonts/Horus/font_dblsize.png rename to radio/src/fonts/horus/font_dblsize.png diff --git a/radio/src/fonts/Horus/font_dblsize.specs b/radio/src/fonts/horus/font_dblsize.specs similarity index 100% rename from radio/src/fonts/Horus/font_dblsize.specs rename to radio/src/fonts/horus/font_dblsize.specs diff --git a/radio/src/fonts/Horus/font_midsize.png b/radio/src/fonts/horus/font_midsize.png similarity index 100% rename from radio/src/fonts/Horus/font_midsize.png rename to radio/src/fonts/horus/font_midsize.png diff --git a/radio/src/fonts/Horus/font_midsize.specs b/radio/src/fonts/horus/font_midsize.specs similarity index 100% rename from radio/src/fonts/Horus/font_midsize.specs rename to radio/src/fonts/horus/font_midsize.specs diff --git a/radio/src/fonts/Horus/font_smlsize.png b/radio/src/fonts/horus/font_smlsize.png similarity index 100% rename from radio/src/fonts/Horus/font_smlsize.png rename to radio/src/fonts/horus/font_smlsize.png diff --git a/radio/src/fonts/Horus/font_smlsize.specs b/radio/src/fonts/horus/font_smlsize.specs similarity index 100% rename from radio/src/fonts/Horus/font_smlsize.specs rename to radio/src/fonts/horus/font_smlsize.specs diff --git a/radio/src/fonts/Horus/font_stdsize.png b/radio/src/fonts/horus/font_stdsize.png similarity index 100% rename from radio/src/fonts/Horus/font_stdsize.png rename to radio/src/fonts/horus/font_stdsize.png diff --git a/radio/src/fonts/Horus/font_stdsize.specs b/radio/src/fonts/horus/font_stdsize.specs similarity index 100% rename from radio/src/fonts/Horus/font_stdsize.specs rename to radio/src/fonts/horus/font_stdsize.specs diff --git a/radio/src/fonts/Horus/font_tinsize.png b/radio/src/fonts/horus/font_tinsize.png similarity index 100% rename from radio/src/fonts/Horus/font_tinsize.png rename to radio/src/fonts/horus/font_tinsize.png diff --git a/radio/src/fonts/Horus/font_tinsize.specs b/radio/src/fonts/horus/font_tinsize.specs similarity index 100% rename from radio/src/fonts/Horus/font_tinsize.specs rename to radio/src/fonts/horus/font_tinsize.specs diff --git a/radio/src/fonts/Horus/font_xxlsize.png b/radio/src/fonts/horus/font_xxlsize.png similarity index 100% rename from radio/src/fonts/Horus/font_xxlsize.png rename to radio/src/fonts/horus/font_xxlsize.png diff --git a/radio/src/fonts/Horus/font_xxlsize.specs b/radio/src/fonts/horus/font_xxlsize.specs similarity index 100% rename from radio/src/fonts/Horus/font_xxlsize.specs rename to radio/src/fonts/horus/font_xxlsize.specs diff --git a/radio/src/gui/9X/fonts.cpp b/radio/src/gui/9x/fonts.cpp similarity index 100% rename from radio/src/gui/9X/fonts.cpp rename to radio/src/gui/9x/fonts.cpp diff --git a/radio/src/gui/9X/gui.h b/radio/src/gui/9x/gui.h similarity index 97% rename from radio/src/gui/9X/gui.h rename to radio/src/gui/9x/gui.h index 1147d90b3..1566c79e8 100644 --- a/radio/src/gui/9X/gui.h +++ b/radio/src/gui/9x/gui.h @@ -34,8 +34,8 @@ * */ -#include "lcd.h" -#include "menus.h" +#include "../9x/lcd.h" +#include "../9x/menus.h" #define NUM_BODY_LINES (LCD_LINES-1) #define MENU_HEADER_HEIGHT FH diff --git a/radio/src/gui/9X/helpers.cpp b/radio/src/gui/9x/helpers.cpp similarity index 100% rename from radio/src/gui/9X/helpers.cpp rename to radio/src/gui/9x/helpers.cpp diff --git a/radio/src/gui/9X/lcd.cpp b/radio/src/gui/9x/lcd.cpp similarity index 100% rename from radio/src/gui/9X/lcd.cpp rename to radio/src/gui/9x/lcd.cpp diff --git a/radio/src/gui/9X/lcd.h b/radio/src/gui/9x/lcd.h similarity index 100% rename from radio/src/gui/9X/lcd.h rename to radio/src/gui/9x/lcd.h diff --git a/radio/src/gui/9X/menu_general.cpp b/radio/src/gui/9x/menu_general.cpp similarity index 100% rename from radio/src/gui/9X/menu_general.cpp rename to radio/src/gui/9x/menu_general.cpp diff --git a/radio/src/gui/9X/menu_general_calib.cpp b/radio/src/gui/9x/menu_general_calib.cpp similarity index 100% rename from radio/src/gui/9X/menu_general_calib.cpp rename to radio/src/gui/9x/menu_general_calib.cpp diff --git a/radio/src/gui/9X/menu_general_diaganas.cpp b/radio/src/gui/9x/menu_general_diaganas.cpp similarity index 100% rename from radio/src/gui/9X/menu_general_diaganas.cpp rename to radio/src/gui/9x/menu_general_diaganas.cpp diff --git a/radio/src/gui/9X/menu_general_diagkeys.cpp b/radio/src/gui/9x/menu_general_diagkeys.cpp similarity index 100% rename from radio/src/gui/9X/menu_general_diagkeys.cpp rename to radio/src/gui/9x/menu_general_diagkeys.cpp diff --git a/radio/src/gui/9X/menu_general_hardware.cpp b/radio/src/gui/9x/menu_general_hardware.cpp similarity index 100% rename from radio/src/gui/9X/menu_general_hardware.cpp rename to radio/src/gui/9x/menu_general_hardware.cpp diff --git a/radio/src/gui/9X/menu_general_sdmanager.cpp b/radio/src/gui/9x/menu_general_sdmanager.cpp similarity index 100% rename from radio/src/gui/9X/menu_general_sdmanager.cpp rename to radio/src/gui/9x/menu_general_sdmanager.cpp diff --git a/radio/src/gui/9X/menu_general_setup.cpp b/radio/src/gui/9x/menu_general_setup.cpp similarity index 100% rename from radio/src/gui/9X/menu_general_setup.cpp rename to radio/src/gui/9x/menu_general_setup.cpp diff --git a/radio/src/gui/9X/menu_general_trainer.cpp b/radio/src/gui/9x/menu_general_trainer.cpp similarity index 100% rename from radio/src/gui/9X/menu_general_trainer.cpp rename to radio/src/gui/9x/menu_general_trainer.cpp diff --git a/radio/src/gui/9X/menu_general_version.cpp b/radio/src/gui/9x/menu_general_version.cpp similarity index 100% rename from radio/src/gui/9X/menu_general_version.cpp rename to radio/src/gui/9x/menu_general_version.cpp diff --git a/radio/src/gui/9X/menu_model.cpp b/radio/src/gui/9x/menu_model.cpp similarity index 99% rename from radio/src/gui/9X/menu_model.cpp rename to radio/src/gui/9x/menu_model.cpp index e785c78e5..5ce03fe1c 100644 --- a/radio/src/gui/9X/menu_model.cpp +++ b/radio/src/gui/9x/menu_model.cpp @@ -36,7 +36,7 @@ #include "../../opentx.h" #if defined(MAVLINK) -#include "gui/9X/view_mavlink.h" +#include "gui/9x/view_mavlink.h" #endif // TODO elsewhere! diff --git a/radio/src/gui/9X/menu_model_curves.cpp b/radio/src/gui/9x/menu_model_curves.cpp similarity index 100% rename from radio/src/gui/9X/menu_model_curves.cpp rename to radio/src/gui/9x/menu_model_curves.cpp diff --git a/radio/src/gui/9X/menu_model_custom_functions.cpp b/radio/src/gui/9x/menu_model_custom_functions.cpp similarity index 100% rename from radio/src/gui/9X/menu_model_custom_functions.cpp rename to radio/src/gui/9x/menu_model_custom_functions.cpp diff --git a/radio/src/gui/9X/menu_model_flightmodes.cpp b/radio/src/gui/9x/menu_model_flightmodes.cpp similarity index 100% rename from radio/src/gui/9X/menu_model_flightmodes.cpp rename to radio/src/gui/9x/menu_model_flightmodes.cpp diff --git a/radio/src/gui/9X/menu_model_heli.cpp b/radio/src/gui/9x/menu_model_heli.cpp similarity index 100% rename from radio/src/gui/9X/menu_model_heli.cpp rename to radio/src/gui/9x/menu_model_heli.cpp diff --git a/radio/src/gui/9X/menu_model_inputs_mixes.cpp b/radio/src/gui/9x/menu_model_inputs_mixes.cpp similarity index 100% rename from radio/src/gui/9X/menu_model_inputs_mixes.cpp rename to radio/src/gui/9x/menu_model_inputs_mixes.cpp diff --git a/radio/src/gui/9X/menu_model_limits.cpp b/radio/src/gui/9x/menu_model_limits.cpp similarity index 100% rename from radio/src/gui/9X/menu_model_limits.cpp rename to radio/src/gui/9x/menu_model_limits.cpp diff --git a/radio/src/gui/9X/menu_model_logical_switches.cpp b/radio/src/gui/9x/menu_model_logical_switches.cpp similarity index 100% rename from radio/src/gui/9X/menu_model_logical_switches.cpp rename to radio/src/gui/9x/menu_model_logical_switches.cpp diff --git a/radio/src/gui/9X/menu_model_select.cpp b/radio/src/gui/9x/menu_model_select.cpp similarity index 100% rename from radio/src/gui/9X/menu_model_select.cpp rename to radio/src/gui/9x/menu_model_select.cpp diff --git a/radio/src/gui/9X/menu_model_setup.cpp b/radio/src/gui/9x/menu_model_setup.cpp similarity index 100% rename from radio/src/gui/9X/menu_model_setup.cpp rename to radio/src/gui/9x/menu_model_setup.cpp diff --git a/radio/src/gui/9X/menu_model_telemetry.cpp b/radio/src/gui/9x/menu_model_telemetry.cpp similarity index 100% rename from radio/src/gui/9X/menu_model_telemetry.cpp rename to radio/src/gui/9x/menu_model_telemetry.cpp diff --git a/radio/src/gui/9X/menu_model_templates.cpp b/radio/src/gui/9x/menu_model_templates.cpp similarity index 100% rename from radio/src/gui/9X/menu_model_templates.cpp rename to radio/src/gui/9x/menu_model_templates.cpp diff --git a/radio/src/gui/9X/menus.cpp b/radio/src/gui/9x/menus.cpp similarity index 100% rename from radio/src/gui/9X/menus.cpp rename to radio/src/gui/9x/menus.cpp diff --git a/radio/src/gui/9X/menus.h b/radio/src/gui/9x/menus.h similarity index 100% rename from radio/src/gui/9X/menus.h rename to radio/src/gui/9x/menus.h diff --git a/radio/src/gui/9X/navigation.cpp b/radio/src/gui/9x/navigation.cpp similarity index 100% rename from radio/src/gui/9X/navigation.cpp rename to radio/src/gui/9x/navigation.cpp diff --git a/radio/src/gui/9X/popups.cpp b/radio/src/gui/9x/popups.cpp similarity index 100% rename from radio/src/gui/9X/popups.cpp rename to radio/src/gui/9x/popups.cpp diff --git a/radio/src/gui/9X/splash.cpp b/radio/src/gui/9x/splash.cpp similarity index 97% rename from radio/src/gui/9X/splash.cpp rename to radio/src/gui/9x/splash.cpp index 2c2000031..207153767 100644 --- a/radio/src/gui/9X/splash.cpp +++ b/radio/src/gui/9x/splash.cpp @@ -39,7 +39,7 @@ #if defined(SPLASH) const pm_uchar splashdata[] PROGMEM = { 'S','P','S',0, - #include "bitmaps/9X/splash.lbm" + #include "bitmaps/9x/splash.lbm" 'S','P','E',0 }; const pm_uchar * const splash_lbm = splashdata+4; diff --git a/radio/src/gui/9X/view_about.cpp b/radio/src/gui/9x/view_about.cpp similarity index 96% rename from radio/src/gui/9X/view_about.cpp rename to radio/src/gui/9x/view_about.cpp index 27712ebc4..f8a22997a 100644 --- a/radio/src/gui/9X/view_about.cpp +++ b/radio/src/gui/9x/view_about.cpp @@ -37,7 +37,7 @@ #include "../../opentx.h" const pm_uchar about_bmp[] PROGMEM = { -#include "../../bitmaps/9X/about.lbm" +#include "../../bitmaps/9x/about.lbm" }; enum AboutScreens { diff --git a/radio/src/gui/9X/view_main.cpp b/radio/src/gui/9x/view_main.cpp similarity index 100% rename from radio/src/gui/9X/view_main.cpp rename to radio/src/gui/9x/view_main.cpp diff --git a/radio/src/gui/9X/view_mavlink.cpp b/radio/src/gui/9x/view_mavlink.cpp similarity index 99% rename from radio/src/gui/9X/view_mavlink.cpp rename to radio/src/gui/9x/view_mavlink.cpp index bc6d9a5f7..65e192f8c 100644 --- a/radio/src/gui/9X/view_mavlink.cpp +++ b/radio/src/gui/9x/view_mavlink.cpp @@ -41,7 +41,7 @@ * Contains the menu specific code for Mavlink support. */ -#include "gui/9X/view_mavlink.h" +#include "../9x/view_mavlink.h" // Globals declaration diff --git a/radio/src/gui/9X/view_mavlink.h b/radio/src/gui/9x/view_mavlink.h similarity index 99% rename from radio/src/gui/9X/view_mavlink.h rename to radio/src/gui/9x/view_mavlink.h index b359f086e..152f94049 100644 --- a/radio/src/gui/9X/view_mavlink.h +++ b/radio/src/gui/9x/view_mavlink.h @@ -43,9 +43,9 @@ #ifndef _VIEW_MAVLINK_H_ #define _VIEW_MAVLINK_H_ +#include "../9x/menus.h" #include "opentx.h" #include "telemetry/mavlink.h" -#include "gui/9X/menus.h" #include "targets/common_avr/serial_driver.h" #define APSIZE (BSS | DBLSIZE) diff --git a/radio/src/gui/9X/view_statistics.cpp b/radio/src/gui/9x/view_statistics.cpp similarity index 100% rename from radio/src/gui/9X/view_statistics.cpp rename to radio/src/gui/9x/view_statistics.cpp diff --git a/radio/src/gui/9X/view_telemetry.cpp b/radio/src/gui/9x/view_telemetry.cpp similarity index 100% rename from radio/src/gui/9X/view_telemetry.cpp rename to radio/src/gui/9x/view_telemetry.cpp diff --git a/radio/src/gui/9X/view_text.cpp b/radio/src/gui/9x/view_text.cpp similarity index 100% rename from radio/src/gui/9X/view_text.cpp rename to radio/src/gui/9x/view_text.cpp diff --git a/radio/src/gui/9X/widgets.cpp b/radio/src/gui/9x/widgets.cpp similarity index 100% rename from radio/src/gui/9X/widgets.cpp rename to radio/src/gui/9x/widgets.cpp diff --git a/radio/src/gui/gui.h b/radio/src/gui/gui.h index cee4cdb63..318018d76 100644 --- a/radio/src/gui/gui.h +++ b/radio/src/gui/gui.h @@ -42,13 +42,13 @@ #endif #if defined(PCBHORUS) - #include "Horus/gui.h" + #include "horus/gui.h" #elif defined(PCBFLAMENCO) - #include "Flamenco/gui.h" + #include "flamenco/gui.h" #elif defined(PCBTARANIS) - #include "Taranis/gui.h" + #include "taranis/gui.h" #else - #include "9X/gui.h" + #include "9x/gui.h" #endif #if defined(SIMU) diff --git a/radio/src/gui/Horus/bitmaps.cpp b/radio/src/gui/horus/bitmaps.cpp similarity index 62% rename from radio/src/gui/Horus/bitmaps.cpp rename to radio/src/gui/horus/bitmaps.cpp index 6bd57df33..6667eaaab 100644 --- a/radio/src/gui/Horus/bitmaps.cpp +++ b/radio/src/gui/horus/bitmaps.cpp @@ -41,23 +41,23 @@ */ const uint8_t LBM_TOPMENU_POLYGON[] = { -#include "../../bitmaps/Horus/mask_topmenu_polygon.lbm" +#include "../../bitmaps/horus/mask_topmenu_polygon.lbm" }; const uint8_t LBM_DOT[] = { -#include "../../bitmaps/Horus/mask_dot.lbm" +#include "../../bitmaps/horus/mask_dot.lbm" }; const uint8_t LBM_CURRENT_BG[] = { -#include "../../bitmaps/Horus/mask_current_bg.lbm" +#include "../../bitmaps/horus/mask_current_bg.lbm" }; const uint8_t LBM_CURRENT_SHADOW[] = { -#include "../../bitmaps/Horus/mask_current_shadow.lbm" +#include "../../bitmaps/horus/mask_current_shadow.lbm" }; const uint8_t LBM_CURRENT_DOT[] = { -#include "../../bitmaps/Horus/mask_current_dot.lbm" +#include "../../bitmaps/horus/mask_current_dot.lbm" }; /* @@ -65,35 +65,35 @@ const uint8_t LBM_CURRENT_DOT[] = { */ const uint8_t LBM_MAINVIEW_BACKGROUND[] = { -#include "../../bitmaps/Horus/background.lbm" +#include "../../bitmaps/horus/background.lbm" }; const uint8_t LBM_TOPMENU_OPENTX[] = { -#include "../../bitmaps/Horus/mask_topmenu_opentx.lbm" +#include "../../bitmaps/horus/mask_topmenu_opentx.lbm" }; const uint8_t LBM_TOPMENU_USB[] = { -#include "../../bitmaps/Horus/mask_topmenu_usb.lbm" +#include "../../bitmaps/horus/mask_topmenu_usb.lbm" }; const uint8_t LBM_HTRIM_FRAME[] = { -#include "../../bitmaps/Horus/mask_htrim_frame.lbm" +#include "../../bitmaps/horus/mask_htrim_frame.lbm" }; const uint8_t LBM_VTRIM_FRAME[] = { -#include "../../bitmaps/Horus/mask_vtrim_frame.lbm" +#include "../../bitmaps/horus/mask_vtrim_frame.lbm" }; const uint8_t LBM_TRIM_SHADOW[] = { -#include "../../bitmaps/Horus/mask_trim_shadow.lbm" +#include "../../bitmaps/horus/mask_trim_shadow.lbm" }; const uint8_t LBM_TIMER_BACKGROUND[] = { -#include "../../bitmaps/Horus/mask_timer_bg.lbm" +#include "../../bitmaps/horus/mask_timer_bg.lbm" }; const uint8_t LBM_RSCALE[] = { -#include "../../bitmaps/Horus/mask_rscale.lbm" +#include "../../bitmaps/horus/mask_rscale.lbm" }; /* @@ -101,31 +101,31 @@ const uint8_t LBM_RSCALE[] = { */ const uint8_t LBM_RADIO_ICON[] = { -#include "../../bitmaps/Horus/mask_menu_radio.lbm" +#include "../../bitmaps/horus/mask_menu_radio.lbm" }; const uint8_t LBM_RADIO_SETUP_ICON[] = { -#include "../../bitmaps/Horus/mask_radio_setup.lbm" +#include "../../bitmaps/horus/mask_radio_setup.lbm" }; const uint8_t LBM_SD_BROWSER_ICON[] = { -#include "../../bitmaps/Horus/mask_sd_browser.lbm" +#include "../../bitmaps/horus/mask_sd_browser.lbm" }; const uint8_t LBM_GLOBAL_FUNCTIONS_ICON[] = { -#include "../../bitmaps/Horus/mask_global_functions.lbm" +#include "../../bitmaps/horus/mask_global_functions.lbm" }; const uint8_t LBM_TRAINER_ICON[] = { -#include "../../bitmaps/Horus/mask_trainer.lbm" +#include "../../bitmaps/horus/mask_trainer.lbm" }; const uint8_t LBM_CALIBRATION_ICON[] = { -#include "../../bitmaps/Horus/mask_calibration.lbm" +#include "../../bitmaps/horus/mask_calibration.lbm" }; const uint8_t LBM_VERSION_ICON[] = { -#include "../../bitmaps/Horus/mask_version.lbm" +#include "../../bitmaps/horus/mask_version.lbm" }; const uint8_t * const LBM_RADIO_ICONS[] = { @@ -143,55 +143,55 @@ const uint8_t * const LBM_RADIO_ICONS[] = { */ const uint8_t LBM_MODEL_ICON[] = { -#include "../../bitmaps/Horus/mask_menu_model.lbm" +#include "../../bitmaps/horus/mask_menu_model.lbm" }; const uint8_t LBM_MODEL_SETUP_ICON[] = { -#include "../../bitmaps/Horus/mask_model_setup.lbm" +#include "../../bitmaps/horus/mask_model_setup.lbm" }; const uint8_t LBM_HELI_ICON[] = { -#include "../../bitmaps/Horus/mask_heli.lbm" +#include "../../bitmaps/horus/mask_heli.lbm" }; const uint8_t LBM_FLIGHT_MODES_ICON[] = { -#include "../../bitmaps/Horus/mask_flight_modes.lbm" +#include "../../bitmaps/horus/mask_flight_modes.lbm" }; const uint8_t LBM_INPUTS_ICON[] = { -#include "../../bitmaps/Horus/mask_inputs.lbm" +#include "../../bitmaps/horus/mask_inputs.lbm" }; const uint8_t LBM_MIXER_ICON[] = { -#include "../../bitmaps/Horus/mask_mixer.lbm" +#include "../../bitmaps/horus/mask_mixer.lbm" }; const uint8_t LBM_OUTPUTS_ICON[] = { -#include "../../bitmaps/Horus/mask_outputs.lbm" +#include "../../bitmaps/horus/mask_outputs.lbm" }; const uint8_t LBM_CURVES_ICON[] = { -#include "../../bitmaps/Horus/mask_curves.lbm" +#include "../../bitmaps/horus/mask_curves.lbm" }; const uint8_t LBM_GVARS_ICON[] = { -#include "../../bitmaps/Horus/mask_gvars.lbm" +#include "../../bitmaps/horus/mask_gvars.lbm" }; const uint8_t LBM_LOGICAL_SWITCHES_ICON[] = { -#include "../../bitmaps/Horus/mask_logical_switches.lbm" +#include "../../bitmaps/horus/mask_logical_switches.lbm" }; const uint8_t LBM_SPECIAL_FUNCTIONS_ICON[] = { -#include "../../bitmaps/Horus/mask_special_functions.lbm" +#include "../../bitmaps/horus/mask_special_functions.lbm" }; const uint8_t LBM_LUA_SCRIPTS_ICON[] = { -#include "../../bitmaps/Horus/mask_lua_scripts.lbm" +#include "../../bitmaps/horus/mask_lua_scripts.lbm" }; const uint8_t LBM_TELEMETRY_ICON[] = { -#include "../../bitmaps/Horus/mask_telemetry.lbm" +#include "../../bitmaps/horus/mask_telemetry.lbm" }; const uint8_t * const LBM_MODEL_ICONS[] = { @@ -217,31 +217,31 @@ const uint8_t * const LBM_MODEL_ICONS[] = { */ const uint8_t LBM_LIBRARY_ICON[] = { -#include "../../bitmaps/Horus/mask_library.lbm" +#include "../../bitmaps/horus/mask_library.lbm" }; const uint8_t LBM_LIBRARY_SLOT[] = { -#include "../../bitmaps/Horus/mask_library_slot.lbm" +#include "../../bitmaps/horus/mask_library_slot.lbm" }; const uint8_t LBM_LIBRARY_CURSOR[] = { -#include "../../bitmaps/Horus/mask_library_category_index.lbm" +#include "../../bitmaps/horus/mask_library_category_index.lbm" }; const uint8_t LBM_SCORE0[] = { -#include "../../bitmaps/Horus/mask_library_score_0.lbm" +#include "../../bitmaps/horus/mask_library_score_0.lbm" }; const uint8_t LBM_SCORE1[] = { -#include "../../bitmaps/Horus/mask_library_score_1.lbm" +#include "../../bitmaps/horus/mask_library_score_1.lbm" }; const uint8_t LBM_STAR0[] = { -#include "../../bitmaps/Horus/mask_library_star_0.lbm" +#include "../../bitmaps/horus/mask_library_star_0.lbm" }; const uint8_t LBM_STAR1[] = { -#include "../../bitmaps/Horus/mask_library_star_1.lbm" +#include "../../bitmaps/horus/mask_library_star_1.lbm" }; /* @@ -249,21 +249,21 @@ const uint8_t LBM_STAR1[] = { */ const uint8_t LBM_ASTERISK[] = { -#include "../../bitmaps/Horus/asterisk.lbm" +#include "../../bitmaps/horus/asterisk.lbm" }; const uint8_t LBM_POINT[] = { -#include "../../bitmaps/Horus/mask_point.lbm" +#include "../../bitmaps/horus/mask_point.lbm" }; const uint8_t LBM_CURVE_POINT[] = { -#include "../../bitmaps/Horus/mask_cvpoint.lbm" +#include "../../bitmaps/horus/mask_cvpoint.lbm" }; const uint8_t LBM_CURVE_POINT_CENTER[] = { -#include "../../bitmaps/Horus/mask_cvpoint_center.lbm" +#include "../../bitmaps/horus/mask_cvpoint_center.lbm" }; const uint8_t LBM_CURVE_COORD_SHADOW[] = { -#include "../../bitmaps/Horus/mask_coord_shadow.lbm" +#include "../../bitmaps/horus/mask_coord_shadow.lbm" }; diff --git a/radio/src/gui/Horus/curves.cpp b/radio/src/gui/horus/curves.cpp similarity index 100% rename from radio/src/gui/Horus/curves.cpp rename to radio/src/gui/horus/curves.cpp diff --git a/radio/src/gui/Horus/fonts.cpp b/radio/src/gui/horus/fonts.cpp similarity index 77% rename from radio/src/gui/Horus/fonts.cpp rename to radio/src/gui/horus/fonts.cpp index 08b9ca28b..be7b0b770 100644 --- a/radio/src/gui/Horus/fonts.cpp +++ b/radio/src/gui/horus/fonts.cpp @@ -37,51 +37,51 @@ #include "../../opentx.h" const uint16_t font_tinsize_specs[] PROGMEM = -#include "fonts/Horus/font_tinsize.specs" +#include "../../fonts/horus/font_tinsize.specs" ; const pm_uchar font_tinsize[] PROGMEM = { -#include "fonts/Horus/font_tinsize.lbm" +#include "fonts/horus/font_tinsize.lbm" }; const uint16_t font_smlsize_specs[] PROGMEM = -#include "fonts/Horus/font_smlsize.specs" +#include "../../fonts/horus/font_smlsize.specs" ; const pm_uchar font_smlsize[] PROGMEM = { -#include "fonts/Horus/font_smlsize.lbm" +#include "fonts/horus/font_smlsize.lbm" }; const uint16_t font_stdsize_specs[] PROGMEM = -#include "fonts/Horus/font_stdsize.specs" +#include "../../fonts/horus/font_stdsize.specs" ; const pm_uchar font_stdsize[] PROGMEM = { -#include "fonts/Horus/font_stdsize.lbm" +#include "fonts/horus/font_stdsize.lbm" }; const uint16_t font_midsize_specs[] PROGMEM = -#include "fonts/Horus/font_midsize.specs" +#include "../../fonts/horus/font_midsize.specs" ; const pm_uchar font_midsize[] PROGMEM = { -#include "fonts/Horus/font_midsize.lbm" +#include "fonts/horus/font_midsize.lbm" }; const uint16_t font_dblsize_specs[] PROGMEM = -#include "fonts/Horus/font_dblsize.specs" +#include "../../fonts/horus/font_dblsize.specs" ; const pm_uchar font_dblsize[] PROGMEM = { -#include "fonts/Horus/font_dblsize.lbm" +#include "fonts/horus/font_dblsize.lbm" }; const uint16_t font_xxlsize_specs[] PROGMEM = -#include "fonts/Horus/font_xxlsize.specs" +#include "../../fonts/horus/font_xxlsize.specs" ; const pm_uchar font_xxlsize[] PROGMEM = { -#include "fonts/Horus/font_xxlsize.lbm" +#include "fonts/horus/font_xxlsize.lbm" }; const uint16_t *fontspecsTable[16] = { font_stdsize_specs, font_tinsize_specs, font_smlsize_specs, font_midsize_specs, font_dblsize_specs, font_xxlsize_specs }; diff --git a/radio/src/gui/Horus/gui.h b/radio/src/gui/horus/gui.h similarity index 98% rename from radio/src/gui/Horus/gui.h rename to radio/src/gui/horus/gui.h index ee2b9b3fc..79633aa28 100644 --- a/radio/src/gui/Horus/gui.h +++ b/radio/src/gui/horus/gui.h @@ -34,8 +34,8 @@ * */ -#include "lcd.h" -#include "menus.h" +#include "../horus/lcd.h" +#include "../horus/menus.h" #define MENU_HEADER_HEIGHT 45 #define MENU_TITLE_TOP 48 diff --git a/radio/src/gui/Horus/helpers.cpp b/radio/src/gui/horus/helpers.cpp similarity index 100% rename from radio/src/gui/Horus/helpers.cpp rename to radio/src/gui/horus/helpers.cpp diff --git a/radio/src/gui/Horus/lcd.cpp b/radio/src/gui/horus/lcd.cpp similarity index 100% rename from radio/src/gui/Horus/lcd.cpp rename to radio/src/gui/horus/lcd.cpp diff --git a/radio/src/gui/Horus/lcd.h b/radio/src/gui/horus/lcd.h similarity index 100% rename from radio/src/gui/Horus/lcd.h rename to radio/src/gui/horus/lcd.h diff --git a/radio/src/gui/Horus/menu_general.cpp b/radio/src/gui/horus/menu_general.cpp similarity index 100% rename from radio/src/gui/Horus/menu_general.cpp rename to radio/src/gui/horus/menu_general.cpp diff --git a/radio/src/gui/Horus/menu_general_calib.cpp b/radio/src/gui/horus/menu_general_calib.cpp similarity index 100% rename from radio/src/gui/Horus/menu_general_calib.cpp rename to radio/src/gui/horus/menu_general_calib.cpp diff --git a/radio/src/gui/Horus/menu_general_sdmanager.cpp b/radio/src/gui/horus/menu_general_sdmanager.cpp similarity index 100% rename from radio/src/gui/Horus/menu_general_sdmanager.cpp rename to radio/src/gui/horus/menu_general_sdmanager.cpp diff --git a/radio/src/gui/Horus/menu_general_setup.cpp b/radio/src/gui/horus/menu_general_setup.cpp similarity index 100% rename from radio/src/gui/Horus/menu_general_setup.cpp rename to radio/src/gui/horus/menu_general_setup.cpp diff --git a/radio/src/gui/Horus/menu_general_trainer.cpp b/radio/src/gui/horus/menu_general_trainer.cpp similarity index 100% rename from radio/src/gui/Horus/menu_general_trainer.cpp rename to radio/src/gui/horus/menu_general_trainer.cpp diff --git a/radio/src/gui/Horus/menu_general_version.cpp b/radio/src/gui/horus/menu_general_version.cpp similarity index 100% rename from radio/src/gui/Horus/menu_general_version.cpp rename to radio/src/gui/horus/menu_general_version.cpp diff --git a/radio/src/gui/Horus/menu_model.cpp b/radio/src/gui/horus/menu_model.cpp similarity index 100% rename from radio/src/gui/Horus/menu_model.cpp rename to radio/src/gui/horus/menu_model.cpp diff --git a/radio/src/gui/Horus/menu_model_curves.cpp b/radio/src/gui/horus/menu_model_curves.cpp similarity index 100% rename from radio/src/gui/Horus/menu_model_curves.cpp rename to radio/src/gui/horus/menu_model_curves.cpp diff --git a/radio/src/gui/Horus/menu_model_custom_functions.cpp b/radio/src/gui/horus/menu_model_custom_functions.cpp similarity index 100% rename from radio/src/gui/Horus/menu_model_custom_functions.cpp rename to radio/src/gui/horus/menu_model_custom_functions.cpp diff --git a/radio/src/gui/Horus/menu_model_custom_scripts.cpp b/radio/src/gui/horus/menu_model_custom_scripts.cpp similarity index 100% rename from radio/src/gui/Horus/menu_model_custom_scripts.cpp rename to radio/src/gui/horus/menu_model_custom_scripts.cpp diff --git a/radio/src/gui/Horus/menu_model_flightmodes.cpp b/radio/src/gui/horus/menu_model_flightmodes.cpp similarity index 100% rename from radio/src/gui/Horus/menu_model_flightmodes.cpp rename to radio/src/gui/horus/menu_model_flightmodes.cpp diff --git a/radio/src/gui/Horus/menu_model_gvars.cpp b/radio/src/gui/horus/menu_model_gvars.cpp similarity index 100% rename from radio/src/gui/Horus/menu_model_gvars.cpp rename to radio/src/gui/horus/menu_model_gvars.cpp diff --git a/radio/src/gui/Horus/menu_model_heli.cpp b/radio/src/gui/horus/menu_model_heli.cpp similarity index 100% rename from radio/src/gui/Horus/menu_model_heli.cpp rename to radio/src/gui/horus/menu_model_heli.cpp diff --git a/radio/src/gui/Horus/menu_model_inputs_mixes.cpp b/radio/src/gui/horus/menu_model_inputs_mixes.cpp similarity index 100% rename from radio/src/gui/Horus/menu_model_inputs_mixes.cpp rename to radio/src/gui/horus/menu_model_inputs_mixes.cpp diff --git a/radio/src/gui/Horus/menu_model_limits.cpp b/radio/src/gui/horus/menu_model_limits.cpp similarity index 100% rename from radio/src/gui/Horus/menu_model_limits.cpp rename to radio/src/gui/horus/menu_model_limits.cpp diff --git a/radio/src/gui/Horus/menu_model_logical_switches.cpp b/radio/src/gui/horus/menu_model_logical_switches.cpp similarity index 100% rename from radio/src/gui/Horus/menu_model_logical_switches.cpp rename to radio/src/gui/horus/menu_model_logical_switches.cpp diff --git a/radio/src/gui/Horus/menu_model_select.cpp b/radio/src/gui/horus/menu_model_select.cpp similarity index 100% rename from radio/src/gui/Horus/menu_model_select.cpp rename to radio/src/gui/horus/menu_model_select.cpp diff --git a/radio/src/gui/Horus/menu_model_setup.cpp b/radio/src/gui/horus/menu_model_setup.cpp similarity index 100% rename from radio/src/gui/Horus/menu_model_setup.cpp rename to radio/src/gui/horus/menu_model_setup.cpp diff --git a/radio/src/gui/Horus/menu_model_telemetry.cpp b/radio/src/gui/horus/menu_model_telemetry.cpp similarity index 100% rename from radio/src/gui/Horus/menu_model_telemetry.cpp rename to radio/src/gui/horus/menu_model_telemetry.cpp diff --git a/radio/src/gui/Horus/menus.cpp b/radio/src/gui/horus/menus.cpp similarity index 100% rename from radio/src/gui/Horus/menus.cpp rename to radio/src/gui/horus/menus.cpp diff --git a/radio/src/gui/Horus/menus.h b/radio/src/gui/horus/menus.h similarity index 100% rename from radio/src/gui/Horus/menus.h rename to radio/src/gui/horus/menus.h diff --git a/radio/src/gui/Horus/navigation.cpp b/radio/src/gui/horus/navigation.cpp similarity index 100% rename from radio/src/gui/Horus/navigation.cpp rename to radio/src/gui/horus/navigation.cpp diff --git a/radio/src/gui/Horus/popups.cpp b/radio/src/gui/horus/popups.cpp similarity index 100% rename from radio/src/gui/Horus/popups.cpp rename to radio/src/gui/horus/popups.cpp diff --git a/radio/src/gui/Horus/splash.cpp b/radio/src/gui/horus/splash.cpp similarity index 97% rename from radio/src/gui/Horus/splash.cpp rename to radio/src/gui/horus/splash.cpp index 58c5d61be..a38fc6974 100644 --- a/radio/src/gui/Horus/splash.cpp +++ b/radio/src/gui/horus/splash.cpp @@ -37,7 +37,7 @@ #include "../../opentx.h" const uint8_t LBM_SPLASH[] = { -#include "../../bitmaps/Horus/splash.lbm" +#include "../../bitmaps/horus/splash.lbm" }; #if defined(SPLASH) diff --git a/radio/src/gui/Horus/view_about.cpp b/radio/src/gui/horus/view_about.cpp similarity index 100% rename from radio/src/gui/Horus/view_about.cpp rename to radio/src/gui/horus/view_about.cpp diff --git a/radio/src/gui/Horus/view_channels.cpp b/radio/src/gui/horus/view_channels.cpp similarity index 100% rename from radio/src/gui/Horus/view_channels.cpp rename to radio/src/gui/horus/view_channels.cpp diff --git a/radio/src/gui/Horus/view_main.cpp b/radio/src/gui/horus/view_main.cpp similarity index 100% rename from radio/src/gui/Horus/view_main.cpp rename to radio/src/gui/horus/view_main.cpp diff --git a/radio/src/gui/Horus/view_statistics.cpp b/radio/src/gui/horus/view_statistics.cpp similarity index 100% rename from radio/src/gui/Horus/view_statistics.cpp rename to radio/src/gui/horus/view_statistics.cpp diff --git a/radio/src/gui/Horus/view_telemetry.cpp b/radio/src/gui/horus/view_telemetry.cpp similarity index 100% rename from radio/src/gui/Horus/view_telemetry.cpp rename to radio/src/gui/horus/view_telemetry.cpp diff --git a/radio/src/gui/Horus/view_text.cpp b/radio/src/gui/horus/view_text.cpp similarity index 100% rename from radio/src/gui/Horus/view_text.cpp rename to radio/src/gui/horus/view_text.cpp diff --git a/radio/src/gui/Horus/widgets.cpp b/radio/src/gui/horus/widgets.cpp similarity index 100% rename from radio/src/gui/Horus/widgets.cpp rename to radio/src/gui/horus/widgets.cpp diff --git a/radio/src/gui/Taranis/fonts.cpp b/radio/src/gui/taranis/fonts.cpp similarity index 100% rename from radio/src/gui/Taranis/fonts.cpp rename to radio/src/gui/taranis/fonts.cpp diff --git a/radio/src/gui/Taranis/gui.h b/radio/src/gui/taranis/gui.h similarity index 97% rename from radio/src/gui/Taranis/gui.h rename to radio/src/gui/taranis/gui.h index 9df15c662..7abbfbf1a 100644 --- a/radio/src/gui/Taranis/gui.h +++ b/radio/src/gui/taranis/gui.h @@ -34,8 +34,8 @@ * */ -#include "lcd.h" -#include "menus.h" +#include "../taranis/lcd.h" +#include "../taranis/menus.h" #define DEFAULT_SCROLLBAR_X (LCD_W-1) #define NUM_BODY_LINES (LCD_LINES-1) diff --git a/radio/src/gui/Taranis/helpers.cpp b/radio/src/gui/taranis/helpers.cpp similarity index 100% rename from radio/src/gui/Taranis/helpers.cpp rename to radio/src/gui/taranis/helpers.cpp diff --git a/radio/src/gui/Taranis/lcd.cpp b/radio/src/gui/taranis/lcd.cpp similarity index 100% rename from radio/src/gui/Taranis/lcd.cpp rename to radio/src/gui/taranis/lcd.cpp diff --git a/radio/src/gui/Taranis/lcd.h b/radio/src/gui/taranis/lcd.h similarity index 100% rename from radio/src/gui/Taranis/lcd.h rename to radio/src/gui/taranis/lcd.h diff --git a/radio/src/gui/Taranis/menu_general.cpp b/radio/src/gui/taranis/menu_general.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_general.cpp rename to radio/src/gui/taranis/menu_general.cpp diff --git a/radio/src/gui/Taranis/menu_general_calib.cpp b/radio/src/gui/taranis/menu_general_calib.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_general_calib.cpp rename to radio/src/gui/taranis/menu_general_calib.cpp diff --git a/radio/src/gui/Taranis/menu_general_diaganas.cpp b/radio/src/gui/taranis/menu_general_diaganas.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_general_diaganas.cpp rename to radio/src/gui/taranis/menu_general_diaganas.cpp diff --git a/radio/src/gui/Taranis/menu_general_diagkeys.cpp b/radio/src/gui/taranis/menu_general_diagkeys.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_general_diagkeys.cpp rename to radio/src/gui/taranis/menu_general_diagkeys.cpp diff --git a/radio/src/gui/Taranis/menu_general_hardware.cpp b/radio/src/gui/taranis/menu_general_hardware.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_general_hardware.cpp rename to radio/src/gui/taranis/menu_general_hardware.cpp diff --git a/radio/src/gui/Taranis/menu_general_sdmanager.cpp b/radio/src/gui/taranis/menu_general_sdmanager.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_general_sdmanager.cpp rename to radio/src/gui/taranis/menu_general_sdmanager.cpp diff --git a/radio/src/gui/Taranis/menu_general_setup.cpp b/radio/src/gui/taranis/menu_general_setup.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_general_setup.cpp rename to radio/src/gui/taranis/menu_general_setup.cpp diff --git a/radio/src/gui/Taranis/menu_general_trainer.cpp b/radio/src/gui/taranis/menu_general_trainer.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_general_trainer.cpp rename to radio/src/gui/taranis/menu_general_trainer.cpp diff --git a/radio/src/gui/Taranis/menu_general_version.cpp b/radio/src/gui/taranis/menu_general_version.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_general_version.cpp rename to radio/src/gui/taranis/menu_general_version.cpp diff --git a/radio/src/gui/Taranis/menu_model.cpp b/radio/src/gui/taranis/menu_model.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_model.cpp rename to radio/src/gui/taranis/menu_model.cpp diff --git a/radio/src/gui/Taranis/menu_model_curves.cpp b/radio/src/gui/taranis/menu_model_curves.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_model_curves.cpp rename to radio/src/gui/taranis/menu_model_curves.cpp diff --git a/radio/src/gui/Taranis/menu_model_custom_functions.cpp b/radio/src/gui/taranis/menu_model_custom_functions.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_model_custom_functions.cpp rename to radio/src/gui/taranis/menu_model_custom_functions.cpp diff --git a/radio/src/gui/Taranis/menu_model_custom_scripts.cpp b/radio/src/gui/taranis/menu_model_custom_scripts.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_model_custom_scripts.cpp rename to radio/src/gui/taranis/menu_model_custom_scripts.cpp diff --git a/radio/src/gui/Taranis/menu_model_flightmodes.cpp b/radio/src/gui/taranis/menu_model_flightmodes.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_model_flightmodes.cpp rename to radio/src/gui/taranis/menu_model_flightmodes.cpp diff --git a/radio/src/gui/Taranis/menu_model_gvars.cpp b/radio/src/gui/taranis/menu_model_gvars.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_model_gvars.cpp rename to radio/src/gui/taranis/menu_model_gvars.cpp diff --git a/radio/src/gui/Taranis/menu_model_heli.cpp b/radio/src/gui/taranis/menu_model_heli.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_model_heli.cpp rename to radio/src/gui/taranis/menu_model_heli.cpp diff --git a/radio/src/gui/Taranis/menu_model_inputs_mixes.cpp b/radio/src/gui/taranis/menu_model_inputs_mixes.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_model_inputs_mixes.cpp rename to radio/src/gui/taranis/menu_model_inputs_mixes.cpp diff --git a/radio/src/gui/Taranis/menu_model_limits.cpp b/radio/src/gui/taranis/menu_model_limits.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_model_limits.cpp rename to radio/src/gui/taranis/menu_model_limits.cpp diff --git a/radio/src/gui/Taranis/menu_model_logical_switches.cpp b/radio/src/gui/taranis/menu_model_logical_switches.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_model_logical_switches.cpp rename to radio/src/gui/taranis/menu_model_logical_switches.cpp diff --git a/radio/src/gui/Taranis/menu_model_select.cpp b/radio/src/gui/taranis/menu_model_select.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_model_select.cpp rename to radio/src/gui/taranis/menu_model_select.cpp diff --git a/radio/src/gui/Taranis/menu_model_setup.cpp b/radio/src/gui/taranis/menu_model_setup.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_model_setup.cpp rename to radio/src/gui/taranis/menu_model_setup.cpp diff --git a/radio/src/gui/Taranis/menu_model_telemetry.cpp b/radio/src/gui/taranis/menu_model_telemetry.cpp similarity index 100% rename from radio/src/gui/Taranis/menu_model_telemetry.cpp rename to radio/src/gui/taranis/menu_model_telemetry.cpp diff --git a/radio/src/gui/Taranis/menus.cpp b/radio/src/gui/taranis/menus.cpp similarity index 100% rename from radio/src/gui/Taranis/menus.cpp rename to radio/src/gui/taranis/menus.cpp diff --git a/radio/src/gui/Taranis/menus.h b/radio/src/gui/taranis/menus.h similarity index 100% rename from radio/src/gui/Taranis/menus.h rename to radio/src/gui/taranis/menus.h diff --git a/radio/src/gui/Taranis/navigation.cpp b/radio/src/gui/taranis/navigation.cpp similarity index 100% rename from radio/src/gui/Taranis/navigation.cpp rename to radio/src/gui/taranis/navigation.cpp diff --git a/radio/src/gui/Taranis/popups.cpp b/radio/src/gui/taranis/popups.cpp similarity index 100% rename from radio/src/gui/Taranis/popups.cpp rename to radio/src/gui/taranis/popups.cpp diff --git a/radio/src/gui/Taranis/splash.cpp b/radio/src/gui/taranis/splash.cpp similarity index 97% rename from radio/src/gui/Taranis/splash.cpp rename to radio/src/gui/taranis/splash.cpp index 45b5548a7..e2735e3eb 100644 --- a/radio/src/gui/Taranis/splash.cpp +++ b/radio/src/gui/taranis/splash.cpp @@ -39,7 +39,7 @@ #if defined(SPLASH) const pm_uchar splashdata[] PROGMEM = { 'S','P','S',0, - #include "bitmaps/Taranis/splash.lbm" + #include "bitmaps/taranis/splash.lbm" 'S','P','E',0 }; const pm_uchar * const splash_lbm = splashdata+4; diff --git a/radio/src/gui/Taranis/view_about.cpp b/radio/src/gui/taranis/view_about.cpp similarity index 96% rename from radio/src/gui/Taranis/view_about.cpp rename to radio/src/gui/taranis/view_about.cpp index 07c995d4f..053d4c879 100644 --- a/radio/src/gui/Taranis/view_about.cpp +++ b/radio/src/gui/taranis/view_about.cpp @@ -37,7 +37,7 @@ #include "../../opentx.h" const pm_uchar about_bmp[] PROGMEM = { -#include "../../bitmaps/Taranis/about.lbm" +#include "../../bitmaps/taranis/about.lbm" }; enum AboutScreens { diff --git a/radio/src/gui/Taranis/view_channels.cpp b/radio/src/gui/taranis/view_channels.cpp similarity index 100% rename from radio/src/gui/Taranis/view_channels.cpp rename to radio/src/gui/taranis/view_channels.cpp diff --git a/radio/src/gui/Taranis/view_main.cpp b/radio/src/gui/taranis/view_main.cpp similarity index 96% rename from radio/src/gui/Taranis/view_main.cpp rename to radio/src/gui/taranis/view_main.cpp index 5304b472a..8b0e24f63 100644 --- a/radio/src/gui/Taranis/view_main.cpp +++ b/radio/src/gui/taranis/view_main.cpp @@ -67,11 +67,11 @@ #define MARKER_WIDTH 5 const pm_uchar logo_taranis[] PROGMEM = { -#include "../../bitmaps/Taranis/logo.lbm" +#include "../../bitmaps/taranis/logo.lbm" }; const pm_uchar icons[] PROGMEM = { -#include "../../bitmaps/Taranis/icons.lbm" +#include "../../bitmaps/taranis/icons.lbm" }; #define ICON_RSSI 0, 9 diff --git a/radio/src/gui/Taranis/view_statistics.cpp b/radio/src/gui/taranis/view_statistics.cpp similarity index 100% rename from radio/src/gui/Taranis/view_statistics.cpp rename to radio/src/gui/taranis/view_statistics.cpp diff --git a/radio/src/gui/Taranis/view_telemetry.cpp b/radio/src/gui/taranis/view_telemetry.cpp similarity index 100% rename from radio/src/gui/Taranis/view_telemetry.cpp rename to radio/src/gui/taranis/view_telemetry.cpp diff --git a/radio/src/gui/Taranis/view_text.cpp b/radio/src/gui/taranis/view_text.cpp similarity index 100% rename from radio/src/gui/Taranis/view_text.cpp rename to radio/src/gui/taranis/view_text.cpp diff --git a/radio/src/gui/Taranis/widgets.cpp b/radio/src/gui/taranis/widgets.cpp similarity index 99% rename from radio/src/gui/Taranis/widgets.cpp rename to radio/src/gui/taranis/widgets.cpp index 8ba65f0df..303e2d7c8 100644 --- a/radio/src/gui/Taranis/widgets.cpp +++ b/radio/src/gui/taranis/widgets.cpp @@ -37,7 +37,7 @@ #include "../../opentx.h" const pm_uchar bmp_sleep[] PROGMEM = { - #include "../../bitmaps/Taranis/sleep.lbm" + #include "../../bitmaps/taranis/sleep.lbm" }; void displaySleepBitmap() diff --git a/radio/src/loadboot.cpp b/radio/src/loadboot.cpp index 7acffce10..8798015f5 100644 --- a/radio/src/loadboot.cpp +++ b/radio/src/loadboot.cpp @@ -52,7 +52,7 @@ #if defined(PCBSKY9X) #include "AT91SAM3S4.h" #else - #include "targets/Taranis/board_taranis.h" + #include "targets/taranis/board_taranis.h" #endif #if defined(PCBTARANIS) diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 72d5f983c..6b4f18d69 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -40,11 +40,11 @@ #if defined(COLORLCD) #elif defined(PCBTARANIS) const pm_uchar asterisk_lbm[] PROGMEM = { - #include "bitmaps/Taranis/asterisk.lbm" + #include "bitmaps/taranis/asterisk.lbm" }; #else const pm_uchar asterisk_lbm[] PROGMEM = { - #include "bitmaps/9X/asterisk.lbm" + #include "bitmaps/9x/asterisk.lbm" }; #endif @@ -2623,7 +2623,7 @@ int main(void) #define PWR_PRESS_SHUTDOWN 300 // 3s const pm_uchar bmp_shutdown[] PROGMEM = { - #include "../../bitmaps/Taranis/shutdown.lbm" + #include "../../bitmaps/taranis/shutdown.lbm" }; uint32_t pwr_press_time = 0; diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 63d448448..d3e3fd189 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -282,17 +282,17 @@ #define RESXl 1024l #if defined(PCBHORUS) - #include "targets/Horus/board_horus.h" + #include "targets/horus/board_horus.h" #elif defined(PCBFLAMENCO) - #include "targets/Flamenco/board_flamenco.h" + #include "targets/flamenco/board_flamenco.h" #elif defined(PCBTARANIS) - #include "targets/Taranis/board_taranis.h" + #include "targets/taranis/board_taranis.h" #elif defined(PCBSKY9X) - #include "targets/Sky9x/board_sky9x.h" + #include "targets/sky9x/board_sky9x.h" #elif defined(PCBGRUVIN9X) - #include "targets/Gruvin9x/board_gruvin9x.h" + #include "targets/gruvin9x/board_gruvin9x.h" #elif defined(PCBMEGA2560) - #include "targets/Mega2560/board_mega2560.h" + #include "targets/mega2560/board_mega2560.h" #else #include "targets/9x/board_stock.h" #endif @@ -1502,7 +1502,7 @@ enum AUDIO_SOUNDS { #endif #if defined(PCBGRUVIN9X) && defined(VOICE) -#include "targets/Gruvin9x/somo14d.h" +#include "targets/gruvin9x/somo14d.h" #endif #include "translations.h" diff --git a/radio/src/targets/Gruvin9x/board_gruvin9x.cpp b/radio/src/targets/gruvin9x/board_gruvin9x.cpp similarity index 100% rename from radio/src/targets/Gruvin9x/board_gruvin9x.cpp rename to radio/src/targets/gruvin9x/board_gruvin9x.cpp diff --git a/radio/src/targets/Gruvin9x/board_gruvin9x.h b/radio/src/targets/gruvin9x/board_gruvin9x.h similarity index 100% rename from radio/src/targets/Gruvin9x/board_gruvin9x.h rename to radio/src/targets/gruvin9x/board_gruvin9x.h diff --git a/radio/src/targets/Gruvin9x/diskio.cpp b/radio/src/targets/gruvin9x/diskio.cpp similarity index 100% rename from radio/src/targets/Gruvin9x/diskio.cpp rename to radio/src/targets/gruvin9x/diskio.cpp diff --git a/radio/src/targets/Gruvin9x/fuses_2561.txt b/radio/src/targets/gruvin9x/fuses_2561.txt similarity index 100% rename from radio/src/targets/Gruvin9x/fuses_2561.txt rename to radio/src/targets/gruvin9x/fuses_2561.txt diff --git a/radio/src/targets/Gruvin9x/rtc_driver.cpp b/radio/src/targets/gruvin9x/rtc_driver.cpp similarity index 100% rename from radio/src/targets/Gruvin9x/rtc_driver.cpp rename to radio/src/targets/gruvin9x/rtc_driver.cpp diff --git a/radio/src/targets/Gruvin9x/somo14d.cpp b/radio/src/targets/gruvin9x/somo14d.cpp similarity index 100% rename from radio/src/targets/Gruvin9x/somo14d.cpp rename to radio/src/targets/gruvin9x/somo14d.cpp diff --git a/radio/src/targets/Gruvin9x/somo14d.h b/radio/src/targets/gruvin9x/somo14d.h similarity index 100% rename from radio/src/targets/Gruvin9x/somo14d.h rename to radio/src/targets/gruvin9x/somo14d.h diff --git a/radio/src/targets/Horus/adc_driver.cpp b/radio/src/targets/horus/adc_driver.cpp similarity index 100% rename from radio/src/targets/Horus/adc_driver.cpp rename to radio/src/targets/horus/adc_driver.cpp diff --git a/radio/src/targets/Horus/audio_driver.cpp b/radio/src/targets/horus/audio_driver.cpp similarity index 100% rename from radio/src/targets/Horus/audio_driver.cpp rename to radio/src/targets/horus/audio_driver.cpp diff --git a/radio/src/targets/Horus/board_horus.cpp b/radio/src/targets/horus/board_horus.cpp similarity index 100% rename from radio/src/targets/Horus/board_horus.cpp rename to radio/src/targets/horus/board_horus.cpp diff --git a/radio/src/targets/Horus/board_horus.h b/radio/src/targets/horus/board_horus.h similarity index 96% rename from radio/src/targets/Horus/board_horus.h rename to radio/src/targets/horus/board_horus.h index 080721782..263612078 100644 --- a/radio/src/targets/Horus/board_horus.h +++ b/radio/src/targets/horus/board_horus.h @@ -66,12 +66,12 @@ extern "C" { #include "usbd_msc_core.h" #include "usbd_hid_core.h" #include "usbd_usr.h" - #include "usbd_desc.h" - #include "usb_conf.h" - #include "usbd_conf.h" + #include "../horus/usbd_desc.h" + #include "../horus/usb_conf.h" + #include "../horus/usbd_conf.h" #endif -#include "hal.h" +#include "../horus/hal.h" #if defined(__cplusplus) && !defined(SIMU) } diff --git a/radio/src/targets/Horus/delays.c b/radio/src/targets/horus/delays.c similarity index 94% rename from radio/src/targets/Horus/delays.c rename to radio/src/targets/horus/delays.c index e0eb013c8..800b84404 100644 --- a/radio/src/targets/Horus/delays.c +++ b/radio/src/targets/horus/delays.c @@ -34,7 +34,7 @@ * */ -#include "board_horus.h" +#include "../horus/board_horus.h" void delaysInit(void) { diff --git a/radio/src/targets/Horus/diskio.cpp b/radio/src/targets/horus/diskio.cpp similarity index 95% rename from radio/src/targets/Horus/diskio.cpp rename to radio/src/targets/horus/diskio.cpp index 938a94725..da5b31ef4 100644 --- a/radio/src/targets/Horus/diskio.cpp +++ b/radio/src/targets/horus/diskio.cpp @@ -7,8 +7,9 @@ #include "diskio.h" #include // memcpy + +#include "../horus/sdio_sd.h" #include "stm32f4xx.h" -#include "sdio_sd.h" #define BLOCK_SIZE 512 /* Block Size in Bytes */ diff --git a/radio/src/targets/Horus/hal.h b/radio/src/targets/horus/hal.h similarity index 100% rename from radio/src/targets/Horus/hal.h rename to radio/src/targets/horus/hal.h diff --git a/radio/src/targets/Horus/haptic_driver.cpp b/radio/src/targets/horus/haptic_driver.cpp similarity index 100% rename from radio/src/targets/Horus/haptic_driver.cpp rename to radio/src/targets/horus/haptic_driver.cpp diff --git a/radio/src/targets/Horus/i2c_driver.cpp b/radio/src/targets/horus/i2c_driver.cpp similarity index 95% rename from radio/src/targets/Horus/i2c_driver.cpp rename to radio/src/targets/horus/i2c_driver.cpp index 4793fbc0c..ee2bb7d2b 100644 --- a/radio/src/targets/Horus/i2c_driver.cpp +++ b/radio/src/targets/horus/i2c_driver.cpp @@ -1,4 +1,4 @@ -#include "board_horus.h" +#include "../horus/board_horus.h" void i2cInit(void) { diff --git a/radio/src/targets/Horus/keys_driver.cpp b/radio/src/targets/horus/keys_driver.cpp similarity index 100% rename from radio/src/targets/Horus/keys_driver.cpp rename to radio/src/targets/horus/keys_driver.cpp diff --git a/radio/src/targets/Horus/lcd_driver.cpp b/radio/src/targets/horus/lcd_driver.cpp similarity index 100% rename from radio/src/targets/Horus/lcd_driver.cpp rename to radio/src/targets/horus/lcd_driver.cpp diff --git a/radio/src/targets/Horus/led_driver.cpp b/radio/src/targets/horus/led_driver.cpp similarity index 98% rename from radio/src/targets/Horus/led_driver.cpp rename to radio/src/targets/horus/led_driver.cpp index e3f1b9547..f50bcb4df 100644 --- a/radio/src/targets/Horus/led_driver.cpp +++ b/radio/src/targets/horus/led_driver.cpp @@ -34,7 +34,7 @@ * */ -#include "board_horus.h" +#include "../horus/board_horus.h" void ledInit() { diff --git a/radio/src/targets/Horus/pulses_driver.cpp b/radio/src/targets/horus/pulses_driver.cpp similarity index 100% rename from radio/src/targets/Horus/pulses_driver.cpp rename to radio/src/targets/horus/pulses_driver.cpp diff --git a/radio/src/targets/Horus/pwr_driver.c b/radio/src/targets/horus/pwr_driver.c similarity index 95% rename from radio/src/targets/Horus/pwr_driver.c rename to radio/src/targets/horus/pwr_driver.c index 2c63ef630..5479faeb3 100644 --- a/radio/src/targets/Horus/pwr_driver.c +++ b/radio/src/targets/horus/pwr_driver.c @@ -35,7 +35,7 @@ */ #include "../../pwr.h" -#include "board_horus.h" +#include "../horus/board_horus.h" extern volatile uint32_t g_tmr10ms; #define get_tmr10ms() g_tmr10ms diff --git a/radio/src/targets/Horus/sdio_sd.c b/radio/src/targets/horus/sdio_sd.c similarity index 96% rename from radio/src/targets/Horus/sdio_sd.c rename to radio/src/targets/horus/sdio_sd.c index 6a6a38df2..f11cacbfa 100644 --- a/radio/src/targets/Horus/sdio_sd.c +++ b/radio/src/targets/horus/sdio_sd.c @@ -227,7 +227,8 @@ */ /* Includes ------------------------------------------------------------------*/ -#include "sdio_sd.h" +#include "../horus/sdio_sd.h" + #include "../../debug.h" /** @addtogroup Utilities diff --git a/radio/src/targets/Horus/sdio_sd.h b/radio/src/targets/horus/sdio_sd.h similarity index 97% rename from radio/src/targets/Horus/sdio_sd.h rename to radio/src/targets/horus/sdio_sd.h index 8e69d25d4..e4c188aa2 100644 --- a/radio/src/targets/Horus/sdio_sd.h +++ b/radio/src/targets/horus/sdio_sd.h @@ -30,7 +30,7 @@ #ifndef __SDIO_SD_H #define __SDIO_SD_H -#include "board_horus.h" +#include "../horus/board_horus.h" #ifdef __cplusplus extern "C" { diff --git a/radio/src/targets/Horus/sdram_driver.c b/radio/src/targets/horus/sdram_driver.c similarity index 97% rename from radio/src/targets/Horus/sdram_driver.c rename to radio/src/targets/horus/sdram_driver.c index b9ddcc505..56ae1490c 100755 --- a/radio/src/targets/Horus/sdram_driver.c +++ b/radio/src/targets/horus/sdram_driver.c @@ -1,4 +1,4 @@ -#include "board_horus.h" +#include "../horus/board_horus.h" #define SDRAM_MEMORY_WIDTH FMC_SDMemory_Width_16b diff --git a/radio/src/targets/Horus/serial2_driver.cpp b/radio/src/targets/horus/serial2_driver.cpp similarity index 100% rename from radio/src/targets/Horus/serial2_driver.cpp rename to radio/src/targets/horus/serial2_driver.cpp diff --git a/radio/src/targets/Horus/stm32f4_flash.ld b/radio/src/targets/horus/stm32f4_flash.ld similarity index 100% rename from radio/src/targets/Horus/stm32f4_flash.ld rename to radio/src/targets/horus/stm32f4_flash.ld diff --git a/radio/src/targets/Horus/system_stm32f4xx.c b/radio/src/targets/horus/system_stm32f4xx.c similarity index 100% rename from radio/src/targets/Horus/system_stm32f4xx.c rename to radio/src/targets/horus/system_stm32f4xx.c diff --git a/radio/src/targets/Horus/telemetry_driver.cpp b/radio/src/targets/horus/telemetry_driver.cpp similarity index 100% rename from radio/src/targets/Horus/telemetry_driver.cpp rename to radio/src/targets/horus/telemetry_driver.cpp diff --git a/radio/src/targets/Horus/trainer_driver.cpp b/radio/src/targets/horus/trainer_driver.cpp similarity index 100% rename from radio/src/targets/Horus/trainer_driver.cpp rename to radio/src/targets/horus/trainer_driver.cpp diff --git a/radio/src/targets/Taranis/usb_bsp.c b/radio/src/targets/horus/usb_bsp.c similarity index 95% rename from radio/src/targets/Taranis/usb_bsp.c rename to radio/src/targets/horus/usb_bsp.c index 8d29546c1..c6a237dd1 100644 --- a/radio/src/targets/Taranis/usb_bsp.c +++ b/radio/src/targets/horus/usb_bsp.c @@ -30,8 +30,8 @@ #include "usb_bsp.h" -#include "board_taranis.h" -#include "usbd_conf.h" +#include "../horus/board_horus.h" +#include "../horus/usbd_conf.h" extern uint32_t SystemCoreClock; diff --git a/radio/src/targets/Horus/usb_conf.h b/radio/src/targets/horus/usb_conf.h similarity index 100% rename from radio/src/targets/Horus/usb_conf.h rename to radio/src/targets/horus/usb_conf.h diff --git a/radio/src/targets/Horus/usb_driver.c b/radio/src/targets/horus/usb_driver.c similarity index 98% rename from radio/src/targets/Horus/usb_driver.c rename to radio/src/targets/horus/usb_driver.c index 71aaf8fb6..184754421 100644 --- a/radio/src/targets/Horus/usb_driver.c +++ b/radio/src/targets/horus/usb_driver.c @@ -34,7 +34,7 @@ * */ -#include "board_horus.h" +#include "../horus/board_horus.h" #include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h" int usbPlugged(void) diff --git a/radio/src/targets/Taranis/usbd_cdc.cpp b/radio/src/targets/horus/usbd_cdc.cpp similarity index 96% rename from radio/src/targets/Taranis/usbd_cdc.cpp rename to radio/src/targets/horus/usbd_cdc.cpp index 7b1a44634..d3c3f1d40 100644 --- a/radio/src/targets/Taranis/usbd_cdc.cpp +++ b/radio/src/targets/horus/usbd_cdc.cpp @@ -34,7 +34,7 @@ extern "C" { /* Includes ------------------------------------------------------------------*/ -#include "usb_conf.h" +#include "../horus/usb_conf.h" /* Private typedef -----------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/ diff --git a/radio/src/targets/Taranis/usbd_conf.h b/radio/src/targets/horus/usbd_conf.h similarity index 96% rename from radio/src/targets/Taranis/usbd_conf.h rename to radio/src/targets/horus/usbd_conf.h index 557973a26..909919e41 100644 --- a/radio/src/targets/Taranis/usbd_conf.h +++ b/radio/src/targets/horus/usbd_conf.h @@ -30,7 +30,7 @@ #define __USBD_CONF__H__ /* Includes ------------------------------------------------------------------*/ -#include "usb_conf.h" +#include "../horus/usb_conf.h" #define USBD_CFG_MAX_NUM 1 #define USBD_ITF_MAX_NUM 1 diff --git a/radio/src/targets/Horus/usbd_desc.c b/radio/src/targets/horus/usbd_desc.c similarity index 95% rename from radio/src/targets/Horus/usbd_desc.c rename to radio/src/targets/horus/usbd_desc.c index 63187d67b..d71600eef 100644 --- a/radio/src/targets/Horus/usbd_desc.c +++ b/radio/src/targets/horus/usbd_desc.c @@ -26,13 +26,15 @@ */ /* Includes ------------------------------------------------------------------*/ +#include "../horus/usbd_desc.h" + #include + +#include "../horus/board_horus.h" +#include "../horus/usbd_conf.h" #include "usbd_core.h" -#include "usbd_desc.h" #include "usbd_req.h" -#include "usbd_conf.h" #include "usb_regs.h" -#include "board_horus.h" /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY * @{ diff --git a/radio/src/targets/Horus/usbd_desc.h b/radio/src/targets/horus/usbd_desc.h similarity index 100% rename from radio/src/targets/Horus/usbd_desc.h rename to radio/src/targets/horus/usbd_desc.h diff --git a/radio/src/targets/Horus/usbd_desc.h~origin_next b/radio/src/targets/horus/usbd_desc.h~origin_next similarity index 100% rename from radio/src/targets/Horus/usbd_desc.h~origin_next rename to radio/src/targets/horus/usbd_desc.h~origin_next diff --git a/radio/src/targets/Taranis/usbd_hid_joystick.c b/radio/src/targets/horus/usbd_hid_joystick.c similarity index 96% rename from radio/src/targets/Taranis/usbd_hid_joystick.c rename to radio/src/targets/horus/usbd_hid_joystick.c index 33a6c3d85..6e7fc7b6e 100644 --- a/radio/src/targets/Taranis/usbd_hid_joystick.c +++ b/radio/src/targets/horus/usbd_hid_joystick.c @@ -47,9 +47,9 @@ */ /* Includes ------------------------------------------------------------------*/ +#include "../horus/usbd_desc.h" #include "usbd_hid_core.h" #include "usbd_req.h" -#include "usbd_desc.h" /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY * @{ diff --git a/radio/src/targets/Horus/usbd_storage_msd.cpp b/radio/src/targets/horus/usbd_storage_msd.cpp similarity index 94% rename from radio/src/targets/Horus/usbd_storage_msd.cpp rename to radio/src/targets/horus/usbd_storage_msd.cpp index fd3fbcd98..b81b62fbe 100644 --- a/radio/src/targets/Horus/usbd_storage_msd.cpp +++ b/radio/src/targets/horus/usbd_storage_msd.cpp @@ -28,15 +28,15 @@ /* Includes ------------------------------------------------------------------*/ #include "../../opentx.h" #include "../../thirdparty/FatFs/diskio.h" -#include "sdio_sd.h" -#include "board_horus.h" +#include "../horus/board_horus.h" +#include "../horus/sdio_sd.h" #if defined(__cplusplus) && !defined(SIMU) extern "C" { #endif #include "usbd_msc_mem.h" -#include "usb_conf.h" +#include "../horus/usb_conf.h" /* SD card only when not running bootloader */ #define STORAGE_LUN_NBR 1 diff --git a/radio/src/targets/Horus/usbd_usr.cpp b/radio/src/targets/horus/usbd_usr.cpp similarity index 100% rename from radio/src/targets/Horus/usbd_usr.cpp rename to radio/src/targets/horus/usbd_usr.cpp diff --git a/radio/src/targets/Mega2560/00readme.txt b/radio/src/targets/mega2560/00readme.txt similarity index 100% rename from radio/src/targets/Mega2560/00readme.txt rename to radio/src/targets/mega2560/00readme.txt diff --git a/radio/src/targets/Mega2560/board_mega2560.cpp b/radio/src/targets/mega2560/board_mega2560.cpp similarity index 100% rename from radio/src/targets/Mega2560/board_mega2560.cpp rename to radio/src/targets/mega2560/board_mega2560.cpp diff --git a/radio/src/targets/Mega2560/board_mega2560.h b/radio/src/targets/mega2560/board_mega2560.h similarity index 100% rename from radio/src/targets/Mega2560/board_mega2560.h rename to radio/src/targets/mega2560/board_mega2560.h diff --git a/radio/src/targets/Sky9x/AT91SAM3S2.h b/radio/src/targets/sky9x/AT91SAM3S2.h similarity index 100% rename from radio/src/targets/Sky9x/AT91SAM3S2.h rename to radio/src/targets/sky9x/AT91SAM3S2.h diff --git a/radio/src/targets/Sky9x/AT91SAM3S4.h b/radio/src/targets/sky9x/AT91SAM3S4.h similarity index 100% rename from radio/src/targets/Sky9x/AT91SAM3S4.h rename to radio/src/targets/sky9x/AT91SAM3S4.h diff --git a/radio/src/targets/Sky9x/MEDSdcard.c b/radio/src/targets/sky9x/MEDSdcard.c similarity index 96% rename from radio/src/targets/Sky9x/MEDSdcard.c rename to radio/src/targets/sky9x/MEDSdcard.c index de334dafe..174475281 100644 --- a/radio/src/targets/Sky9x/MEDSdcard.c +++ b/radio/src/targets/sky9x/MEDSdcard.c @@ -34,8 +34,8 @@ #include #include "debug.h" #include "../FatFs/diskio.h" -#include "../Sky9x/board.h" -#include "../Sky9x/Media.h" +#include "board.h" +#include "Media.h" //------------------------------------------------------------------------------ // Constants diff --git a/radio/src/targets/Sky9x/Media.h b/radio/src/targets/sky9x/Media.h similarity index 100% rename from radio/src/targets/Sky9x/Media.h rename to radio/src/targets/sky9x/Media.h diff --git a/radio/src/targets/Sky9x/adc_driver.cpp b/radio/src/targets/sky9x/adc_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/adc_driver.cpp rename to radio/src/targets/sky9x/adc_driver.cpp diff --git a/radio/src/targets/Sky9x/audio_driver.cpp b/radio/src/targets/sky9x/audio_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/audio_driver.cpp rename to radio/src/targets/sky9x/audio_driver.cpp diff --git a/radio/src/targets/Sky9x/audio_driver.h b/radio/src/targets/sky9x/audio_driver.h similarity index 92% rename from radio/src/targets/Sky9x/audio_driver.h rename to radio/src/targets/sky9x/audio_driver.h index f37f6eb58..18b50a883 100644 --- a/radio/src/targets/Sky9x/audio_driver.h +++ b/radio/src/targets/sky9x/audio_driver.h @@ -34,8 +34,8 @@ * */ -#ifndef audio_driver_h -#define audio_driver_h +#ifndef _AUDIO_DRIVER_H_ +#define _AUDIO_DRIVER_H_ void audioInit( void ) ; void audioEnd( void ) ; @@ -59,4 +59,4 @@ extern const int8_t volumeScale[]; void setVolume(uint8_t volume); -#endif +#endif // _AUDIO_DRIVER_H_ diff --git a/radio/src/targets/Sky9x/bluetooth.cpp b/radio/src/targets/sky9x/bluetooth.cpp similarity index 100% rename from radio/src/targets/Sky9x/bluetooth.cpp rename to radio/src/targets/sky9x/bluetooth.cpp diff --git a/radio/src/targets/Sky9x/board.h b/radio/src/targets/sky9x/board.h similarity index 96% rename from radio/src/targets/Sky9x/board.h rename to radio/src/targets/sky9x/board.h index 366684fd2..a07c40755 100644 --- a/radio/src/targets/Sky9x/board.h +++ b/radio/src/targets/sky9x/board.h @@ -41,16 +41,16 @@ #include -#include "../Sky9x/chip.h" +#include "chip.h" #if defined(REVA) -#include "../Sky9x/AT91SAM3S2.h" +#include "AT91SAM3S2.h" #else -#include "../Sky9x/AT91SAM3S4.h" +#include "AT91SAM3S4.h" #endif #if !defined(SIMU) -#include "../Sky9x/core_cm3.h" +#include "core_cm3.h" #endif //------------------------------------------------------------------------------ diff --git a/radio/src/targets/Sky9x/board_lowlevel.c b/radio/src/targets/sky9x/board_lowlevel.c similarity index 96% rename from radio/src/targets/Sky9x/board_lowlevel.c rename to radio/src/targets/sky9x/board_lowlevel.c index 9e72d975f..49d3a1b53 100644 --- a/radio/src/targets/Sky9x/board_lowlevel.c +++ b/radio/src/targets/sky9x/board_lowlevel.c @@ -39,7 +39,7 @@ * Headers *----------------------------------------------------------------------------*/ -#include "../Sky9x/board.h" +#include "board.h" /*---------------------------------------------------------------------------- * Local definitions diff --git a/radio/src/targets/Sky9x/board_sky9x.cpp b/radio/src/targets/sky9x/board_sky9x.cpp similarity index 100% rename from radio/src/targets/Sky9x/board_sky9x.cpp rename to radio/src/targets/sky9x/board_sky9x.cpp diff --git a/radio/src/targets/Sky9x/board_sky9x.h b/radio/src/targets/sky9x/board_sky9x.h similarity index 100% rename from radio/src/targets/Sky9x/board_sky9x.h rename to radio/src/targets/sky9x/board_sky9x.h diff --git a/radio/src/targets/Sky9x/buzzer_driver.cpp b/radio/src/targets/sky9x/buzzer_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/buzzer_driver.cpp rename to radio/src/targets/sky9x/buzzer_driver.cpp diff --git a/radio/src/targets/Sky9x/chip.h b/radio/src/targets/sky9x/chip.h similarity index 100% rename from radio/src/targets/Sky9x/chip.h rename to radio/src/targets/sky9x/chip.h diff --git a/radio/src/targets/Sky9x/coproc_driver.cpp b/radio/src/targets/sky9x/coproc_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/coproc_driver.cpp rename to radio/src/targets/sky9x/coproc_driver.cpp diff --git a/radio/src/targets/Sky9x/core_cm3.c b/radio/src/targets/sky9x/core_cm3.c similarity index 100% rename from radio/src/targets/Sky9x/core_cm3.c rename to radio/src/targets/sky9x/core_cm3.c diff --git a/radio/src/targets/Sky9x/core_cm3.h b/radio/src/targets/sky9x/core_cm3.h similarity index 100% rename from radio/src/targets/Sky9x/core_cm3.h rename to radio/src/targets/sky9x/core_cm3.h diff --git a/radio/src/targets/Sky9x/crt.c b/radio/src/targets/sky9x/crt.c similarity index 100% rename from radio/src/targets/Sky9x/crt.c rename to radio/src/targets/sky9x/crt.c diff --git a/radio/src/targets/Sky9x/diskio.cpp b/radio/src/targets/sky9x/diskio.cpp similarity index 96% rename from radio/src/targets/Sky9x/diskio.cpp rename to radio/src/targets/sky9x/diskio.cpp index 6fad7d309..6d697e6f9 100644 --- a/radio/src/targets/Sky9x/diskio.cpp +++ b/radio/src/targets/sky9x/diskio.cpp @@ -46,7 +46,7 @@ #include "../FatFs/diskio.h" #include "../FatFs/ff.h" #include "../CoOS/kernel/CoOS.h" -#include "../Sky9x/board.h" +#include "board.h" #define CARD_TYPE_bmHC (1 << 0) /**< Bit for High-Capacity(Density) */ #define CARD_TYPE_bmSDMMC (0x3 << 1) /**< Bits mask for SD/MMC */ diff --git a/radio/src/targets/Sky9x/eeprom_driver.cpp b/radio/src/targets/sky9x/eeprom_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/eeprom_driver.cpp rename to radio/src/targets/sky9x/eeprom_driver.cpp diff --git a/radio/src/targets/Sky9x/flash_driver.cpp b/radio/src/targets/sky9x/flash_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/flash_driver.cpp rename to radio/src/targets/sky9x/flash_driver.cpp diff --git a/radio/src/targets/Sky9x/haptic_driver.cpp b/radio/src/targets/sky9x/haptic_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/haptic_driver.cpp rename to radio/src/targets/sky9x/haptic_driver.cpp diff --git a/radio/src/targets/Sky9x/keys_driver.cpp b/radio/src/targets/sky9x/keys_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/keys_driver.cpp rename to radio/src/targets/sky9x/keys_driver.cpp diff --git a/radio/src/targets/Sky9x/lcd_driver.cpp b/radio/src/targets/sky9x/lcd_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/lcd_driver.cpp rename to radio/src/targets/sky9x/lcd_driver.cpp diff --git a/radio/src/targets/Sky9x/massstorage.cpp b/radio/src/targets/sky9x/massstorage.cpp similarity index 94% rename from radio/src/targets/Sky9x/massstorage.cpp rename to radio/src/targets/sky9x/massstorage.cpp index 9fa6ea3d3..39a0fbd5f 100644 --- a/radio/src/targets/Sky9x/massstorage.cpp +++ b/radio/src/targets/sky9x/massstorage.cpp @@ -39,7 +39,7 @@ #ifndef SIMU extern "C" { -#include "../Sky9x/usb/device/massstorage/MSDDriver.h" +#include "usb/device/massstorage/MSDDriver.h" extern unsigned char MEDSdcard_Initialize(Media *media, unsigned char mciID); } diff --git a/radio/src/targets/Sky9x/pulses_driver.cpp b/radio/src/targets/sky9x/pulses_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/pulses_driver.cpp rename to radio/src/targets/sky9x/pulses_driver.cpp diff --git a/radio/src/targets/Sky9x/pwr_driver.cpp b/radio/src/targets/sky9x/pwr_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/pwr_driver.cpp rename to radio/src/targets/sky9x/pwr_driver.cpp diff --git a/radio/src/targets/Sky9x/rotenc_driver.cpp b/radio/src/targets/sky9x/rotenc_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/rotenc_driver.cpp rename to radio/src/targets/sky9x/rotenc_driver.cpp diff --git a/radio/src/targets/Sky9x/rtc_driver.cpp b/radio/src/targets/sky9x/rtc_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/rtc_driver.cpp rename to radio/src/targets/sky9x/rtc_driver.cpp diff --git a/radio/src/targets/Sky9x/sam3s2c_flash.ld b/radio/src/targets/sky9x/sam3s2c_flash.ld similarity index 100% rename from radio/src/targets/Sky9x/sam3s2c_flash.ld rename to radio/src/targets/sky9x/sam3s2c_flash.ld diff --git a/radio/src/targets/Sky9x/sam3s4c_flash.ld b/radio/src/targets/sky9x/sam3s4c_flash.ld similarity index 100% rename from radio/src/targets/Sky9x/sam3s4c_flash.ld rename to radio/src/targets/sky9x/sam3s4c_flash.ld diff --git a/radio/src/targets/Sky9x/sam3s8c_flash.ld b/radio/src/targets/sky9x/sam3s8c_flash.ld similarity index 100% rename from radio/src/targets/Sky9x/sam3s8c_flash.ld rename to radio/src/targets/sky9x/sam3s8c_flash.ld diff --git a/radio/src/targets/Sky9x/sdcard_driver.cpp b/radio/src/targets/sky9x/sdcard_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/sdcard_driver.cpp rename to radio/src/targets/sky9x/sdcard_driver.cpp diff --git a/radio/src/targets/Sky9x/serial2_driver.cpp b/radio/src/targets/sky9x/serial2_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/serial2_driver.cpp rename to radio/src/targets/sky9x/serial2_driver.cpp diff --git a/radio/src/targets/Sky9x/telemetry_driver.cpp b/radio/src/targets/sky9x/telemetry_driver.cpp similarity index 100% rename from radio/src/targets/Sky9x/telemetry_driver.cpp rename to radio/src/targets/sky9x/telemetry_driver.cpp diff --git a/radio/src/targets/Sky9x/usb/common/core/USBConfigurationDescriptor.c b/radio/src/targets/sky9x/usb/common/core/USBConfigurationDescriptor.c similarity index 96% rename from radio/src/targets/Sky9x/usb/common/core/USBConfigurationDescriptor.c rename to radio/src/targets/sky9x/usb/common/core/USBConfigurationDescriptor.c index b41c06be6..91f6d4116 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBConfigurationDescriptor.c +++ b/radio/src/targets/sky9x/usb/common/core/USBConfigurationDescriptor.c @@ -38,7 +38,7 @@ // Headers //----------------------------------------------------------------------------- -#include "../../../../Sky9x/usb/common/core/USBConfigurationDescriptor.h" +#include "../../../usb/common/core/USBConfigurationDescriptor.h" //----------------------------------------------------------------------------- // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBConfigurationDescriptor.h b/radio/src/targets/sky9x/usb/common/core/USBConfigurationDescriptor.h similarity index 94% rename from radio/src/targets/Sky9x/usb/common/core/USBConfigurationDescriptor.h rename to radio/src/targets/sky9x/usb/common/core/USBConfigurationDescriptor.h index 8d10b7d8d..ba9006b04 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBConfigurationDescriptor.h +++ b/radio/src/targets/sky9x/usb/common/core/USBConfigurationDescriptor.h @@ -54,9 +54,9 @@ // Headers //----------------------------------------------------------------------------- -#include "../../../../Sky9x/usb/common/core/USBEndpointDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBGenericDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBInterfaceDescriptor.h" +#include "../../../usb/common/core/USBEndpointDescriptor.h" +#include "../../../usb/common/core/USBGenericDescriptor.h" +#include "../../../usb/common/core/USBInterfaceDescriptor.h" //----------------------------------------------------------------------------- // Definitions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBDeviceDescriptor.h b/radio/src/targets/sky9x/usb/common/core/USBDeviceDescriptor.h similarity index 96% rename from radio/src/targets/Sky9x/usb/common/core/USBDeviceDescriptor.h rename to radio/src/targets/sky9x/usb/common/core/USBDeviceDescriptor.h index f526e9c47..68e27d901 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBDeviceDescriptor.h +++ b/radio/src/targets/sky9x/usb/common/core/USBDeviceDescriptor.h @@ -42,7 +42,7 @@ #ifndef USBDEVICEDESCRIPTOR_H #define USBDEVICEDESCRIPTOR_H -#include "../../../../Sky9x/board.h" +#include "../../../board.h" //------------------------------------------------------------------------------ // Definitions //------------------------------------------------------------------------------ diff --git a/radio/src/targets/Sky9x/usb/common/core/USBDeviceQualifierDescriptor.h b/radio/src/targets/sky9x/usb/common/core/USBDeviceQualifierDescriptor.h similarity index 100% rename from radio/src/targets/Sky9x/usb/common/core/USBDeviceQualifierDescriptor.h rename to radio/src/targets/sky9x/usb/common/core/USBDeviceQualifierDescriptor.h diff --git a/radio/src/targets/Sky9x/usb/common/core/USBEndpointDescriptor.c b/radio/src/targets/sky9x/usb/common/core/USBEndpointDescriptor.c similarity index 96% rename from radio/src/targets/Sky9x/usb/common/core/USBEndpointDescriptor.c rename to radio/src/targets/sky9x/usb/common/core/USBEndpointDescriptor.c index aa3ac0220..5cae1bc5c 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBEndpointDescriptor.c +++ b/radio/src/targets/sky9x/usb/common/core/USBEndpointDescriptor.c @@ -38,7 +38,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBEndpointDescriptor.h" +#include "../../../usb/common/core/USBEndpointDescriptor.h" //------------------------------------------------------------------------------ // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBEndpointDescriptor.h b/radio/src/targets/sky9x/usb/common/core/USBEndpointDescriptor.h similarity index 100% rename from radio/src/targets/Sky9x/usb/common/core/USBEndpointDescriptor.h rename to radio/src/targets/sky9x/usb/common/core/USBEndpointDescriptor.h diff --git a/radio/src/targets/Sky9x/usb/common/core/USBFeatureRequest.c b/radio/src/targets/sky9x/usb/common/core/USBFeatureRequest.c similarity index 95% rename from radio/src/targets/Sky9x/usb/common/core/USBFeatureRequest.c rename to radio/src/targets/sky9x/usb/common/core/USBFeatureRequest.c index d4793f2fb..ec2ea8ae1 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBFeatureRequest.c +++ b/radio/src/targets/sky9x/usb/common/core/USBFeatureRequest.c @@ -38,7 +38,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBFeatureRequest.h" +#include "../../../usb/common/core/USBFeatureRequest.h" //------------------------------------------------------------------------------ // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBFeatureRequest.h b/radio/src/targets/sky9x/usb/common/core/USBFeatureRequest.h similarity index 96% rename from radio/src/targets/Sky9x/usb/common/core/USBFeatureRequest.h rename to radio/src/targets/sky9x/usb/common/core/USBFeatureRequest.h index a917bb148..4c1f3640e 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBFeatureRequest.h +++ b/radio/src/targets/sky9x/usb/common/core/USBFeatureRequest.h @@ -50,7 +50,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h" +#include "../../../usb/common/core/USBGenericRequest.h" //------------------------------------------------------------------------------ // Definitions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBGenericDescriptor.c b/radio/src/targets/sky9x/usb/common/core/USBGenericDescriptor.c similarity index 95% rename from radio/src/targets/Sky9x/usb/common/core/USBGenericDescriptor.c rename to radio/src/targets/sky9x/usb/common/core/USBGenericDescriptor.c index 3c13044be..e22a1d4cc 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBGenericDescriptor.c +++ b/radio/src/targets/sky9x/usb/common/core/USBGenericDescriptor.c @@ -38,7 +38,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBGenericDescriptor.h" +#include "../../../usb/common/core/USBGenericDescriptor.h" //------------------------------------------------------------------------------ // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBGenericDescriptor.h b/radio/src/targets/sky9x/usb/common/core/USBGenericDescriptor.h similarity index 100% rename from radio/src/targets/Sky9x/usb/common/core/USBGenericDescriptor.h rename to radio/src/targets/sky9x/usb/common/core/USBGenericDescriptor.h diff --git a/radio/src/targets/Sky9x/usb/common/core/USBGenericRequest.c b/radio/src/targets/sky9x/usb/common/core/USBGenericRequest.c similarity index 96% rename from radio/src/targets/Sky9x/usb/common/core/USBGenericRequest.c rename to radio/src/targets/sky9x/usb/common/core/USBGenericRequest.c index 893bd1caa..dfc47227a 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBGenericRequest.c +++ b/radio/src/targets/sky9x/usb/common/core/USBGenericRequest.c @@ -38,7 +38,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h" +#include "../../../usb/common/core/USBGenericRequest.h" //------------------------------------------------------------------------------ // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBGenericRequest.h b/radio/src/targets/sky9x/usb/common/core/USBGenericRequest.h similarity index 100% rename from radio/src/targets/Sky9x/usb/common/core/USBGenericRequest.h rename to radio/src/targets/sky9x/usb/common/core/USBGenericRequest.h diff --git a/radio/src/targets/Sky9x/usb/common/core/USBGetDescriptorRequest.c b/radio/src/targets/sky9x/usb/common/core/USBGetDescriptorRequest.c similarity index 95% rename from radio/src/targets/Sky9x/usb/common/core/USBGetDescriptorRequest.c rename to radio/src/targets/sky9x/usb/common/core/USBGetDescriptorRequest.c index 9822d2ee0..a4022f2b5 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBGetDescriptorRequest.c +++ b/radio/src/targets/sky9x/usb/common/core/USBGetDescriptorRequest.c @@ -38,7 +38,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBGetDescriptorRequest.h" +#include "../../../usb/common/core/USBGetDescriptorRequest.h" //------------------------------------------------------------------------------ // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBGetDescriptorRequest.h b/radio/src/targets/sky9x/usb/common/core/USBGetDescriptorRequest.h similarity index 95% rename from radio/src/targets/Sky9x/usb/common/core/USBGetDescriptorRequest.h rename to radio/src/targets/sky9x/usb/common/core/USBGetDescriptorRequest.h index 75e440860..1f56ceb71 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBGetDescriptorRequest.h +++ b/radio/src/targets/sky9x/usb/common/core/USBGetDescriptorRequest.h @@ -51,7 +51,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h" +#include "../../../usb/common/core/USBGenericRequest.h" //------------------------------------------------------------------------------ // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBInterfaceAssociationDescriptor.h b/radio/src/targets/sky9x/usb/common/core/USBInterfaceAssociationDescriptor.h similarity index 100% rename from radio/src/targets/Sky9x/usb/common/core/USBInterfaceAssociationDescriptor.h rename to radio/src/targets/sky9x/usb/common/core/USBInterfaceAssociationDescriptor.h diff --git a/radio/src/targets/Sky9x/usb/common/core/USBInterfaceDescriptor.h b/radio/src/targets/sky9x/usb/common/core/USBInterfaceDescriptor.h similarity index 100% rename from radio/src/targets/Sky9x/usb/common/core/USBInterfaceDescriptor.h rename to radio/src/targets/sky9x/usb/common/core/USBInterfaceDescriptor.h diff --git a/radio/src/targets/Sky9x/usb/common/core/USBInterfaceRequest.c b/radio/src/targets/sky9x/usb/common/core/USBInterfaceRequest.c similarity index 95% rename from radio/src/targets/Sky9x/usb/common/core/USBInterfaceRequest.c rename to radio/src/targets/sky9x/usb/common/core/USBInterfaceRequest.c index 4d896256e..00a95f43e 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBInterfaceRequest.c +++ b/radio/src/targets/sky9x/usb/common/core/USBInterfaceRequest.c @@ -38,7 +38,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBInterfaceRequest.h" +#include "../../../usb/common/core/USBInterfaceRequest.h" //------------------------------------------------------------------------------ // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBInterfaceRequest.h b/radio/src/targets/sky9x/usb/common/core/USBInterfaceRequest.h similarity index 95% rename from radio/src/targets/Sky9x/usb/common/core/USBInterfaceRequest.h rename to radio/src/targets/sky9x/usb/common/core/USBInterfaceRequest.h index 71c2aa2bf..cfd97a683 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBInterfaceRequest.h +++ b/radio/src/targets/sky9x/usb/common/core/USBInterfaceRequest.h @@ -51,7 +51,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h" +#include "../../../usb/common/core/USBGenericRequest.h" //------------------------------------------------------------------------------ // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBIrqHandler.c b/radio/src/targets/sky9x/usb/common/core/USBIrqHandler.c similarity index 94% rename from radio/src/targets/Sky9x/usb/common/core/USBIrqHandler.c rename to radio/src/targets/sky9x/usb/common/core/USBIrqHandler.c index bc4634b89..c0a61bf3b 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBIrqHandler.c +++ b/radio/src/targets/sky9x/usb/common/core/USBIrqHandler.c @@ -38,8 +38,9 @@ // Headers //------------------------------------------------------------------------------ #include -#include "../../../../Sky9x/board.h" -#include "../../../../Sky9x/usb/device/core/USBD.h" + +#include "../../../board.h" +#include "../../../usb/device/core/USBD.h" //------------------------------------------------------------------------------ // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBIrqHandler.h b/radio/src/targets/sky9x/usb/common/core/USBIrqHandler.h similarity index 100% rename from radio/src/targets/Sky9x/usb/common/core/USBIrqHandler.h rename to radio/src/targets/sky9x/usb/common/core/USBIrqHandler.h diff --git a/radio/src/targets/Sky9x/usb/common/core/USBSetAddressRequest.c b/radio/src/targets/sky9x/usb/common/core/USBSetAddressRequest.c similarity index 95% rename from radio/src/targets/Sky9x/usb/common/core/USBSetAddressRequest.c rename to radio/src/targets/sky9x/usb/common/core/USBSetAddressRequest.c index e8cb01e1c..643560e00 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBSetAddressRequest.c +++ b/radio/src/targets/sky9x/usb/common/core/USBSetAddressRequest.c @@ -38,7 +38,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBSetAddressRequest.h" +#include "../../../usb/common/core/USBSetAddressRequest.h" //------------------------------------------------------------------------------ // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBSetAddressRequest.h b/radio/src/targets/sky9x/usb/common/core/USBSetAddressRequest.h similarity index 94% rename from radio/src/targets/Sky9x/usb/common/core/USBSetAddressRequest.h rename to radio/src/targets/sky9x/usb/common/core/USBSetAddressRequest.h index 2ca7947d2..2f8e2ed2b 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBSetAddressRequest.h +++ b/radio/src/targets/sky9x/usb/common/core/USBSetAddressRequest.h @@ -47,7 +47,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h" +#include "../../../usb/common/core/USBGenericRequest.h" //------------------------------------------------------------------------------ // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBSetConfigurationRequest.c b/radio/src/targets/sky9x/usb/common/core/USBSetConfigurationRequest.c similarity index 95% rename from radio/src/targets/Sky9x/usb/common/core/USBSetConfigurationRequest.c rename to radio/src/targets/sky9x/usb/common/core/USBSetConfigurationRequest.c index cf4b27d9c..be8756142 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBSetConfigurationRequest.c +++ b/radio/src/targets/sky9x/usb/common/core/USBSetConfigurationRequest.c @@ -38,7 +38,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBSetConfigurationRequest.h" +#include "../../../usb/common/core/USBSetConfigurationRequest.h" //------------------------------------------------------------------------------ // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBSetConfigurationRequest.h b/radio/src/targets/sky9x/usb/common/core/USBSetConfigurationRequest.h similarity index 95% rename from radio/src/targets/Sky9x/usb/common/core/USBSetConfigurationRequest.h rename to radio/src/targets/sky9x/usb/common/core/USBSetConfigurationRequest.h index 73b34b21e..784d1cfb7 100644 --- a/radio/src/targets/Sky9x/usb/common/core/USBSetConfigurationRequest.h +++ b/radio/src/targets/sky9x/usb/common/core/USBSetConfigurationRequest.h @@ -48,7 +48,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h" +#include "../../../usb/common/core/USBGenericRequest.h" //------------------------------------------------------------------------------ // Exported functions diff --git a/radio/src/targets/Sky9x/usb/common/core/USBStringDescriptor.h b/radio/src/targets/sky9x/usb/common/core/USBStringDescriptor.h similarity index 100% rename from radio/src/targets/Sky9x/usb/common/core/USBStringDescriptor.h rename to radio/src/targets/sky9x/usb/common/core/USBStringDescriptor.h diff --git a/radio/src/targets/Sky9x/usb/common/massstorage/MSDeviceDescriptor.h b/radio/src/targets/sky9x/usb/common/massstorage/MSDeviceDescriptor.h similarity index 100% rename from radio/src/targets/Sky9x/usb/common/massstorage/MSDeviceDescriptor.h rename to radio/src/targets/sky9x/usb/common/massstorage/MSDeviceDescriptor.h diff --git a/radio/src/targets/Sky9x/usb/common/massstorage/MSInterfaceDescriptor.h b/radio/src/targets/sky9x/usb/common/massstorage/MSInterfaceDescriptor.h similarity index 100% rename from radio/src/targets/Sky9x/usb/common/massstorage/MSInterfaceDescriptor.h rename to radio/src/targets/sky9x/usb/common/massstorage/MSInterfaceDescriptor.h diff --git a/radio/src/targets/Sky9x/usb/device/core/USBD.h b/radio/src/targets/sky9x/usb/device/core/USBD.h similarity index 96% rename from radio/src/targets/Sky9x/usb/device/core/USBD.h rename to radio/src/targets/sky9x/usb/device/core/USBD.h index f466a9c38..a2fa898a8 100644 --- a/radio/src/targets/Sky9x/usb/device/core/USBD.h +++ b/radio/src/targets/sky9x/usb/device/core/USBD.h @@ -50,8 +50,8 @@ //------------------------------------------------------------------------------ // #include -#include "../../../../Sky9x/usb/common/core/USBEndpointDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h" +#include "../../../usb/common/core/USBEndpointDescriptor.h" +#include "../../../usb/common/core/USBGenericRequest.h" //------------------------------------------------------------------------------ // Compile Options diff --git a/radio/src/targets/Sky9x/usb/device/core/USBDDriver.c b/radio/src/targets/sky9x/usb/device/core/USBDDriver.c similarity index 94% rename from radio/src/targets/Sky9x/usb/device/core/USBDDriver.c rename to radio/src/targets/sky9x/usb/device/core/USBDDriver.c index e456b5efd..f510d700f 100644 --- a/radio/src/targets/Sky9x/usb/device/core/USBDDriver.c +++ b/radio/src/targets/sky9x/usb/device/core/USBDDriver.c @@ -31,22 +31,23 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/device/core/USBDDriver.h" +#include "../../../usb/device/core/USBDDriver.h" #include "debug.h" #include -#include "../../../../Sky9x/board.h" -#include "../../../../Sky9x/usb/common/core/USBConfigurationDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBDeviceDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBDeviceQualifierDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBEndpointDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBFeatureRequest.h" -#include "../../../../Sky9x/usb/common/core/USBGenericDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBGetDescriptorRequest.h" -#include "../../../../Sky9x/usb/common/core/USBInterfaceRequest.h" -#include "../../../../Sky9x/usb/common/core/USBSetAddressRequest.h" -#include "../../../../Sky9x/usb/common/core/USBSetConfigurationRequest.h" -#include "../../../../Sky9x/usb/device/core/USBD.h" + +#include "../../../usb/common/core/USBFeatureRequest.h" +#include "../../../usb/common/core/USBGetDescriptorRequest.h" +#include "../../../usb/common/core/USBInterfaceRequest.h" +#include "../../../usb/common/core/USBSetAddressRequest.h" +#include "../../../usb/common/core/USBSetConfigurationRequest.h" +#include "../../../usb/device/core/USBD.h" +#include "../../../board.h" +#include "../../../usb/common/core/USBConfigurationDescriptor.h" +#include "../../../usb/common/core/USBDeviceDescriptor.h" +#include "../../../usb/common/core/USBDeviceQualifierDescriptor.h" +#include "../../../usb/common/core/USBEndpointDescriptor.h" +#include "../../../usb/common/core/USBGenericDescriptor.h" //------------------------------------------------------------------------------ // Local functions diff --git a/radio/src/targets/Sky9x/usb/device/core/USBDDriver.h b/radio/src/targets/sky9x/usb/device/core/USBDDriver.h similarity index 94% rename from radio/src/targets/Sky9x/usb/device/core/USBDDriver.h rename to radio/src/targets/sky9x/usb/device/core/USBDDriver.h index eef7a6e44..c16364cbb 100644 --- a/radio/src/targets/Sky9x/usb/device/core/USBDDriver.h +++ b/radio/src/targets/sky9x/usb/device/core/USBDDriver.h @@ -50,8 +50,8 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h" -#include "../../../../Sky9x/usb/device/core/USBDDriverDescriptors.h" +#include "../../../usb/common/core/USBGenericRequest.h" +#include "../../../usb/device/core/USBDDriverDescriptors.h" //------------------------------------------------------------------------------ // Types diff --git a/radio/src/targets/Sky9x/usb/device/core/USBDDriverDescriptors.h b/radio/src/targets/sky9x/usb/device/core/USBDDriverDescriptors.h similarity index 92% rename from radio/src/targets/Sky9x/usb/device/core/USBDDriverDescriptors.h rename to radio/src/targets/sky9x/usb/device/core/USBDDriverDescriptors.h index 50416c162..aca698216 100644 --- a/radio/src/targets/Sky9x/usb/device/core/USBDDriverDescriptors.h +++ b/radio/src/targets/sky9x/usb/device/core/USBDDriverDescriptors.h @@ -43,9 +43,9 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/common/core/USBConfigurationDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBDeviceDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBDeviceQualifierDescriptor.h" +#include "../../../usb/common/core/USBConfigurationDescriptor.h" +#include "../../../usb/common/core/USBDeviceDescriptor.h" +#include "../../../usb/common/core/USBDeviceQualifierDescriptor.h" //------------------------------------------------------------------------------ // Types diff --git a/radio/src/targets/Sky9x/usb/device/core/USBD_UDP.c b/radio/src/targets/sky9x/usb/device/core/USBD_UDP.c similarity index 96% rename from radio/src/targets/Sky9x/usb/device/core/USBD_UDP.c rename to radio/src/targets/sky9x/usb/device/core/USBD_UDP.c index fba624a43..80794ed04 100644 --- a/radio/src/targets/Sky9x/usb/device/core/USBD_UDP.c +++ b/radio/src/targets/sky9x/usb/device/core/USBD_UDP.c @@ -41,10 +41,10 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/board.h" -#include "../../../../Sky9x/usb/common/core/USBEndpointDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h" -#include "../../../../Sky9x/usb/device/core/USBD.h" +#include "../../../board.h" +#include "../../../usb/common/core/USBEndpointDescriptor.h" +#include "../../../usb/common/core/USBGenericRequest.h" +#include "../../../usb/device/core/USBD.h" #include "debug.h" //------------------------------------------------------------------------------ diff --git a/radio/src/targets/Sky9x/usb/device/massstorage/MSD.h b/radio/src/targets/sky9x/usb/device/massstorage/MSD.h similarity index 100% rename from radio/src/targets/Sky9x/usb/device/massstorage/MSD.h rename to radio/src/targets/sky9x/usb/device/massstorage/MSD.h diff --git a/radio/src/targets/Sky9x/usb/device/massstorage/MSDDStateMachine.c b/radio/src/targets/sky9x/usb/device/massstorage/MSDDStateMachine.c similarity index 96% rename from radio/src/targets/Sky9x/usb/device/massstorage/MSDDStateMachine.c rename to radio/src/targets/sky9x/usb/device/massstorage/MSDDStateMachine.c index 41c0f9e76..3bc094d59 100644 --- a/radio/src/targets/Sky9x/usb/device/massstorage/MSDDStateMachine.c +++ b/radio/src/targets/sky9x/usb/device/massstorage/MSDDStateMachine.c @@ -31,9 +31,9 @@ // Includes //----------------------------------------------------------------------------- -#include "../../../../Sky9x/usb/device/massstorage/MSDDStateMachine.h" +#include "../../../usb/device/massstorage/MSDDStateMachine.h" -#include "../../../../Sky9x/usb/device/massstorage/SBCMethods.h" +#include "../../../usb/device/massstorage/SBCMethods.h" //----------------------------------------------------------------------------- // Internal functions diff --git a/radio/src/targets/Sky9x/usb/device/massstorage/MSDDStateMachine.h b/radio/src/targets/sky9x/usb/device/massstorage/MSDDStateMachine.h similarity index 96% rename from radio/src/targets/Sky9x/usb/device/massstorage/MSDDStateMachine.h rename to radio/src/targets/sky9x/usb/device/massstorage/MSDDStateMachine.h index bbfd88742..b55e0bf66 100644 --- a/radio/src/targets/Sky9x/usb/device/massstorage/MSDDStateMachine.h +++ b/radio/src/targets/sky9x/usb/device/massstorage/MSDDStateMachine.h @@ -51,8 +51,8 @@ // Headers //----------------------------------------------------------------------------- -#include "../../../../Sky9x/usb/device/massstorage/MSD.h" -#include "../../../../Sky9x/usb/device/massstorage/MSDLun.h" +#include "../../../usb/device/massstorage/MSD.h" +#include "../../../usb/device/massstorage/MSDLun.h" #include "debug.h" //----------------------------------------------------------------------------- diff --git a/radio/src/targets/Sky9x/usb/device/massstorage/MSDDriver.c b/radio/src/targets/sky9x/usb/device/massstorage/MSDDriver.c similarity index 93% rename from radio/src/targets/Sky9x/usb/device/massstorage/MSDDriver.c rename to radio/src/targets/sky9x/usb/device/massstorage/MSDDriver.c index e546d77fe..6ae50b133 100644 --- a/radio/src/targets/Sky9x/usb/device/massstorage/MSDDriver.c +++ b/radio/src/targets/sky9x/usb/device/massstorage/MSDDriver.c @@ -31,15 +31,15 @@ // Includes //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/device/massstorage/MSDDriver.h" +#include "../../../usb/device/massstorage/MSDDriver.h" -#include "../../../../Sky9x/Media.h" -#include "../../../../Sky9x/usb/common/core/USBFeatureRequest.h" -#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h" -#include "../../../../Sky9x/usb/device/core/USBD.h" -#include "../../../../Sky9x/usb/device/core/USBDDriver.h" -#include "../../../../Sky9x/usb/device/massstorage/MSDDriverDescriptors.h" -#include "../../../../Sky9x/usb/device/massstorage/SBCMethods.h" +#include "../../../usb/common/core/USBFeatureRequest.h" +#include "../../../usb/device/core/USBDDriver.h" +#include "../../../usb/device/massstorage/MSDDriverDescriptors.h" +#include "../../../usb/device/massstorage/SBCMethods.h" +#include "../../../Media.h" +#include "../../../usb/common/core/USBGenericRequest.h" +#include "../../../usb/device/core/USBD.h" #include "debug.h" //----------------------------------------------------------------------------- diff --git a/radio/src/targets/Sky9x/usb/device/massstorage/MSDDriver.h b/radio/src/targets/sky9x/usb/device/massstorage/MSDDriver.h similarity index 94% rename from radio/src/targets/Sky9x/usb/device/massstorage/MSDDriver.h rename to radio/src/targets/sky9x/usb/device/massstorage/MSDDriver.h index 09f797f96..cc3204c74 100644 --- a/radio/src/targets/Sky9x/usb/device/massstorage/MSDDriver.h +++ b/radio/src/targets/sky9x/usb/device/massstorage/MSDDriver.h @@ -50,8 +50,8 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/device/massstorage/MSD.h" -#include "../../../../Sky9x/usb/device/massstorage/MSDLun.h" +#include "../../../usb/device/massstorage/MSD.h" +#include "../../../usb/device/massstorage/MSDLun.h" // #include //------------------------------------------------------------------------------ diff --git a/radio/src/targets/Sky9x/usb/device/massstorage/MSDDriverDescriptors.c b/radio/src/targets/sky9x/usb/device/massstorage/MSDDriverDescriptors.c similarity index 93% rename from radio/src/targets/Sky9x/usb/device/massstorage/MSDDriverDescriptors.c rename to radio/src/targets/sky9x/usb/device/massstorage/MSDDriverDescriptors.c index 529de130c..181eacfe7 100644 --- a/radio/src/targets/Sky9x/usb/device/massstorage/MSDDriverDescriptors.c +++ b/radio/src/targets/sky9x/usb/device/massstorage/MSDDriverDescriptors.c @@ -31,17 +31,17 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/device/massstorage/MSDDriverDescriptors.h" +#include "../../../usb/device/massstorage/MSDDriverDescriptors.h" -#include "../../../../Sky9x/board.h" -#include "../../../../Sky9x/usb/common/core/USBConfigurationDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBDeviceDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBEndpointDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBGenericDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBInterfaceDescriptor.h" -#include "../../../../Sky9x/usb/common/core/USBStringDescriptor.h" -#include "../../../../Sky9x/usb/common/massstorage/MSDeviceDescriptor.h" -#include "../../../../Sky9x/usb/common/massstorage/MSInterfaceDescriptor.h" +#include "../../../usb/common/core/USBStringDescriptor.h" +#include "../../../usb/common/massstorage/MSDeviceDescriptor.h" +#include "../../../usb/common/massstorage/MSInterfaceDescriptor.h" +#include "../../../board.h" +#include "../../../usb/common/core/USBConfigurationDescriptor.h" +#include "../../../usb/common/core/USBDeviceDescriptor.h" +#include "../../../usb/common/core/USBEndpointDescriptor.h" +#include "../../../usb/common/core/USBGenericDescriptor.h" +#include "../../../usb/common/core/USBInterfaceDescriptor.h" //------------------------------------------------------------------------------ // Internal definitions diff --git a/radio/src/targets/Sky9x/usb/device/massstorage/MSDDriverDescriptors.h b/radio/src/targets/sky9x/usb/device/massstorage/MSDDriverDescriptors.h similarity index 95% rename from radio/src/targets/Sky9x/usb/device/massstorage/MSDDriverDescriptors.h rename to radio/src/targets/sky9x/usb/device/massstorage/MSDDriverDescriptors.h index c2a3a36ef..b2e5e295b 100644 --- a/radio/src/targets/Sky9x/usb/device/massstorage/MSDDriverDescriptors.h +++ b/radio/src/targets/sky9x/usb/device/massstorage/MSDDriverDescriptors.h @@ -47,7 +47,7 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/device/core/USBDDriverDescriptors.h" +#include "../../../usb/device/core/USBDDriverDescriptors.h" //------------------------------------------------------------------------------ // Definitions diff --git a/radio/src/targets/Sky9x/usb/device/massstorage/MSDIOFifo.h b/radio/src/targets/sky9x/usb/device/massstorage/MSDIOFifo.h similarity index 100% rename from radio/src/targets/Sky9x/usb/device/massstorage/MSDIOFifo.h rename to radio/src/targets/sky9x/usb/device/massstorage/MSDIOFifo.h diff --git a/radio/src/targets/Sky9x/usb/device/massstorage/MSDLun.c b/radio/src/targets/sky9x/usb/device/massstorage/MSDLun.c similarity index 96% rename from radio/src/targets/Sky9x/usb/device/massstorage/MSDLun.c rename to radio/src/targets/sky9x/usb/device/massstorage/MSDLun.c index c83e0b4fa..9e40abc9c 100644 --- a/radio/src/targets/Sky9x/usb/device/massstorage/MSDLun.c +++ b/radio/src/targets/sky9x/usb/device/massstorage/MSDLun.c @@ -32,9 +32,9 @@ //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/device/massstorage/MSDLun.h" +#include "../../../usb/device/massstorage/MSDLun.h" -#include "../../../../Sky9x/usb/device/core/USBD.h" +#include "../../../usb/device/core/USBD.h" #include "debug.h" //------------------------------------------------------------------------------ diff --git a/radio/src/targets/Sky9x/usb/device/massstorage/MSDLun.h b/radio/src/targets/sky9x/usb/device/massstorage/MSDLun.h similarity index 94% rename from radio/src/targets/Sky9x/usb/device/massstorage/MSDLun.h rename to radio/src/targets/sky9x/usb/device/massstorage/MSDLun.h index 6124ccd6f..51584ea47 100644 --- a/radio/src/targets/Sky9x/usb/device/massstorage/MSDLun.h +++ b/radio/src/targets/sky9x/usb/device/massstorage/MSDLun.h @@ -50,10 +50,10 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/Media.h" -#include "../../../../Sky9x/usb/device/core/USBD.h" -#include "../../../../Sky9x/usb/device/massstorage/MSDIOFifo.h" -#include "../../../../Sky9x/usb/device/massstorage/SBC.h" +#include "../../../Media.h" +#include "../../../usb/device/core/USBD.h" +#include "../../../usb/device/massstorage/MSDIOFifo.h" +#include "../../../usb/device/massstorage/SBC.h" //------------------------------------------------------------------------------ // Definitions diff --git a/radio/src/targets/Sky9x/usb/device/massstorage/SBC.h b/radio/src/targets/sky9x/usb/device/massstorage/SBC.h similarity index 100% rename from radio/src/targets/Sky9x/usb/device/massstorage/SBC.h rename to radio/src/targets/sky9x/usb/device/massstorage/SBC.h diff --git a/radio/src/targets/Sky9x/usb/device/massstorage/SBCMethods.c b/radio/src/targets/sky9x/usb/device/massstorage/SBCMethods.c similarity index 96% rename from radio/src/targets/Sky9x/usb/device/massstorage/SBCMethods.c rename to radio/src/targets/sky9x/usb/device/massstorage/SBCMethods.c index 65b416bbb..af1a1b836 100644 --- a/radio/src/targets/Sky9x/usb/device/massstorage/SBCMethods.c +++ b/radio/src/targets/sky9x/usb/device/massstorage/SBCMethods.c @@ -31,11 +31,11 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/device/massstorage/SBCMethods.h" +#include "../../../usb/device/massstorage/SBCMethods.h" -#include "../../../../Sky9x/usb/device/core/USBD.h" -#include "../../../../Sky9x/usb/device/massstorage/MSDDStateMachine.h" -#include "../../../../Sky9x/usb/device/massstorage/MSDIOFifo.h" +#include "../../../usb/device/core/USBD.h" +#include "../../../usb/device/massstorage/MSDDStateMachine.h" +#include "../../../usb/device/massstorage/MSDIOFifo.h" //------------------------------------------------------------------------------ // Global variables diff --git a/radio/src/targets/Sky9x/usb/device/massstorage/SBCMethods.h b/radio/src/targets/sky9x/usb/device/massstorage/SBCMethods.h similarity index 95% rename from radio/src/targets/Sky9x/usb/device/massstorage/SBCMethods.h rename to radio/src/targets/sky9x/usb/device/massstorage/SBCMethods.h index 25b1d5e76..697ec46df 100644 --- a/radio/src/targets/Sky9x/usb/device/massstorage/SBCMethods.h +++ b/radio/src/targets/sky9x/usb/device/massstorage/SBCMethods.h @@ -51,8 +51,8 @@ // Headers //------------------------------------------------------------------------------ -#include "../../../../Sky9x/usb/device/massstorage/MSDDStateMachine.h" -#include "../../../../Sky9x/usb/device/massstorage/SBC.h" +#include "../../../usb/device/massstorage/MSDDStateMachine.h" +#include "../../../usb/device/massstorage/SBC.h" //------------------------------------------------------------------------------ // Definitions diff --git a/radio/src/targets/Sky9x/vectors_sam3s.c b/radio/src/targets/sky9x/vectors_sam3s.c similarity index 100% rename from radio/src/targets/Sky9x/vectors_sam3s.c rename to radio/src/targets/sky9x/vectors_sam3s.c diff --git a/radio/src/targets/Taranis/adc_driver.cpp b/radio/src/targets/taranis/adc_driver.cpp similarity index 100% rename from radio/src/targets/Taranis/adc_driver.cpp rename to radio/src/targets/taranis/adc_driver.cpp diff --git a/radio/src/targets/Taranis/aspi.c b/radio/src/targets/taranis/aspi.c similarity index 92% rename from radio/src/targets/Taranis/aspi.c rename to radio/src/targets/taranis/aspi.c index 1292eebfa..56f41811c 100644 --- a/radio/src/targets/Taranis/aspi.c +++ b/radio/src/targets/taranis/aspi.c @@ -10,7 +10,7 @@ ****************************************************************************** */ -#include "../Taranis/board_taranis.h" +#include "../taranis/board_taranis.h" /** **********send command to lcd************** diff --git a/radio/src/targets/Taranis/aspi.h b/radio/src/targets/taranis/aspi.h similarity index 100% rename from radio/src/targets/Taranis/aspi.h rename to radio/src/targets/taranis/aspi.h diff --git a/radio/src/targets/Taranis/audio_driver.cpp b/radio/src/targets/taranis/audio_driver.cpp similarity index 100% rename from radio/src/targets/Taranis/audio_driver.cpp rename to radio/src/targets/taranis/audio_driver.cpp diff --git a/radio/src/targets/Taranis/bluetooth_driver.cpp b/radio/src/targets/taranis/bluetooth_driver.cpp similarity index 95% rename from radio/src/targets/Taranis/bluetooth_driver.cpp rename to radio/src/targets/taranis/bluetooth_driver.cpp index 9490df75d..af25b005d 100644 --- a/radio/src/targets/Taranis/bluetooth_driver.cpp +++ b/radio/src/targets/taranis/bluetooth_driver.cpp @@ -10,7 +10,7 @@ #include "string.h" #include "../../fifo.h" -#include "../Taranis/board_taranis.h" +#include "../taranis/board_taranis.h" Fifo<64> btTxFifo; Fifo<64> btRxFifo; diff --git a/radio/src/targets/Taranis/board_taranis.cpp b/radio/src/targets/taranis/board_taranis.cpp similarity index 95% rename from radio/src/targets/Taranis/board_taranis.cpp rename to radio/src/targets/taranis/board_taranis.cpp index 15dd5e705..7fbca43b1 100644 --- a/radio/src/targets/Taranis/board_taranis.cpp +++ b/radio/src/targets/taranis/board_taranis.cpp @@ -117,11 +117,11 @@ extern "C" void INTERRUPT_5MS_IRQHandler() #define PWR_PRESS_DURATION_MAX 500 // 5s const pm_uchar bmp_startup[] PROGMEM = { - #include "../../bitmaps/Taranis/startup.lbm" + #include "../../bitmaps/taranis/startup.lbm" }; const pm_uchar bmp_lock[] PROGMEM = { - #include "../../bitmaps/Taranis/lock.lbm" + #include "../../bitmaps/taranis/lock.lbm" }; #endif diff --git a/radio/src/targets/Taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h similarity index 95% rename from radio/src/targets/Taranis/board_taranis.h rename to radio/src/targets/taranis/board_taranis.h index bfe416943..389e28cdc 100644 --- a/radio/src/targets/Taranis/board_taranis.h +++ b/radio/src/targets/taranis/board_taranis.h @@ -78,13 +78,13 @@ extern "C" { #include "usbd_msc_core.h" #include "usbd_hid_core.h" #include "usbd_usr.h" - #include "../Taranis/usbd_desc.h" - #include "../Taranis/usb_conf.h" - #include "../Taranis/usbd_conf.h" + #include "../taranis/usbd_desc.h" + #include "../taranis/usb_conf.h" + #include "../taranis/usbd_conf.h" #endif -#include "../Taranis/hal.h" -#include "../Taranis/aspi.h" +#include "../taranis/hal.h" +#include "../taranis/aspi.h" #if defined(__cplusplus) && !defined(SIMU) } diff --git a/radio/src/targets/Taranis/bootloader/.gitignore b/radio/src/targets/taranis/bootloader/.gitignore similarity index 100% rename from radio/src/targets/Taranis/bootloader/.gitignore rename to radio/src/targets/taranis/bootloader/.gitignore diff --git a/radio/src/targets/Taranis/bootloader/Makefile b/radio/src/targets/taranis/bootloader/Makefile similarity index 99% rename from radio/src/targets/Taranis/bootloader/Makefile rename to radio/src/targets/taranis/bootloader/Makefile index 799a054cc..80b9a7479 100644 --- a/radio/src/targets/Taranis/bootloader/Makefile +++ b/radio/src/targets/taranis/bootloader/Makefile @@ -175,7 +175,7 @@ CPPSRC = ../lcd_driver.cpp \ ../diskio.cpp \ ../usbd_usr.cpp \ ../usbd_storage_msd.cpp \ - ../../../gui/Taranis/lcd.cpp \ + ../../../gui/taranis/lcd.cpp \ ../../../keys.cpp \ ../../../fonts.cpp \ ../../../strhelpers.cpp \ diff --git a/radio/src/targets/Taranis/bootloader/boot.cpp b/radio/src/targets/taranis/bootloader/boot.cpp similarity index 99% rename from radio/src/targets/Taranis/bootloader/boot.cpp rename to radio/src/targets/taranis/bootloader/boot.cpp index 9d361b4f8..aa41f6538 100644 --- a/radio/src/targets/Taranis/bootloader/boot.cpp +++ b/radio/src/targets/taranis/bootloader/boot.cpp @@ -53,10 +53,10 @@ #include #include -#include "../board_taranis.h" +#include "../../../gui/taranis/lcd.h" +#include "../../taranis/board_taranis.h" #include "storage/eeprom_rlc.h" #include "pwr.h" -#include "gui/Taranis/lcd.h" #include "keys.h" #include "sdcard.h" #include "FatFs/ff.h" diff --git a/radio/src/targets/Taranis/bootloader/init.c b/radio/src/targets/taranis/bootloader/init.c similarity index 100% rename from radio/src/targets/Taranis/bootloader/init.c rename to radio/src/targets/taranis/bootloader/init.c diff --git a/radio/src/targets/Taranis/configure_pins.cpp b/radio/src/targets/taranis/configure_pins.cpp similarity index 100% rename from radio/src/targets/Taranis/configure_pins.cpp rename to radio/src/targets/taranis/configure_pins.cpp diff --git a/radio/src/targets/Taranis/delays.c b/radio/src/targets/taranis/delays.c similarity index 94% rename from radio/src/targets/Taranis/delays.c rename to radio/src/targets/taranis/delays.c index 6d32f8e86..4851f0df5 100644 --- a/radio/src/targets/Taranis/delays.c +++ b/radio/src/targets/taranis/delays.c @@ -34,7 +34,7 @@ * */ -#include "../Taranis/board_taranis.h" +#include "../taranis/board_taranis.h" void delaysInit(void) { diff --git a/radio/src/targets/Taranis/diskio.cpp b/radio/src/targets/taranis/diskio.cpp similarity index 96% rename from radio/src/targets/Taranis/diskio.cpp rename to radio/src/targets/taranis/diskio.cpp index d7e111b28..ea176b2dc 100644 --- a/radio/src/targets/Taranis/diskio.cpp +++ b/radio/src/targets/taranis/diskio.cpp @@ -39,7 +39,7 @@ #include "../../thirdparty/FatFs/ff.h" #include "../../thirdparty/CoOS/kernel/CoOS.h" #include "../../debug.h" -#include "../Taranis/board_taranis.h" +#include "../taranis/board_taranis.h" #include "../Taranis/hal.h" /* Definitions for MMC/SDC command */ diff --git a/radio/src/targets/Taranis/flash_driver.cpp b/radio/src/targets/taranis/flash_driver.cpp similarity index 100% rename from radio/src/targets/Taranis/flash_driver.cpp rename to radio/src/targets/taranis/flash_driver.cpp diff --git a/radio/src/targets/Taranis/hal.h b/radio/src/targets/taranis/hal.h similarity index 100% rename from radio/src/targets/Taranis/hal.h rename to radio/src/targets/taranis/hal.h diff --git a/radio/src/targets/Taranis/haptic_driver.cpp b/radio/src/targets/taranis/haptic_driver.cpp similarity index 100% rename from radio/src/targets/Taranis/haptic_driver.cpp rename to radio/src/targets/taranis/haptic_driver.cpp diff --git a/radio/src/targets/Taranis/i2c_driver.cpp b/radio/src/targets/taranis/i2c_driver.cpp similarity index 96% rename from radio/src/targets/Taranis/i2c_driver.cpp rename to radio/src/targets/taranis/i2c_driver.cpp index 2686a0de3..1e5c2130f 100644 --- a/radio/src/targets/Taranis/i2c_driver.cpp +++ b/radio/src/targets/taranis/i2c_driver.cpp @@ -1,4 +1,4 @@ -#include "../Taranis/board_taranis.h" +#include "../taranis/board_taranis.h" void eepromPageWrite(uint8_t* pBuffer, uint16_t WriteAddr, uint8_t NumByteToWrite); void eepromWaitEepromStandbyState(void); diff --git a/radio/src/targets/Taranis/keys_driver.cpp b/radio/src/targets/taranis/keys_driver.cpp similarity index 100% rename from radio/src/targets/Taranis/keys_driver.cpp rename to radio/src/targets/taranis/keys_driver.cpp diff --git a/radio/src/targets/Taranis/lcd_driver.cpp b/radio/src/targets/taranis/lcd_driver.cpp similarity index 100% rename from radio/src/targets/Taranis/lcd_driver.cpp rename to radio/src/targets/taranis/lcd_driver.cpp diff --git a/radio/src/targets/Taranis/pulses_driver.cpp b/radio/src/targets/taranis/pulses_driver.cpp similarity index 100% rename from radio/src/targets/Taranis/pulses_driver.cpp rename to radio/src/targets/taranis/pulses_driver.cpp diff --git a/radio/src/targets/Taranis/pwr_driver.c b/radio/src/targets/taranis/pwr_driver.c similarity index 95% rename from radio/src/targets/Taranis/pwr_driver.c rename to radio/src/targets/taranis/pwr_driver.c index e9b17cfd2..ef68aff48 100644 --- a/radio/src/targets/Taranis/pwr_driver.c +++ b/radio/src/targets/taranis/pwr_driver.c @@ -35,7 +35,7 @@ */ #include "../../pwr.h" -#include "../Taranis/board_taranis.h" +#include "../taranis/board_taranis.h" void pwrInit() { diff --git a/radio/src/targets/Taranis/rtc_driver.cpp b/radio/src/targets/taranis/rtc_driver.cpp similarity index 100% rename from radio/src/targets/Taranis/rtc_driver.cpp rename to radio/src/targets/taranis/rtc_driver.cpp diff --git a/radio/src/targets/Taranis/serial2_driver.cpp b/radio/src/targets/taranis/serial2_driver.cpp similarity index 100% rename from radio/src/targets/Taranis/serial2_driver.cpp rename to radio/src/targets/taranis/serial2_driver.cpp diff --git a/radio/src/targets/Taranis/stm32_ramboot.ld b/radio/src/targets/taranis/stm32_ramboot.ld similarity index 100% rename from radio/src/targets/Taranis/stm32_ramboot.ld rename to radio/src/targets/taranis/stm32_ramboot.ld diff --git a/radio/src/targets/Taranis/stm32f2_flash.ld b/radio/src/targets/taranis/stm32f2_flash.ld similarity index 100% rename from radio/src/targets/Taranis/stm32f2_flash.ld rename to radio/src/targets/taranis/stm32f2_flash.ld diff --git a/radio/src/targets/Taranis/stm32f4_flash.ld b/radio/src/targets/taranis/stm32f4_flash.ld similarity index 100% rename from radio/src/targets/Taranis/stm32f4_flash.ld rename to radio/src/targets/taranis/stm32f4_flash.ld diff --git a/radio/src/targets/Taranis/system_stm32f2xx.c b/radio/src/targets/taranis/system_stm32f2xx.c similarity index 100% rename from radio/src/targets/Taranis/system_stm32f2xx.c rename to radio/src/targets/taranis/system_stm32f2xx.c diff --git a/radio/src/targets/Taranis/system_stm32f4xx.c b/radio/src/targets/taranis/system_stm32f4xx.c similarity index 100% rename from radio/src/targets/Taranis/system_stm32f4xx.c rename to radio/src/targets/taranis/system_stm32f4xx.c diff --git a/radio/src/targets/Taranis/telemetry_driver.cpp b/radio/src/targets/taranis/telemetry_driver.cpp similarity index 100% rename from radio/src/targets/Taranis/telemetry_driver.cpp rename to radio/src/targets/taranis/telemetry_driver.cpp diff --git a/radio/src/targets/Taranis/top_lcd_driver.cpp b/radio/src/targets/taranis/top_lcd_driver.cpp similarity index 99% rename from radio/src/targets/Taranis/top_lcd_driver.cpp rename to radio/src/targets/taranis/top_lcd_driver.cpp index 566cd27fb..cd83923e9 100644 --- a/radio/src/targets/Taranis/top_lcd_driver.cpp +++ b/radio/src/targets/taranis/top_lcd_driver.cpp @@ -34,7 +34,7 @@ * */ -#include "../Taranis/board_taranis.h" +#include "../taranis/board_taranis.h" #define CS1_HIGH() TOPLCD_GPIO->BSRRL = TOPLCD_GPIO_PIN_CS1 #define CS1_LOW() TOPLCD_GPIO->BSRRH = TOPLCD_GPIO_PIN_CS1 diff --git a/radio/src/targets/Taranis/trainer_driver.cpp b/radio/src/targets/taranis/trainer_driver.cpp similarity index 100% rename from radio/src/targets/Taranis/trainer_driver.cpp rename to radio/src/targets/taranis/trainer_driver.cpp diff --git a/radio/src/targets/Horus/usb_bsp.c b/radio/src/targets/taranis/usb_bsp.c similarity index 95% rename from radio/src/targets/Horus/usb_bsp.c rename to radio/src/targets/taranis/usb_bsp.c index 1f78c4834..98f9b1e12 100644 --- a/radio/src/targets/Horus/usb_bsp.c +++ b/radio/src/targets/taranis/usb_bsp.c @@ -30,8 +30,8 @@ #include "usb_bsp.h" -#include "board_horus.h" -#include "usbd_conf.h" +#include "../taranis/board_taranis.h" +#include "../taranis/usbd_conf.h" extern uint32_t SystemCoreClock; diff --git a/radio/src/targets/Taranis/usb_conf.h b/radio/src/targets/taranis/usb_conf.h similarity index 100% rename from radio/src/targets/Taranis/usb_conf.h rename to radio/src/targets/taranis/usb_conf.h diff --git a/radio/src/targets/Taranis/usb_driver.c b/radio/src/targets/taranis/usb_driver.c similarity index 98% rename from radio/src/targets/Taranis/usb_driver.c rename to radio/src/targets/taranis/usb_driver.c index 9233962b1..71c84a64a 100644 --- a/radio/src/targets/Taranis/usb_driver.c +++ b/radio/src/targets/taranis/usb_driver.c @@ -34,7 +34,7 @@ * */ -#include "board_taranis.h" +#include "../taranis/board_taranis.h" #include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h" int usbPlugged(void) diff --git a/radio/src/targets/Horus/usbd_cdc.cpp b/radio/src/targets/taranis/usbd_cdc.cpp similarity index 96% rename from radio/src/targets/Horus/usbd_cdc.cpp rename to radio/src/targets/taranis/usbd_cdc.cpp index 7b1a44634..2b6ea4e54 100644 --- a/radio/src/targets/Horus/usbd_cdc.cpp +++ b/radio/src/targets/taranis/usbd_cdc.cpp @@ -34,7 +34,7 @@ extern "C" { /* Includes ------------------------------------------------------------------*/ -#include "usb_conf.h" +#include "../taranis/usb_conf.h" /* Private typedef -----------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/ diff --git a/radio/src/targets/Horus/usbd_conf.h b/radio/src/targets/taranis/usbd_conf.h similarity index 96% rename from radio/src/targets/Horus/usbd_conf.h rename to radio/src/targets/taranis/usbd_conf.h index 557973a26..0aa166a4d 100644 --- a/radio/src/targets/Horus/usbd_conf.h +++ b/radio/src/targets/taranis/usbd_conf.h @@ -30,7 +30,7 @@ #define __USBD_CONF__H__ /* Includes ------------------------------------------------------------------*/ -#include "usb_conf.h" +#include "../taranis/usb_conf.h" #define USBD_CFG_MAX_NUM 1 #define USBD_ITF_MAX_NUM 1 diff --git a/radio/src/targets/Taranis/usbd_desc.c b/radio/src/targets/taranis/usbd_desc.c similarity index 95% rename from radio/src/targets/Taranis/usbd_desc.c rename to radio/src/targets/taranis/usbd_desc.c index 2c2011255..e4de88d47 100644 --- a/radio/src/targets/Taranis/usbd_desc.c +++ b/radio/src/targets/taranis/usbd_desc.c @@ -26,13 +26,15 @@ */ /* Includes ------------------------------------------------------------------*/ +#include "../taranis/usbd_desc.h" + #include + +#include "../taranis/board_taranis.h" +#include "../taranis/usbd_conf.h" #include "usbd_core.h" -#include "usbd_desc.h" #include "usbd_req.h" -#include "usbd_conf.h" #include "usb_regs.h" -#include "board_taranis.h" /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY * @{ diff --git a/radio/src/targets/Taranis/usbd_desc.h b/radio/src/targets/taranis/usbd_desc.h similarity index 100% rename from radio/src/targets/Taranis/usbd_desc.h rename to radio/src/targets/taranis/usbd_desc.h diff --git a/radio/src/targets/Horus/usbd_hid_joystick.c b/radio/src/targets/taranis/usbd_hid_joystick.c similarity index 96% rename from radio/src/targets/Horus/usbd_hid_joystick.c rename to radio/src/targets/taranis/usbd_hid_joystick.c index 33a6c3d85..0957c2f24 100644 --- a/radio/src/targets/Horus/usbd_hid_joystick.c +++ b/radio/src/targets/taranis/usbd_hid_joystick.c @@ -47,9 +47,9 @@ */ /* Includes ------------------------------------------------------------------*/ +#include "../taranis/usbd_desc.h" #include "usbd_hid_core.h" #include "usbd_req.h" -#include "usbd_desc.h" /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY * @{ diff --git a/radio/src/targets/Taranis/usbd_storage_msd.cpp b/radio/src/targets/taranis/usbd_storage_msd.cpp similarity index 96% rename from radio/src/targets/Taranis/usbd_storage_msd.cpp rename to radio/src/targets/taranis/usbd_storage_msd.cpp index 51cccc788..2be528596 100644 --- a/radio/src/targets/Taranis/usbd_storage_msd.cpp +++ b/radio/src/targets/taranis/usbd_storage_msd.cpp @@ -28,14 +28,14 @@ /* Includes ------------------------------------------------------------------*/ #include "../../opentx.h" #include "../../thirdparty/FatFs/diskio.h" -#include "board_taranis.h" +#include "../taranis/board_taranis.h" #if defined(__cplusplus) && !defined(SIMU) extern "C" { #endif #include "usbd_msc_mem.h" -#include "usb_conf.h" +#include "../taranis/usb_conf.h" #if defined(BOOT) #define STORAGE_LUN_NBR 2 diff --git a/radio/src/targets/Taranis/usbd_usr.cpp b/radio/src/targets/taranis/usbd_usr.cpp similarity index 100% rename from radio/src/targets/Taranis/usbd_usr.cpp rename to radio/src/targets/taranis/usbd_usr.cpp diff --git a/radio/util/taranisicons.py b/radio/util/taranisicons.py index 1164d28e5..ae108c89d 100755 --- a/radio/util/taranisicons.py +++ b/radio/util/taranisicons.py @@ -11,7 +11,7 @@ image.fill(QtGui.QColor(255, 255, 255)) painter = QtGui.QPainter() painter.begin(image) for i, str in enumerate(menu): - icon = QtGui.QImage("../src/bitmaps/Taranis/std/%s.png" % str) + icon = QtGui.QImage("../src/bitmaps/taranis/std/%s.png" % str) painter.drawImage(Qt.QPoint(24*i, 0), icon) painter.end() -image.save("../src/bitmaps/Taranis/mainmenu.png") +image.save("../src/bitmaps/taranis/mainmenu.png")