From cf54528a9ecef10e30ca1f7042e567199a8ad72d Mon Sep 17 00:00:00 2001 From: "bsongis@gmail.com" Date: Thu, 21 Mar 2013 10:48:14 +0000 Subject: [PATCH] open9x replaced by opentx --- src/FatFs/fattime.c | 2 +- src/Makefile | 60 ++++++++++++++-------------- src/ardupilot.cpp | 4 +- src/ardupilot.h | 2 +- src/audio_arm.cpp | 4 +- src/audio_arm.h | 2 +- src/audio_avr.cpp | 4 +- src/audio_avr.h | 2 +- src/beeper.cpp | 4 +- src/beeper.h | 2 +- src/bmp.cpp | 4 +- src/debug.cpp | 4 +- src/debug.h | 2 +- src/eeprom_common.cpp | 4 +- src/eeprom_common.h | 2 +- src/eeprom_conversions.cpp | 4 +- src/eeprom_raw.cpp | 4 +- src/eeprom_raw.h | 2 +- src/eeprom_rlc.cpp | 4 +- src/eeprom_rlc.h | 2 +- src/fifo.h | 2 +- src/frsky.cpp | 4 +- src/frsky.h | 2 +- src/general_menus.cpp | 4 +- src/gruvin9x/board_gruvin9x.cpp | 4 +- src/gruvin9x/board_gruvin9x.h | 2 +- src/gruvin9x/diskio.cpp | 4 +- src/gruvin9x/rtc_driver.cpp | 4 +- src/gruvin9x/somo14d.cpp | 4 +- src/gruvin9x/somo14d.h | 2 +- src/gtests.cpp | 4 +- src/haptic.cpp | 4 +- src/haptic.h | 2 +- src/jeti.cpp | 4 +- src/jeti.h | 2 +- src/keys.cpp | 4 +- src/lcd.cpp | 4 +- src/lcd.h | 2 +- src/logs.cpp | 4 +- src/main_views.cpp | 4 +- src/mavlink.cpp | 4 +- src/mega2560/board_mega2560.cpp | 2 +- src/mega2560/io_mega2560.h | 2 +- src/mega2560/lcd_driver_ST7565R.cpp | 4 +- src/menus.cpp | 4 +- src/menus.h | 2 +- src/model_menus.cpp | 4 +- src/monitors_views.cpp | 4 +- src/myeeprom.h | 2 +- src/nmea.cpp | 4 +- src/nmea.h | 2 +- src/{open9x.cpp => opentx.cpp} | 10 ++--- src/{open9x.h => opentx.h} | 6 +-- src/pgmtypes.h | 2 +- src/pulses_arm.cpp | 4 +- src/pulses_arm.h | 2 +- src/pulses_avr.cpp | 4 +- src/pulses_avr.h | 2 +- src/rotarysw.cpp | 2 +- src/rtc.cpp | 4 +- src/rtc.h | 2 +- src/sdcard.h | 2 +- src/serial.cpp | 2 +- src/simpgmspace.cpp | 4 +- src/simpgmspace.h | 2 +- src/simu.cpp | 4 +- src/sky9x/adc_driver.cpp | 4 +- src/sky9x/audio_driver.cpp | 4 +- src/sky9x/audio_driver.h | 2 +- src/sky9x/bluetooth.cpp | 4 +- src/sky9x/board.h | 2 +- src/sky9x/board_sky9x.cpp | 4 +- src/sky9x/board_sky9x.h | 2 +- src/sky9x/buzzer_driver.cpp | 4 +- src/sky9x/coproc_driver.cpp | 4 +- src/sky9x/debug_driver.cpp | 4 +- src/sky9x/diskio.cpp | 2 +- src/sky9x/eeprom_driver.cpp | 4 +- src/sky9x/haptic_driver.cpp | 4 +- src/sky9x/keys_driver.cpp | 4 +- src/sky9x/lcd_driver.cpp | 4 +- src/sky9x/massstorage.cpp | 4 +- src/sky9x/pulses_driver.cpp | 4 +- src/sky9x/pwr_driver.cpp | 4 +- src/sky9x/rotenc_driver.cpp | 4 +- src/sky9x/rtc_driver.cpp | 4 +- src/sky9x/sdcard_driver.cpp | 2 +- src/stamp.cpp | 6 +-- src/statistics_views.cpp | 4 +- src/stock/board_stock.cpp | 4 +- src/stock/board_stock.h | 2 +- src/stock/lcd_driver.cpp | 4 +- src/stock/voice.cpp | 4 +- src/stock/voice.h | 2 +- src/templates.cpp | 4 +- src/templates.h | 2 +- src/translations.cpp | 4 +- src/translations.h | 2 +- src/translations/cz.h | 2 +- src/translations/de.h | 2 +- src/translations/en.h | 2 +- src/translations/es.h | 2 +- src/translations/fr.h | 2 +- src/translations/it.h | 2 +- src/translations/se.h | 2 +- src/translations/tts_cz.cpp | 4 +- src/translations/tts_de.cpp | 4 +- src/translations/tts_en.cpp | 4 +- src/translations/tts_es.cpp | 4 +- src/translations/tts_fr.cpp | 4 +- src/translations/tts_it.cpp | 4 +- src/translations/tts_pt.cpp | 4 +- src/translations/tts_sk.cpp | 4 +- src/x9d/adc_driver.cpp | 4 +- src/x9d/aspi.cpp | 2 +- src/x9d/audio_driver.cpp | 4 +- src/x9d/audio_driver.h | 2 +- src/x9d/board_x9d.cpp | 4 +- src/x9d/board_x9d.h | 2 +- src/x9d/delays.cpp | 4 +- src/x9d/diskio.cpp | 2 +- src/x9d/i2c.c | 2 +- src/x9d/keys_driver.cpp | 4 +- src/x9d/lcd_driver.cpp | 2 +- src/x9d/pulses_driver.cpp | 4 +- src/x9d/pwr_driver.cpp | 4 +- src/x9d/rtc_driver.cpp | 4 +- src/x9d/sport_driver.cpp | 4 +- src/x9d/trainer_driver.cpp | 4 +- src/x9d/uart_driver.cpp | 4 +- src/x9d_logo.bmp | Bin 3126 -> 3126 bytes src/x9d_logo.lbm | 4 +- 132 files changed, 244 insertions(+), 244 deletions(-) rename src/{open9x.cpp => opentx.cpp} (96%) rename src/{open9x.h => opentx.h} (99%) diff --git a/src/FatFs/fattime.c b/src/FatFs/fattime.c index f5d74bf13..0b1adf71d 100644 --- a/src/FatFs/fattime.c +++ b/src/FatFs/fattime.c @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/Makefile b/src/Makefile index b9a97cbf1..1b99891fc 100644 --- a/src/Makefile +++ b/src/Makefile @@ -320,14 +320,14 @@ F_CPU = 16000000 FORMAT = ihex # Target file name (without extension). -TARGET = open9x +TARGET = opentx # List C++ source files here. (C dependencies are automatically generated.) SRC = STD_TTS_SRC = translations/tts_$(shell sh -c "echo $(TTS) | tr '[:upper:]' '[:lower:]'").cpp TTS_SRC = $(shell sh -c "if test -f $(STD_TTS_SRC); then echo $(STD_TTS_SRC); else echo translations/tts_en.cpp; fi") -CPPSRC = open9x.cpp $(PULSESSRC) stamp.cpp menus.cpp model_menus.cpp general_menus.cpp main_views.cpp statistics_views.cpp $(EEPROMSRC) lcd.cpp keys.cpp translations.cpp $(TTS_SRC) +CPPSRC = opentx.cpp $(PULSESSRC) stamp.cpp menus.cpp model_menus.cpp general_menus.cpp main_views.cpp statistics_views.cpp $(EEPROMSRC) lcd.cpp keys.cpp translations.cpp $(TTS_SRC) ifeq ($(EXT), JETI) CPPSRC += jeti.cpp @@ -874,7 +874,7 @@ MSG_CLEANING = Cleaning project: # Combine all necessary flags and optional flags. # Add target processor to flags. -ARMCPPFLAGS = -c -mcpu=$(MCU) -mthumb -fomit-frame-pointer -fverbose-asm -Wa,-ahlms=open9x.lst -DRUN_FROM_FLASH=1 -O$(OPT) $(CPPFLAGS) $(GENDEPFLAGS) +ARMCPPFLAGS = -c -mcpu=$(MCU) -mthumb -fomit-frame-pointer -fverbose-asm -Wa,-ahlms=opentx.lst -DRUN_FROM_FLASH=1 -O$(OPT) $(CPPFLAGS) $(GENDEPFLAGS) AVRCPPFLAGS = -mmcu=$(MCU) -I. -x c++ -O$(OPT) $(CPPFLAGS) $(GENDEPFLAGS) -fwhole-program ifeq ($(ARCH), AVR) @@ -891,8 +891,8 @@ ifeq ($(ARCH), AVR) endif endif -MAJ_VER = ${shell sh -c "grep \"MAJ_VERS\" open9x.h | cut -d\ -f3 | egrep -o \"[[:digit:]]\""} -MIN_VER = ${shell sh -c "grep \"MIN_VERS\" open9x.h | cut -d\ -f3"} +MAJ_VER = ${shell sh -c "grep \"MAJ_VERS\" opentx.h | cut -d\ -f3 | egrep -o \"[[:digit:]]\""} +MIN_VER = ${shell sh -c "grep \"MIN_VERS\" opentx.h | cut -d\ -f3"} # Default target. all: begin gccversion sizebefore build sizeafter end @@ -917,35 +917,35 @@ lbm: font.lbm font_tiny.lbm font_small.lbm font_midsize.lbm font_dblsize.lbm sti stamp_header: @echo @echo "Generate Version-stamp:" - @echo "//Automatically generated file (Makefile) - do not edit" > stamp-open9x.h - @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" >> stamp-open9x.h - @echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-open9x.h - @echo "#define SVN_STR \"open9x-r$(SVNREV)\"" >> stamp-open9x.h - @cat stamp-open9x.h + @echo "//Automatically generated file (Makefile) - do not edit" > stamp-opentx.h + @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" >> stamp-opentx.h + @echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx.h + @echo "#define SVN_STR \"opentx-r$(SVNREV)\"" >> stamp-opentx.h + @cat stamp-opentx.h stock-stamp: - @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-open9x-stock.txt - @echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-open9x-stock.txt - @echo "#define SVN_VERS \"open9x-r$(SVNREV)\"" >> stamp-open9x-stock.txt - @cat stamp-open9x-stock.txt + @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-stock.txt + @echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-stock.txt + @echo "#define SVN_VERS \"opentx-r$(SVNREV)\"" >> stamp-opentx-stock.txt + @cat stamp-opentx-stock.txt stock128-stamp: - @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-open9x-stock128.txt - @echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-open9x-stock128.txt - @echo "#define SVN_VERS \"open9x-r$(SVNREV)\"" >> stamp-open9x-stock128.txt - @cat stamp-open9x-stock128.txt + @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-stock128.txt + @echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-stock128.txt + @echo "#define SVN_VERS \"opentx-r$(SVNREV)\"" >> stamp-opentx-stock128.txt + @cat stamp-opentx-stock128.txt v4-stamp: - @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-open9x-v4.txt - @echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-open9x-v4.txt - @echo "#define SVN_VERS \"open9x-r$(SVNREV)\"" >> stamp-open9x-v4.txt - @cat stamp-open9x-v4.txt + @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-v4.txt + @echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-v4.txt + @echo "#define SVN_VERS \"opentx-r$(SVNREV)\"" >> stamp-opentx-v4.txt + @cat stamp-opentx-v4.txt arm-stamp: - @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-open9x-arm.txt - @echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-open9x-arm.txt - @echo "#define SVN_VERS \"open9x-r$(SVNREV)\"" >> stamp-open9x-arm.txt - @cat stamp-open9x-arm.txt + @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-arm.txt + @echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-arm.txt + @echo "#define SVN_VERS \"opentx-r$(SVNREV)\"" >> stamp-opentx-arm.txt + @cat stamp-opentx-arm.txt font.lbm: font.xbm font_extra.xbm translations/font_se.xbm translations/font_de.xbm translations/font_it.xbm translations/font_cz.xbm translations/font_fr.xbm translations/font_es.xbm @echo @@ -1073,7 +1073,7 @@ else %.hex: %.elf @echo @echo $(MSG_FLASH) $@ - $(OBJCOPY) -O ihex open9x.elf open9x.hex + $(OBJCOPY) -O ihex opentx.elf opentx.hex endif %.bin: %.elf @@ -1155,14 +1155,14 @@ clean_list : $(REMOVE) *.d $(REMOVE) *.lst $(REMOVE) allsrc.cpp - $(REMOVE) stamp-open9x.h + $(REMOVE) stamp-opentx.h #### Install DATE = ${shell sh -c "date +%F:%T" } AVRCOMMAND = $(AVRDUDE) $(AVRDEVICE) -WRITE_COMMAND = $(AVRCOMMAND) -U flash:w:open9x.hex:i +WRITE_COMMAND = $(AVRCOMMAND) -U flash:w:opentx.hex:i ifeq ($(RESTORE_EEPROM), YES) BACKUP_EEPROM = YES ifeq ($(DOUBLE_WRITE_OK), YES) @@ -1176,7 +1176,7 @@ ifeq ($(BACKUP_FLASH), YES) BACKUP_ARGS += -U eeprom:r:$(DATA_DIR)/eeprom-$(DATE).hex:i $(BACKUPFLASH) endif ifeq ($(BACKUP_EEPROM), YES) - BACKUP_ARGS += -U flash:r:$(DATA_DIR)/open9x-$(DATE).hex:i + BACKUP_ARGS += -U flash:r:$(DATA_DIR)/opentx-$(DATE).hex:i endif install: all diff --git a/src/ardupilot.cpp b/src/ardupilot.cpp index 6b1021724..a82108c56 100644 --- a/src/ardupilot.cpp +++ b/src/ardupilot.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #include "menus.h" #define NB_BUF 2 diff --git a/src/ardupilot.h b/src/ardupilot.h index a0bb838d8..6d2e76d05 100644 --- a/src/ardupilot.h +++ b/src/ardupilot.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/audio_arm.cpp b/src/audio_arm.cpp index e4698d39c..2d474e761 100644 --- a/src/audio_arm.cpp +++ b/src/audio_arm.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" // Must NOT be in flash, PDC needs a RAM source. // Amplitude reduced to 30% to allow for voice volume diff --git a/src/audio_arm.h b/src/audio_arm.h index 312f72002..7f190dbb9 100644 --- a/src/audio_arm.h +++ b/src/audio_arm.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/audio_avr.cpp b/src/audio_avr.cpp index d4e3d6d19..77a58152f 100644 --- a/src/audio_avr.cpp +++ b/src/audio_avr.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" audioQueue::audioQueue() { diff --git a/src/audio_avr.h b/src/audio_avr.h index ccea5dcbb..91afaf599 100644 --- a/src/audio_avr.h +++ b/src/audio_avr.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/beeper.cpp b/src/beeper.cpp index fa249346e..46588b0c9 100644 --- a/src/beeper.cpp +++ b/src/beeper.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" uint8_t g_beepCnt; uint8_t beepAgain = 0; diff --git a/src/beeper.h b/src/beeper.h index 05e0d8f00..c6c20c002 100644 --- a/src/beeper.h +++ b/src/beeper.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/bmp.cpp b/src/bmp.cpp index 35c6b8b29..4e1bc1b3e 100644 --- a/src/bmp.cpp +++ b/src/bmp.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" const pm_char * bmpLoad(uint8_t *dest, const char *filename, const xcoord_t width, const uint8_t height) { diff --git a/src/debug.cpp b/src/debug.cpp index f4fba14e1..fccb6e492 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" #include #include "fifo.h" diff --git a/src/debug.h b/src/debug.h index 6a8b156f8..507bc329a 100644 --- a/src/debug.h +++ b/src/debug.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/eeprom_common.cpp b/src/eeprom_common.cpp index 2f4d0271a..5f4d1cda6 100644 --- a/src/eeprom_common.cpp +++ b/src/eeprom_common.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -35,7 +35,7 @@ */ #include -#include "open9x.h" +#include "opentx.h" #include "inttypes.h" #include "string.h" diff --git a/src/eeprom_common.h b/src/eeprom_common.h index ed968d18f..3d2432903 100644 --- a/src/eeprom_common.h +++ b/src/eeprom_common.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/eeprom_conversions.cpp b/src/eeprom_conversions.cpp index 2d9ec255b..a73413a20 100644 --- a/src/eeprom_conversions.cpp +++ b/src/eeprom_conversions.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" PACK(typedef struct { uint8_t destCh; diff --git a/src/eeprom_raw.cpp b/src/eeprom_raw.cpp index 0ad2b5c92..5ae53dfb8 100644 --- a/src/eeprom_raw.cpp +++ b/src/eeprom_raw.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -35,7 +35,7 @@ */ #include -#include "open9x.h" +#include "opentx.h" #include "inttypes.h" #include "string.h" diff --git a/src/eeprom_raw.h b/src/eeprom_raw.h index f892b287c..6c09f3d80 100644 --- a/src/eeprom_raw.h +++ b/src/eeprom_raw.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/eeprom_rlc.cpp b/src/eeprom_rlc.cpp index e6ef83cff..220560b42 100644 --- a/src/eeprom_rlc.cpp +++ b/src/eeprom_rlc.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #include "stdio.h" #include "inttypes.h" #include "string.h" diff --git a/src/eeprom_rlc.h b/src/eeprom_rlc.h index 056ec2dc7..c3aef9179 100644 --- a/src/eeprom_rlc.h +++ b/src/eeprom_rlc.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/fifo.h b/src/fifo.h index 0b2158ebb..d7ff63601 100644 --- a/src/fifo.h +++ b/src/fifo.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/frsky.cpp b/src/frsky.cpp index 43e5ea1c2..35d160dcf 100644 --- a/src/frsky.cpp +++ b/src/frsky.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #include "menus.h" // Enumerate FrSky packet codes diff --git a/src/frsky.h b/src/frsky.h index 1dd1b095d..77ec20564 100644 --- a/src/frsky.h +++ b/src/frsky.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/general_menus.cpp b/src/general_menus.cpp index b6d41ea5e..42ffde53d 100644 --- a/src/general_menus.cpp +++ b/src/general_menus.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" const pm_uchar sticks[] PROGMEM = { #include "sticks.lbm" diff --git a/src/gruvin9x/board_gruvin9x.cpp b/src/gruvin9x/board_gruvin9x.cpp index fd644fb24..f9406d149 100644 --- a/src/gruvin9x/board_gruvin9x.cpp +++ b/src/gruvin9x/board_gruvin9x.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" #ifndef SIMU inline void boardInit() diff --git a/src/gruvin9x/board_gruvin9x.h b/src/gruvin9x/board_gruvin9x.h index c6e6d4bcc..a0e1de280 100644 --- a/src/gruvin9x/board_gruvin9x.h +++ b/src/gruvin9x/board_gruvin9x.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/gruvin9x/diskio.cpp b/src/gruvin9x/diskio.cpp index 21b231e97..a304efe81 100644 --- a/src/gruvin9x/diskio.cpp +++ b/src/gruvin9x/diskio.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -41,7 +41,7 @@ /* are platform dependent. */ /*-----------------------------------------------------------------------*/ -#include "../open9x.h" +#include "../opentx.h" #include "../FatFs/diskio.h" /* Definitions for MMC/SDC command */ diff --git a/src/gruvin9x/rtc_driver.cpp b/src/gruvin9x/rtc_driver.cpp index 7b85d8b1e..d1cb011b4 100644 --- a/src/gruvin9x/rtc_driver.cpp +++ b/src/gruvin9x/rtc_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -38,7 +38,7 @@ /*--------------------------------------------------------------------------*/ /* RTC controls */ -#include "../open9x.h" +#include "../opentx.h" #include "../FatFs/integer.h" typedef struct { diff --git a/src/gruvin9x/somo14d.cpp b/src/gruvin9x/somo14d.cpp index e8ef77ab7..0e1bd86cd 100644 --- a/src/gruvin9x/somo14d.cpp +++ b/src/gruvin9x/somo14d.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -43,7 +43,7 @@ old DSM2 code) which seemed to much for the interrupt. */ -#include "../open9x.h" +#include "../opentx.h" // Start and stop bits need to be 2ms in duration. Start bit is low, stop bit is high #define SOMOSSBIT 5 //The 2ms of a stop/start bit diff --git a/src/gruvin9x/somo14d.h b/src/gruvin9x/somo14d.h index 0130fb48a..399ad38b7 100644 --- a/src/gruvin9x/somo14d.h +++ b/src/gruvin9x/somo14d.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/gtests.cpp b/src/gtests.cpp index 6c8d71804..2913bf003 100644 --- a/src/gtests.cpp +++ b/src/gtests.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -36,7 +36,7 @@ #include #include -#include "open9x.h" +#include "opentx.h" void doMixerCalculations(); diff --git a/src/haptic.cpp b/src/haptic.cpp index d3e99d8c2..bb20b5102 100644 --- a/src/haptic.cpp +++ b/src/haptic.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" hapticQueue::hapticQueue() { diff --git a/src/haptic.h b/src/haptic.h index 2630cd3ac..9a74acf4b 100644 --- a/src/haptic.h +++ b/src/haptic.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/jeti.cpp b/src/jeti.cpp index e25aad708..76aa2653b 100644 --- a/src/jeti.cpp +++ b/src/jeti.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" uint8_t jetiRxBuffer[32]; uint8_t jetiReady; diff --git a/src/jeti.h b/src/jeti.h index f73a5bf91..de52680ab 100644 --- a/src/jeti.h +++ b/src/jeti.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/keys.cpp b/src/keys.cpp index 5604de10b..ad4f24475 100644 --- a/src/keys.cpp +++ b/src/keys.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" uint8_t s_evt; diff --git a/src/lcd.cpp b/src/lcd.cpp index e526de977..d3a575262 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" uint8_t displayBuf[DISPLAY_BUF_SIZE]; #define DISPLAY_END (displayBuf+DISPLAY_PLAN_SIZE) diff --git a/src/lcd.h b/src/lcd.h index aab315602..e9f652d57 100644 --- a/src/lcd.h +++ b/src/lcd.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/logs.cpp b/src/logs.cpp index 4c59eb58b..b63347ae6 100644 --- a/src/logs.cpp +++ b/src/logs.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #include "FatFs/ff.h" FIL g_oLogFile = {0}; diff --git a/src/main_views.cpp b/src/main_views.cpp index cc19ea45a..3ad8989ee 100644 --- a/src/main_views.cpp +++ b/src/main_views.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #if LCD_W >= 212 #define BIGSIZE MIDSIZE diff --git a/src/mavlink.cpp b/src/mavlink.cpp index bd75bdb75..5d73142e2 100644 --- a/src/mavlink.cpp +++ b/src/mavlink.cpp @@ -18,7 +18,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -35,7 +35,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #include "menus.h" #include "serial.h" #include "mavlink.h" diff --git a/src/mega2560/board_mega2560.cpp b/src/mega2560/board_mega2560.cpp index b5b20667d..49a767085 100644 --- a/src/mega2560/board_mega2560.cpp +++ b/src/mega2560/board_mega2560.cpp @@ -1,4 +1,4 @@ -#include "../open9x.h" +#include "../opentx.h" #define PIN_MODE_MASK 0x0003 #define PIN_INPUT 0x0000 diff --git a/src/mega2560/io_mega2560.h b/src/mega2560/io_mega2560.h index 0e8b8553d..f95cbe855 100644 --- a/src/mega2560/io_mega2560.h +++ b/src/mega2560/io_mega2560.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/mega2560/lcd_driver_ST7565R.cpp b/src/mega2560/lcd_driver_ST7565R.cpp index e32ee19ed..33050fbeb 100644 --- a/src/mega2560/lcd_driver_ST7565R.cpp +++ b/src/mega2560/lcd_driver_ST7565R.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #define delay_1us() _delay_us(1) void delay_1_5us(int ms) diff --git a/src/menus.cpp b/src/menus.cpp index f138c62e8..d0274a74d 100644 --- a/src/menus.cpp +++ b/src/menus.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" pgofs_t s_pgOfs; int8_t s_editMode; diff --git a/src/menus.h b/src/menus.h index 69d845d3d..d7b88dbfa 100644 --- a/src/menus.h +++ b/src/menus.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/model_menus.cpp b/src/model_menus.cpp index 23db0d900..3249308df 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #define WCHART 32 #define X0 (LCD_W-WCHART-2) diff --git a/src/monitors_views.cpp b/src/monitors_views.cpp index 988629646..fb853f85f 100644 --- a/src/monitors_views.cpp +++ b/src/monitors_views.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" void menuChannelsMonitor(uint8_t event) { diff --git a/src/myeeprom.h b/src/myeeprom.h index e7eeeb221..ee2b72fdd 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/nmea.cpp b/src/nmea.cpp index bc2783535..4162d58c1 100644 --- a/src/nmea.cpp +++ b/src/nmea.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #include "menus.h" #define LG_BUF 14 diff --git a/src/nmea.h b/src/nmea.h index 8e05968ca..48559f3ef 100644 --- a/src/nmea.h +++ b/src/nmea.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/open9x.cpp b/src/opentx.cpp similarity index 96% rename from src/open9x.cpp rename to src/opentx.cpp index 50ab23f43..1ddfd8b4b 100644 --- a/src/open9x.cpp +++ b/src/opentx.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #if defined(CPUARM) #define MIXER_STACK_SIZE 500 @@ -3874,7 +3874,7 @@ uint16_t stack_free() #define OPEN9X_INIT_ARGS #endif -inline void open9xInit(OPEN9X_INIT_ARGS) +inline void opentxInit(OPEN9X_INIT_ARGS) { #if defined(PCBX9D) BACKLIGHT_ON(); @@ -3995,7 +3995,7 @@ void mixerTask(void * pdata) void menusTask(void * pdata) { - open9xInit(); + opentxInit(); while (pwrCheck() != e_power_off) { perMain(); @@ -4111,7 +4111,7 @@ int main(void) #endif #if !defined(CPUARM) - open9xInit(mcusr); + opentxInit(mcusr); #endif #if defined(CPUARM) diff --git a/src/open9x.h b/src/opentx.h similarity index 99% rename from src/open9x.h rename to src/opentx.h index ffb89d1d8..28d0f5527 100644 --- a/src/open9x.h +++ b/src/opentx.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,8 +34,8 @@ * */ -#ifndef open9x_h -#define open9x_h +#ifndef opentx_h +#define opentx_h #include #include diff --git a/src/pgmtypes.h b/src/pgmtypes.h index 4819c6bdc..b2dca0e03 100644 --- a/src/pgmtypes.h +++ b/src/pgmtypes.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/pulses_arm.cpp b/src/pulses_arm.cpp index 4d9fbb7af..4523a0985 100644 --- a/src/pulses_arm.cpp +++ b/src/pulses_arm.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" uint8_t s_pulses_paused = 0; uint8_t s_current_protocol = 255; diff --git a/src/pulses_arm.h b/src/pulses_arm.h index 99ac566d5..868057ca6 100644 --- a/src/pulses_arm.h +++ b/src/pulses_arm.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/pulses_avr.cpp b/src/pulses_avr.cpp index f82ec2d8d..4ae4d1f3a 100644 --- a/src/pulses_avr.cpp +++ b/src/pulses_avr.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" uint16_t nextMixerEndTime = 0; #define SCHEDULE_MIXER_END(delay) nextMixerEndTime = getTmr16KHz() + (delay) - 2*16/*2ms*/ diff --git a/src/pulses_avr.h b/src/pulses_avr.h index ddbd16b92..f6d28b909 100644 --- a/src/pulses_avr.h +++ b/src/pulses_avr.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/rotarysw.cpp b/src/rotarysw.cpp index 07439436e..b4da932cd 100644 --- a/src/rotarysw.cpp +++ b/src/rotarysw.cpp @@ -12,7 +12,7 @@ * GNU General Public License for more details. * */ -#include "open9x.h" +#include "opentx.h" #include "menus.h" #define CTIME_ROTARY_ANIM 500 diff --git a/src/rtc.cpp b/src/rtc.cpp index cff5496ec..1dad84604 100644 --- a/src/rtc.cpp +++ b/src/rtc.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -35,7 +35,7 @@ */ #include -#include "open9x.h" +#include "opentx.h" extern void rtcdriver_settime(struct gtm * t); diff --git a/src/rtc.h b/src/rtc.h index a42abe2b6..7a2a216e6 100644 --- a/src/rtc.h +++ b/src/rtc.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/sdcard.h b/src/sdcard.h index a10bc50ef..f79310b91 100644 --- a/src/sdcard.h +++ b/src/sdcard.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/serial.cpp b/src/serial.cpp index b5e1deeff..7f0fadf6f 100644 --- a/src/serial.cpp +++ b/src/serial.cpp @@ -14,7 +14,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #include "serial.h" /* diff --git a/src/simpgmspace.cpp b/src/simpgmspace.cpp index 5168fc88c..e2e17f41e 100644 --- a/src/simpgmspace.cpp +++ b/src/simpgmspace.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #include #include #include diff --git a/src/simpgmspace.h b/src/simpgmspace.h index 7f010fe88..8783eac5b 100644 --- a/src/simpgmspace.h +++ b/src/simpgmspace.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/simu.cpp b/src/simu.cpp index ba6303ce9..eb191b509 100644 --- a/src/simu.cpp +++ b/src/simu.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -39,7 +39,7 @@ #include "FXPNGImage.h" #include #include "fxkeys.h" -#include "open9x.h" +#include "opentx.h" #include "menus.h" #include #include diff --git a/src/sky9x/adc_driver.cpp b/src/sky9x/adc_driver.cpp index 92f0ffdcb..204c9c968 100644 --- a/src/sky9x/adc_driver.cpp +++ b/src/sky9x/adc_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" uint16_t Analog_values[NUMBER_ANALOG]; diff --git a/src/sky9x/audio_driver.cpp b/src/sky9x/audio_driver.cpp index 451678a83..4775353c6 100644 --- a/src/sky9x/audio_driver.cpp +++ b/src/sky9x/audio_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" uint32_t currentFrequency = 0; diff --git a/src/sky9x/audio_driver.h b/src/sky9x/audio_driver.h index 5782ee4be..349100983 100644 --- a/src/sky9x/audio_driver.h +++ b/src/sky9x/audio_driver.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/sky9x/bluetooth.cpp b/src/sky9x/bluetooth.cpp index cdd05f778..7671f6c28 100644 --- a/src/sky9x/bluetooth.cpp +++ b/src/sky9x/bluetooth.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" #include "../fifo.h" void btSetBaudrate(uint32_t index) diff --git a/src/sky9x/board.h b/src/sky9x/board.h index 2d738524b..96a61ff19 100644 --- a/src/sky9x/board.h +++ b/src/sky9x/board.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/sky9x/board_sky9x.cpp b/src/sky9x/board_sky9x.cpp index f0827c9b3..f1a2dbc44 100644 --- a/src/sky9x/board_sky9x.cpp +++ b/src/sky9x/board_sky9x.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" #if defined(DEBUG) && !defined(SIMU) void DEBUG_UART_Configure( uint32_t baudrate, uint32_t masterClock); diff --git a/src/sky9x/board_sky9x.h b/src/sky9x/board_sky9x.h index 6c62f5101..1ff0f603b 100644 --- a/src/sky9x/board_sky9x.h +++ b/src/sky9x/board_sky9x.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/sky9x/buzzer_driver.cpp b/src/sky9x/buzzer_driver.cpp index e0d3b3114..4b86810a6 100644 --- a/src/sky9x/buzzer_driver.cpp +++ b/src/sky9x/buzzer_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" volatile uint8_t buzzerCount ; diff --git a/src/sky9x/coproc_driver.cpp b/src/sky9x/coproc_driver.cpp index bb0f1dd97..2327383b2 100644 --- a/src/sky9x/coproc_driver.cpp +++ b/src/sky9x/coproc_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" int8_t coprocVolumeRequired ; uint8_t coprocVolumeReadPending ; diff --git a/src/sky9x/debug_driver.cpp b/src/sky9x/debug_driver.cpp index db6a6df68..388da236e 100644 --- a/src/sky9x/debug_driver.cpp +++ b/src/sky9x/debug_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" #include #if !defined(SIMU) diff --git a/src/sky9x/diskio.cpp b/src/sky9x/diskio.cpp index a844b5b0c..b35ea28fb 100644 --- a/src/sky9x/diskio.cpp +++ b/src/sky9x/diskio.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/sky9x/eeprom_driver.cpp b/src/sky9x/eeprom_driver.cpp index cfbcf271d..afded6a31 100644 --- a/src/sky9x/eeprom_driver.cpp +++ b/src/sky9x/eeprom_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" uint32_t spi_PDC_action( register uint8_t *command, register uint8_t *tx, register uint8_t *rx, register uint32_t comlen, register uint32_t count ) { diff --git a/src/sky9x/haptic_driver.cpp b/src/sky9x/haptic_driver.cpp index b94f6072d..8feadc79c 100644 --- a/src/sky9x/haptic_driver.cpp +++ b/src/sky9x/haptic_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" void hapticOff() { diff --git a/src/sky9x/keys_driver.cpp b/src/sky9x/keys_driver.cpp index 57bc7cdbc..099cd6b48 100644 --- a/src/sky9x/keys_driver.cpp +++ b/src/sky9x/keys_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" // keys: diff --git a/src/sky9x/lcd_driver.cpp b/src/sky9x/lcd_driver.cpp index eb5fd3faf..9fa3a85e3 100644 --- a/src/sky9x/lcd_driver.cpp +++ b/src/sky9x/lcd_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" // LCD i/o pins // LCD_RES PC27 diff --git a/src/sky9x/massstorage.cpp b/src/sky9x/massstorage.cpp index 4af70376b..ba8b87623 100644 --- a/src/sky9x/massstorage.cpp +++ b/src/sky9x/massstorage.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" #ifndef SIMU diff --git a/src/sky9x/pulses_driver.cpp b/src/sky9x/pulses_driver.cpp index c8e4d5b1c..ee0ff4701 100644 --- a/src/sky9x/pulses_driver.cpp +++ b/src/sky9x/pulses_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" void init_main_ppm( uint32_t period, uint32_t out_enable ) { diff --git a/src/sky9x/pwr_driver.cpp b/src/sky9x/pwr_driver.cpp index ca772a621..c204cef77 100644 --- a/src/sky9x/pwr_driver.cpp +++ b/src/sky9x/pwr_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" uint32_t pwrCheck() { diff --git a/src/sky9x/rotenc_driver.cpp b/src/sky9x/rotenc_driver.cpp index c46f5ee5e..62cf320da 100644 --- a/src/sky9x/rotenc_driver.cpp +++ b/src/sky9x/rotenc_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" void rotencInit() { diff --git a/src/sky9x/rtc_driver.cpp b/src/sky9x/rtc_driver.cpp index 720d834f5..4e72f2a93 100644 --- a/src/sky9x/rtc_driver.cpp +++ b/src/sky9x/rtc_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" struct t_i2cTime { diff --git a/src/sky9x/sdcard_driver.cpp b/src/sky9x/sdcard_driver.cpp index 51a27c84d..1b878577b 100644 --- a/src/sky9x/sdcard_driver.cpp +++ b/src/sky9x/sdcard_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/stamp.cpp b/src/stamp.cpp index 137ee153c..7bd30cb0f 100644 --- a/src/stamp.cpp +++ b/src/stamp.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,8 +34,8 @@ * */ -#include "open9x.h" -#include "stamp-open9x.h" +#include "opentx.h" +#include "stamp-opentx.h" #define STR2(s) #s #define DEFNUMSTR(s) STR2(s) diff --git a/src/statistics_views.cpp b/src/statistics_views.cpp index f8a83a951..b217be06a 100644 --- a/src/statistics_views.cpp +++ b/src/statistics_views.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" void menuStatisticsView(uint8_t event) { diff --git a/src/stock/board_stock.cpp b/src/stock/board_stock.cpp index c798c505b..fd9a81c14 100644 --- a/src/stock/board_stock.cpp +++ b/src/stock/board_stock.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" #if defined(ROTARY_ENCODER_NAVIGATION) diff --git a/src/stock/board_stock.h b/src/stock/board_stock.h index a1ba629f0..c90dba2ee 100644 --- a/src/stock/board_stock.h +++ b/src/stock/board_stock.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/stock/lcd_driver.cpp b/src/stock/lcd_driver.cpp index 924b6bd74..349d5abd4 100644 --- a/src/stock/lcd_driver.cpp +++ b/src/stock/lcd_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #define delay_1us() _delay_us(1) void delay_1_5us(int ms) diff --git a/src/stock/voice.cpp b/src/stock/voice.cpp index c9a20a002..f075ec914 100644 --- a/src/stock/voice.cpp +++ b/src/stock/voice.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" struct t_voice Voice ; diff --git a/src/stock/voice.h b/src/stock/voice.h index a3c1881f7..8df06930e 100644 --- a/src/stock/voice.h +++ b/src/stock/voice.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/templates.cpp b/src/templates.cpp index 994e19174..821db07c4 100644 --- a/src/templates.cpp +++ b/src/templates.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -54,7 +54,7 @@ * */ -#include "open9x.h" +#include "opentx.h" MixData* setDest(uint8_t dch, uint8_t src, bool clear=false) { diff --git a/src/templates.h b/src/templates.h index a24ef7779..3accc39df 100644 --- a/src/templates.h +++ b/src/templates.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/translations.cpp b/src/translations.cpp index a2be89452..bcfa38115 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "open9x.h" +#include "opentx.h" #define ISTR(x) LEN_##x TR_##x diff --git a/src/translations.h b/src/translations.h index aeb4273b7..19a8679ce 100644 --- a/src/translations.h +++ b/src/translations.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/translations/cz.h b/src/translations/cz.h index 598ffff0b..59b3167b5 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -3,7 +3,7 @@ * - Bertrand Songis * - Martin Hotar * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/translations/de.h b/src/translations/de.h index 3f7296c95..1c184b87b 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -5,7 +5,7 @@ * - Bertrand Songis * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/translations/en.h b/src/translations/en.h index 8055d8c44..b1014fd4e 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/translations/es.h b/src/translations/es.h index a92fa1e71..0ea6935e0 100644 --- a/src/translations/es.h +++ b/src/translations/es.h @@ -3,7 +3,7 @@ * - Andre Bernet * - Bertrand Songis * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/translations/fr.h b/src/translations/fr.h index d6e554ceb..e6c78a746 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/translations/it.h b/src/translations/it.h index 6426ba7dd..a0bea7d0c 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -3,7 +3,7 @@ * - Bertrand Songis * - Romolo Manfredini * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/translations/se.h b/src/translations/se.h index 6c8d1fc22..e6cca176f 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -3,7 +3,7 @@ * - Bertrand Songis * - Kjell Kernen * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/translations/tts_cz.cpp b/src/translations/tts_cz.cpp index eda3f7dd8..bc1734445 100644 --- a/src/translations/tts_cz.cpp +++ b/src/translations/tts_cz.cpp @@ -3,7 +3,7 @@ * - Bertrand Songis * - Martin Hotar * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -20,7 +20,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" enum CzechPrompts { PROMPT_NUMBERS_BASE = 0, diff --git a/src/translations/tts_de.cpp b/src/translations/tts_de.cpp index 391c42eab..f097616eb 100644 --- a/src/translations/tts_de.cpp +++ b/src/translations/tts_de.cpp @@ -5,7 +5,7 @@ * - Bertrand Songis * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -22,7 +22,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" enum GermanPrompts { PROMPT_NUMBERS_BASE = 0, diff --git a/src/translations/tts_en.cpp b/src/translations/tts_en.cpp index 5b10129c2..802f4be11 100644 --- a/src/translations/tts_en.cpp +++ b/src/translations/tts_en.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" enum EnglishPrompts { PROMPT_NUMBERS_BASE = 0, diff --git a/src/translations/tts_es.cpp b/src/translations/tts_es.cpp index e44fbbeff..6237c25a9 100644 --- a/src/translations/tts_es.cpp +++ b/src/translations/tts_es.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" enum SpanishPrompts { PROMPT_NUMBERS_BASE = 0, diff --git a/src/translations/tts_fr.cpp b/src/translations/tts_fr.cpp index 8817f41f8..7189fe462 100644 --- a/src/translations/tts_fr.cpp +++ b/src/translations/tts_fr.cpp @@ -3,7 +3,7 @@ * - Andre Bernet * - Bertrand Songis * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -20,7 +20,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" enum FrenchPrompts { PROMPT_NUMBERS_BASE = 0, diff --git a/src/translations/tts_it.cpp b/src/translations/tts_it.cpp index dd953d577..f12ab0879 100644 --- a/src/translations/tts_it.cpp +++ b/src/translations/tts_it.cpp @@ -3,7 +3,7 @@ * - Bertrand Songis * - Romolo Manfredini * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -20,7 +20,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" enum ItalianPrompts { PROMPT_NUMBERS_BASE = 0, diff --git a/src/translations/tts_pt.cpp b/src/translations/tts_pt.cpp index 7985328b1..f0a10e13e 100644 --- a/src/translations/tts_pt.cpp +++ b/src/translations/tts_pt.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" enum PortuguesePrompts { PROMPT_NUMBERS_BASE = 0, diff --git a/src/translations/tts_sk.cpp b/src/translations/tts_sk.cpp index 3e5eef6ce..74db2f861 100644 --- a/src/translations/tts_sk.cpp +++ b/src/translations/tts_sk.cpp @@ -18,7 +18,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -35,7 +35,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" enum SlovakPrompts { PROMPT_NUMBERS_BASE = 0, diff --git a/src/x9d/adc_driver.cpp b/src/x9d/adc_driver.cpp index fd7a2ad7e..43212b18a 100644 --- a/src/x9d/adc_driver.cpp +++ b/src/x9d/adc_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" #define PIN_ANALOG 0x0003 #define PIN_PORTA 0x0000 diff --git a/src/x9d/aspi.cpp b/src/x9d/aspi.cpp index ecdf0e63e..9f052156f 100644 --- a/src/x9d/aspi.cpp +++ b/src/x9d/aspi.cpp @@ -10,7 +10,7 @@ ****************************************************************************** */ -#include "../open9x.h" +#include "../opentx.h" /** **********send command to lcd************** diff --git a/src/x9d/audio_driver.cpp b/src/x9d/audio_driver.cpp index f64608514..f3723f755 100644 --- a/src/x9d/audio_driver.cpp +++ b/src/x9d/audio_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" bool dacIdle = true; uint32_t currentFrequency = 0; diff --git a/src/x9d/audio_driver.h b/src/x9d/audio_driver.h index b9638016a..9fdfde393 100644 --- a/src/x9d/audio_driver.h +++ b/src/x9d/audio_driver.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/x9d/board_x9d.cpp b/src/x9d/board_x9d.cpp index 2e31e6954..d70450cc7 100644 --- a/src/x9d/board_x9d.cpp +++ b/src/x9d/board_x9d.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" extern "C" { #include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h" } diff --git a/src/x9d/board_x9d.h b/src/x9d/board_x9d.h index 9b60d4e40..47ea4e19d 100644 --- a/src/x9d/board_x9d.h +++ b/src/x9d/board_x9d.h @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/x9d/delays.cpp b/src/x9d/delays.cpp index 9c66ae662..5b9d32596 100644 --- a/src/x9d/delays.cpp +++ b/src/x9d/delays.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" void delaysInit(void) { diff --git a/src/x9d/diskio.cpp b/src/x9d/diskio.cpp index aeb9798fa..89291aac7 100644 --- a/src/x9d/diskio.cpp +++ b/src/x9d/diskio.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by diff --git a/src/x9d/i2c.c b/src/x9d/i2c.c index fc2815a91..810e8ebb5 100644 --- a/src/x9d/i2c.c +++ b/src/x9d/i2c.c @@ -10,7 +10,7 @@ ****************************************************************************** */ -#include "../open9x.h" +#include "../opentx.h" #define I2C_delay() delay_01us(100); diff --git a/src/x9d/keys_driver.cpp b/src/x9d/keys_driver.cpp index 5ab40590e..87f276080 100644 --- a/src/x9d/keys_driver.cpp +++ b/src/x9d/keys_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" // TODO FrSky code included PIN_BIND and PIN_POWER diff --git a/src/x9d/lcd_driver.cpp b/src/x9d/lcd_driver.cpp index 595953c15..6fdefede5 100644 --- a/src/x9d/lcd_driver.cpp +++ b/src/x9d/lcd_driver.cpp @@ -9,7 +9,7 @@ ****************************************************************************** */ -#include "../open9x.h" +#include "../opentx.h" #define WriteData(x) AspiData(x) #define WriteCommand(x) AspiCmd(x) diff --git a/src/x9d/pulses_driver.cpp b/src/x9d/pulses_driver.cpp index 61502e4ef..5deb168cc 100644 --- a/src/x9d/pulses_driver.cpp +++ b/src/x9d/pulses_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" // TODO not here! void setupPulses(); diff --git a/src/x9d/pwr_driver.cpp b/src/x9d/pwr_driver.cpp index 7ddf15f5d..5138d7ead 100644 --- a/src/x9d/pwr_driver.cpp +++ b/src/x9d/pwr_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" void pwrOff() { diff --git a/src/x9d/rtc_driver.cpp b/src/x9d/rtc_driver.cpp index 8056dbfb2..7a705d457 100644 --- a/src/x9d/rtc_driver.cpp +++ b/src/x9d/rtc_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" void rtcSetTime(struct gtm * t) { diff --git a/src/x9d/sport_driver.cpp b/src/x9d/sport_driver.cpp index 9e2ac7310..91cba8419 100644 --- a/src/x9d/sport_driver.cpp +++ b/src/x9d/sport_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" void sportInit(void) { diff --git a/src/x9d/trainer_driver.cpp b/src/x9d/trainer_driver.cpp index 7ed4ac96d..86e2e3227 100644 --- a/src/x9d/trainer_driver.cpp +++ b/src/x9d/trainer_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" uint16_t TrainerPpmStream[20] = { diff --git a/src/x9d/uart_driver.cpp b/src/x9d/uart_driver.cpp index 044bd014a..f27b42879 100644 --- a/src/x9d/uart_driver.cpp +++ b/src/x9d/uart_driver.cpp @@ -17,7 +17,7 @@ * - Romolo Manfredini * - Thomas Husterer * - * open9x is based on code named + * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/, * and the original (and ongoing) project by @@ -34,7 +34,7 @@ * */ -#include "../open9x.h" +#include "../opentx.h" void uartInit(uint32_t baudrate) { diff --git a/src/x9d_logo.bmp b/src/x9d_logo.bmp index 978ddaa4e9efe1e444ea2675d3526e8b08b1a72a..42e792dc8e6bd98cd0f6d017792afb3cc791f6bc 100644 GIT binary patch delta 235 zcmdlcu}xybK9nQX@@EzSg0%nHmLE=Cc3)!zX`aYu#MTewYOS9c*35 delta 267 zcmdlcu}xybK9P|G&k`Ao=