From 24167015705ae831692b95735968b04a876f935e Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 4 Apr 2014 23:34:48 -0700 Subject: [PATCH] altos: Rename 'core' to 'kernel' core remains a bad name to use -- dirvish skips files (and directories, it seems) with that name. Signed-off-by: Keith Packard --- configure.ac | 2 +- src/avr-demo/Makefile | 4 ++-- src/cc1111/Makefile.cc1111 | 2 +- src/{core => kernel}/altitude.h | 0 src/{core => kernel}/ao.h | 0 src/{core => kernel}/ao_adc.h | 0 src/{core => kernel}/ao_aes.h | 0 src/{core => kernel}/ao_balloon.c | 0 src/{core => kernel}/ao_beep.h | 0 src/{core => kernel}/ao_btm.h | 0 src/{core => kernel}/ao_cmd.c | 0 src/{core => kernel}/ao_companion.h | 0 src/{core => kernel}/ao_config.c | 0 src/{core => kernel}/ao_config.h | 0 src/{core => kernel}/ao_convert.c | 0 src/{core => kernel}/ao_convert_pa.c | 0 src/{core => kernel}/ao_convert_pa_test.c | 0 src/{core => kernel}/ao_convert_test.c | 0 src/{core => kernel}/ao_convert_volt.c | 0 src/{core => kernel}/ao_data.c | 0 src/{core => kernel}/ao_data.h | 0 src/{core => kernel}/ao_dbg.h | 0 src/{core => kernel}/ao_debounce.c | 0 src/{core => kernel}/ao_debounce.h | 0 src/{core => kernel}/ao_ee_fake.c | 0 src/{core => kernel}/ao_eeprom.h | 0 src/{core => kernel}/ao_fec.h | 0 src/{core => kernel}/ao_fec_rx.c | 0 src/{core => kernel}/ao_fec_tx.c | 0 src/{core => kernel}/ao_flight.c | 0 src/{core => kernel}/ao_flight.h | 0 src/{core => kernel}/ao_flight_nano.c | 0 src/{core => kernel}/ao_freq.c | 0 src/{core => kernel}/ao_gps_print.c | 0 src/{core => kernel}/ao_gps_report.c | 0 src/{core => kernel}/ao_gps_report_mega.c | 0 src/{core => kernel}/ao_gps_report_metrum.c | 0 src/{core => kernel}/ao_gps_show.c | 0 src/{core => kernel}/ao_host.h | 0 src/{core => kernel}/ao_ignite.c | 0 src/{core => kernel}/ao_int64.c | 0 src/{core => kernel}/ao_int64.h | 0 src/{core => kernel}/ao_kalman.c | 0 src/{core => kernel}/ao_lcd.h | 0 src/{core => kernel}/ao_led.h | 0 src/{core => kernel}/ao_list.h | 0 src/{core => kernel}/ao_log.c | 0 src/{core => kernel}/ao_log.h | 0 src/{core => kernel}/ao_log_big.c | 0 src/{core => kernel}/ao_log_mega.c | 0 src/{core => kernel}/ao_log_metrum.c | 0 src/{core => kernel}/ao_log_micro.c | 0 src/{core => kernel}/ao_log_micro.h | 0 src/{core => kernel}/ao_log_mini.c | 0 src/{core => kernel}/ao_log_single.c | 0 src/{core => kernel}/ao_log_telem.c | 0 src/{core => kernel}/ao_log_telescience.c | 0 src/{core => kernel}/ao_log_tiny.c | 0 src/{core => kernel}/ao_microflight.c | 0 src/{core => kernel}/ao_microkalman.c | 0 src/{core => kernel}/ao_monitor.c | 0 src/{core => kernel}/ao_mutex.c | 0 src/{core => kernel}/ao_notask.c | 0 src/{core => kernel}/ao_notask.h | 0 src/{core => kernel}/ao_packet.h | 0 src/{core => kernel}/ao_panic.c | 0 src/{core => kernel}/ao_product.c | 0 src/{core => kernel}/ao_pyro.c | 0 src/{core => kernel}/ao_pyro.h | 0 src/{core => kernel}/ao_quaternion.h | 0 src/{core => kernel}/ao_radio_cmac.c | 0 src/{core => kernel}/ao_radio_cmac.h | 0 src/{core => kernel}/ao_radio_cmac_cmd.c | 0 src/{core => kernel}/ao_radio_cmac_cmd.h | 0 src/{core => kernel}/ao_report.c | 0 src/{core => kernel}/ao_report_micro.c | 0 src/{core => kernel}/ao_rssi.c | 0 src/{core => kernel}/ao_sample.c | 0 src/{core => kernel}/ao_sample.h | 0 src/{core => kernel}/ao_sample_profile.c | 0 src/{core => kernel}/ao_sample_profile.h | 0 src/{core => kernel}/ao_send_packet.c | 0 src/{core => kernel}/ao_send_packet.h | 0 src/{core => kernel}/ao_serial.h | 0 src/{core => kernel}/ao_sqrt.c | 0 src/{core => kernel}/ao_state.c | 0 src/{core => kernel}/ao_stdio.c | 0 src/{core => kernel}/ao_storage.c | 0 src/{core => kernel}/ao_storage.h | 0 src/{core => kernel}/ao_task.c | 0 src/{core => kernel}/ao_task.h | 0 src/{core => kernel}/ao_telem.h | 0 src/{core => kernel}/ao_telemetry.c | 0 src/{core => kernel}/ao_telemetry.h | 0 src/{core => kernel}/ao_usb.h | 0 src/lpc/Makefile-lpc.defs | 4 ++-- src/micropeak/Makefile | 4 ++-- src/nanopeak-v0.1/Makefile | 4 ++-- src/product/Makefile.teledongle | 4 ++-- src/product/Makefile.telelaunch | 4 ++-- src/product/Makefile.telemetrum | 4 ++-- src/product/Makefile.telemini | 4 ++-- src/product/Makefile.telenano | 4 ++-- src/spiradio-v0.1/.sdcdbrc | 2 +- src/spiradio-v0.1/Makefile | 4 ++-- src/stm-bringup/Makefile | 2 +- src/stm/Makefile-flash.defs | 4 ++-- src/stm/Makefile.defs | 4 ++-- src/teleballoon-v1.1/Makefile | 4 ++-- src/telebt-v1.0/.sdcdbrc | 2 +- src/telebt-v1.0/Makefile | 4 ++-- src/telefire-v0.1/.sdcdbrc | 2 +- src/telefire-v0.1/Makefile | 4 ++-- src/telefire-v0.2/.sdcdbrc | 2 +- src/telefire-v0.2/Makefile | 4 ++-- src/telemetrum-v1.0/.sdcdbrc | 2 +- src/telemetrum-v1.1/.sdcdbrc | 2 +- src/telemini-v1.0/.sdcdbrc | 2 +- src/telemini-v2.0/.sdcdbrc | 2 +- src/telemini-v2.0/Makefile | 4 ++-- src/telepyro-v0.1/Makefile | 4 ++-- src/telescience-pwm/Makefile | 4 ++-- src/telescience-v0.1/Makefile | 4 ++-- src/teleshield-v0.1/Makefile | 4 ++-- src/teleterra-v0.2/.sdcdbrc | 2 +- src/teleterra-v0.2/Makefile | 4 ++-- src/test/Makefile | 6 +++--- src/tidongle/Makefile | 4 ++-- 128 files changed, 61 insertions(+), 61 deletions(-) rename src/{core => kernel}/altitude.h (100%) rename src/{core => kernel}/ao.h (100%) rename src/{core => kernel}/ao_adc.h (100%) rename src/{core => kernel}/ao_aes.h (100%) rename src/{core => kernel}/ao_balloon.c (100%) rename src/{core => kernel}/ao_beep.h (100%) rename src/{core => kernel}/ao_btm.h (100%) rename src/{core => kernel}/ao_cmd.c (100%) rename src/{core => kernel}/ao_companion.h (100%) rename src/{core => kernel}/ao_config.c (100%) rename src/{core => kernel}/ao_config.h (100%) rename src/{core => kernel}/ao_convert.c (100%) rename src/{core => kernel}/ao_convert_pa.c (100%) rename src/{core => kernel}/ao_convert_pa_test.c (100%) rename src/{core => kernel}/ao_convert_test.c (100%) rename src/{core => kernel}/ao_convert_volt.c (100%) rename src/{core => kernel}/ao_data.c (100%) rename src/{core => kernel}/ao_data.h (100%) rename src/{core => kernel}/ao_dbg.h (100%) rename src/{core => kernel}/ao_debounce.c (100%) rename src/{core => kernel}/ao_debounce.h (100%) rename src/{core => kernel}/ao_ee_fake.c (100%) rename src/{core => kernel}/ao_eeprom.h (100%) rename src/{core => kernel}/ao_fec.h (100%) rename src/{core => kernel}/ao_fec_rx.c (100%) rename src/{core => kernel}/ao_fec_tx.c (100%) rename src/{core => kernel}/ao_flight.c (100%) rename src/{core => kernel}/ao_flight.h (100%) rename src/{core => kernel}/ao_flight_nano.c (100%) rename src/{core => kernel}/ao_freq.c (100%) rename src/{core => kernel}/ao_gps_print.c (100%) rename src/{core => kernel}/ao_gps_report.c (100%) rename src/{core => kernel}/ao_gps_report_mega.c (100%) rename src/{core => kernel}/ao_gps_report_metrum.c (100%) rename src/{core => kernel}/ao_gps_show.c (100%) rename src/{core => kernel}/ao_host.h (100%) rename src/{core => kernel}/ao_ignite.c (100%) rename src/{core => kernel}/ao_int64.c (100%) rename src/{core => kernel}/ao_int64.h (100%) rename src/{core => kernel}/ao_kalman.c (100%) rename src/{core => kernel}/ao_lcd.h (100%) rename src/{core => kernel}/ao_led.h (100%) rename src/{core => kernel}/ao_list.h (100%) rename src/{core => kernel}/ao_log.c (100%) rename src/{core => kernel}/ao_log.h (100%) rename src/{core => kernel}/ao_log_big.c (100%) rename src/{core => kernel}/ao_log_mega.c (100%) rename src/{core => kernel}/ao_log_metrum.c (100%) rename src/{core => kernel}/ao_log_micro.c (100%) rename src/{core => kernel}/ao_log_micro.h (100%) rename src/{core => kernel}/ao_log_mini.c (100%) rename src/{core => kernel}/ao_log_single.c (100%) rename src/{core => kernel}/ao_log_telem.c (100%) rename src/{core => kernel}/ao_log_telescience.c (100%) rename src/{core => kernel}/ao_log_tiny.c (100%) rename src/{core => kernel}/ao_microflight.c (100%) rename src/{core => kernel}/ao_microkalman.c (100%) rename src/{core => kernel}/ao_monitor.c (100%) rename src/{core => kernel}/ao_mutex.c (100%) rename src/{core => kernel}/ao_notask.c (100%) rename src/{core => kernel}/ao_notask.h (100%) rename src/{core => kernel}/ao_packet.h (100%) rename src/{core => kernel}/ao_panic.c (100%) rename src/{core => kernel}/ao_product.c (100%) rename src/{core => kernel}/ao_pyro.c (100%) rename src/{core => kernel}/ao_pyro.h (100%) rename src/{core => kernel}/ao_quaternion.h (100%) rename src/{core => kernel}/ao_radio_cmac.c (100%) rename src/{core => kernel}/ao_radio_cmac.h (100%) rename src/{core => kernel}/ao_radio_cmac_cmd.c (100%) rename src/{core => kernel}/ao_radio_cmac_cmd.h (100%) rename src/{core => kernel}/ao_report.c (100%) rename src/{core => kernel}/ao_report_micro.c (100%) rename src/{core => kernel}/ao_rssi.c (100%) rename src/{core => kernel}/ao_sample.c (100%) rename src/{core => kernel}/ao_sample.h (100%) rename src/{core => kernel}/ao_sample_profile.c (100%) rename src/{core => kernel}/ao_sample_profile.h (100%) rename src/{core => kernel}/ao_send_packet.c (100%) rename src/{core => kernel}/ao_send_packet.h (100%) rename src/{core => kernel}/ao_serial.h (100%) rename src/{core => kernel}/ao_sqrt.c (100%) rename src/{core => kernel}/ao_state.c (100%) rename src/{core => kernel}/ao_stdio.c (100%) rename src/{core => kernel}/ao_storage.c (100%) rename src/{core => kernel}/ao_storage.h (100%) rename src/{core => kernel}/ao_task.c (100%) rename src/{core => kernel}/ao_task.h (100%) rename src/{core => kernel}/ao_telem.h (100%) rename src/{core => kernel}/ao_telemetry.c (100%) rename src/{core => kernel}/ao_telemetry.h (100%) rename src/{core => kernel}/ao_usb.h (100%) diff --git a/configure.ac b/configure.ac index b28b549b..27dbc6a4 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) AC_INIT([altos], 1.3.2.1) -AC_CONFIG_SRCDIR([src/core/ao.h]) +AC_CONFIG_SRCDIR([src/kernel/ao.h]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff --git a/src/avr-demo/Makefile b/src/avr-demo/Makefile index 6d9bfea2..e21ad047 100644 --- a/src/avr-demo/Makefile +++ b/src/avr-demo/Makefile @@ -2,7 +2,7 @@ # AltOS build # # -vpath % ..:../core:../product:../drivers:../avr +vpath % ..:../kernel:../product:../drivers:../avr vpath make-altitude .. vpath make-kalman .. vpath kalman.5c ../kalman @@ -46,7 +46,7 @@ PRODUCT=AvrDemo-v0.0 MCU=atmega32u4 PRODUCT_DEF=-DAVR_DEMO IDPRODUCT=0x000a -CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../core -I.. +CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../kernel -I.. CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -Os -mcall-prologues NICKLE=nickle diff --git a/src/cc1111/Makefile.cc1111 b/src/cc1111/Makefile.cc1111 index 78b653b3..0ea30e1d 100644 --- a/src/cc1111/Makefile.cc1111 +++ b/src/cc1111/Makefile.cc1111 @@ -3,7 +3,7 @@ CC=$(SDCC) CFLAGS=--model-small --debug --opt-code-speed -DCODESIZE=$(CODESIZE) -CFLAGS += $(PRODUCT_DEF) -I. -I.. -I../core -I../cc1111 -I../drivers -I../product +CFLAGS += $(PRODUCT_DEF) -I. -I.. -I../kernel -I../cc1111 -I../drivers -I../product CODESIZE ?= 0x8000 diff --git a/src/core/altitude.h b/src/kernel/altitude.h similarity index 100% rename from src/core/altitude.h rename to src/kernel/altitude.h diff --git a/src/core/ao.h b/src/kernel/ao.h similarity index 100% rename from src/core/ao.h rename to src/kernel/ao.h diff --git a/src/core/ao_adc.h b/src/kernel/ao_adc.h similarity index 100% rename from src/core/ao_adc.h rename to src/kernel/ao_adc.h diff --git a/src/core/ao_aes.h b/src/kernel/ao_aes.h similarity index 100% rename from src/core/ao_aes.h rename to src/kernel/ao_aes.h diff --git a/src/core/ao_balloon.c b/src/kernel/ao_balloon.c similarity index 100% rename from src/core/ao_balloon.c rename to src/kernel/ao_balloon.c diff --git a/src/core/ao_beep.h b/src/kernel/ao_beep.h similarity index 100% rename from src/core/ao_beep.h rename to src/kernel/ao_beep.h diff --git a/src/core/ao_btm.h b/src/kernel/ao_btm.h similarity index 100% rename from src/core/ao_btm.h rename to src/kernel/ao_btm.h diff --git a/src/core/ao_cmd.c b/src/kernel/ao_cmd.c similarity index 100% rename from src/core/ao_cmd.c rename to src/kernel/ao_cmd.c diff --git a/src/core/ao_companion.h b/src/kernel/ao_companion.h similarity index 100% rename from src/core/ao_companion.h rename to src/kernel/ao_companion.h diff --git a/src/core/ao_config.c b/src/kernel/ao_config.c similarity index 100% rename from src/core/ao_config.c rename to src/kernel/ao_config.c diff --git a/src/core/ao_config.h b/src/kernel/ao_config.h similarity index 100% rename from src/core/ao_config.h rename to src/kernel/ao_config.h diff --git a/src/core/ao_convert.c b/src/kernel/ao_convert.c similarity index 100% rename from src/core/ao_convert.c rename to src/kernel/ao_convert.c diff --git a/src/core/ao_convert_pa.c b/src/kernel/ao_convert_pa.c similarity index 100% rename from src/core/ao_convert_pa.c rename to src/kernel/ao_convert_pa.c diff --git a/src/core/ao_convert_pa_test.c b/src/kernel/ao_convert_pa_test.c similarity index 100% rename from src/core/ao_convert_pa_test.c rename to src/kernel/ao_convert_pa_test.c diff --git a/src/core/ao_convert_test.c b/src/kernel/ao_convert_test.c similarity index 100% rename from src/core/ao_convert_test.c rename to src/kernel/ao_convert_test.c diff --git a/src/core/ao_convert_volt.c b/src/kernel/ao_convert_volt.c similarity index 100% rename from src/core/ao_convert_volt.c rename to src/kernel/ao_convert_volt.c diff --git a/src/core/ao_data.c b/src/kernel/ao_data.c similarity index 100% rename from src/core/ao_data.c rename to src/kernel/ao_data.c diff --git a/src/core/ao_data.h b/src/kernel/ao_data.h similarity index 100% rename from src/core/ao_data.h rename to src/kernel/ao_data.h diff --git a/src/core/ao_dbg.h b/src/kernel/ao_dbg.h similarity index 100% rename from src/core/ao_dbg.h rename to src/kernel/ao_dbg.h diff --git a/src/core/ao_debounce.c b/src/kernel/ao_debounce.c similarity index 100% rename from src/core/ao_debounce.c rename to src/kernel/ao_debounce.c diff --git a/src/core/ao_debounce.h b/src/kernel/ao_debounce.h similarity index 100% rename from src/core/ao_debounce.h rename to src/kernel/ao_debounce.h diff --git a/src/core/ao_ee_fake.c b/src/kernel/ao_ee_fake.c similarity index 100% rename from src/core/ao_ee_fake.c rename to src/kernel/ao_ee_fake.c diff --git a/src/core/ao_eeprom.h b/src/kernel/ao_eeprom.h similarity index 100% rename from src/core/ao_eeprom.h rename to src/kernel/ao_eeprom.h diff --git a/src/core/ao_fec.h b/src/kernel/ao_fec.h similarity index 100% rename from src/core/ao_fec.h rename to src/kernel/ao_fec.h diff --git a/src/core/ao_fec_rx.c b/src/kernel/ao_fec_rx.c similarity index 100% rename from src/core/ao_fec_rx.c rename to src/kernel/ao_fec_rx.c diff --git a/src/core/ao_fec_tx.c b/src/kernel/ao_fec_tx.c similarity index 100% rename from src/core/ao_fec_tx.c rename to src/kernel/ao_fec_tx.c diff --git a/src/core/ao_flight.c b/src/kernel/ao_flight.c similarity index 100% rename from src/core/ao_flight.c rename to src/kernel/ao_flight.c diff --git a/src/core/ao_flight.h b/src/kernel/ao_flight.h similarity index 100% rename from src/core/ao_flight.h rename to src/kernel/ao_flight.h diff --git a/src/core/ao_flight_nano.c b/src/kernel/ao_flight_nano.c similarity index 100% rename from src/core/ao_flight_nano.c rename to src/kernel/ao_flight_nano.c diff --git a/src/core/ao_freq.c b/src/kernel/ao_freq.c similarity index 100% rename from src/core/ao_freq.c rename to src/kernel/ao_freq.c diff --git a/src/core/ao_gps_print.c b/src/kernel/ao_gps_print.c similarity index 100% rename from src/core/ao_gps_print.c rename to src/kernel/ao_gps_print.c diff --git a/src/core/ao_gps_report.c b/src/kernel/ao_gps_report.c similarity index 100% rename from src/core/ao_gps_report.c rename to src/kernel/ao_gps_report.c diff --git a/src/core/ao_gps_report_mega.c b/src/kernel/ao_gps_report_mega.c similarity index 100% rename from src/core/ao_gps_report_mega.c rename to src/kernel/ao_gps_report_mega.c diff --git a/src/core/ao_gps_report_metrum.c b/src/kernel/ao_gps_report_metrum.c similarity index 100% rename from src/core/ao_gps_report_metrum.c rename to src/kernel/ao_gps_report_metrum.c diff --git a/src/core/ao_gps_show.c b/src/kernel/ao_gps_show.c similarity index 100% rename from src/core/ao_gps_show.c rename to src/kernel/ao_gps_show.c diff --git a/src/core/ao_host.h b/src/kernel/ao_host.h similarity index 100% rename from src/core/ao_host.h rename to src/kernel/ao_host.h diff --git a/src/core/ao_ignite.c b/src/kernel/ao_ignite.c similarity index 100% rename from src/core/ao_ignite.c rename to src/kernel/ao_ignite.c diff --git a/src/core/ao_int64.c b/src/kernel/ao_int64.c similarity index 100% rename from src/core/ao_int64.c rename to src/kernel/ao_int64.c diff --git a/src/core/ao_int64.h b/src/kernel/ao_int64.h similarity index 100% rename from src/core/ao_int64.h rename to src/kernel/ao_int64.h diff --git a/src/core/ao_kalman.c b/src/kernel/ao_kalman.c similarity index 100% rename from src/core/ao_kalman.c rename to src/kernel/ao_kalman.c diff --git a/src/core/ao_lcd.h b/src/kernel/ao_lcd.h similarity index 100% rename from src/core/ao_lcd.h rename to src/kernel/ao_lcd.h diff --git a/src/core/ao_led.h b/src/kernel/ao_led.h similarity index 100% rename from src/core/ao_led.h rename to src/kernel/ao_led.h diff --git a/src/core/ao_list.h b/src/kernel/ao_list.h similarity index 100% rename from src/core/ao_list.h rename to src/kernel/ao_list.h diff --git a/src/core/ao_log.c b/src/kernel/ao_log.c similarity index 100% rename from src/core/ao_log.c rename to src/kernel/ao_log.c diff --git a/src/core/ao_log.h b/src/kernel/ao_log.h similarity index 100% rename from src/core/ao_log.h rename to src/kernel/ao_log.h diff --git a/src/core/ao_log_big.c b/src/kernel/ao_log_big.c similarity index 100% rename from src/core/ao_log_big.c rename to src/kernel/ao_log_big.c diff --git a/src/core/ao_log_mega.c b/src/kernel/ao_log_mega.c similarity index 100% rename from src/core/ao_log_mega.c rename to src/kernel/ao_log_mega.c diff --git a/src/core/ao_log_metrum.c b/src/kernel/ao_log_metrum.c similarity index 100% rename from src/core/ao_log_metrum.c rename to src/kernel/ao_log_metrum.c diff --git a/src/core/ao_log_micro.c b/src/kernel/ao_log_micro.c similarity index 100% rename from src/core/ao_log_micro.c rename to src/kernel/ao_log_micro.c diff --git a/src/core/ao_log_micro.h b/src/kernel/ao_log_micro.h similarity index 100% rename from src/core/ao_log_micro.h rename to src/kernel/ao_log_micro.h diff --git a/src/core/ao_log_mini.c b/src/kernel/ao_log_mini.c similarity index 100% rename from src/core/ao_log_mini.c rename to src/kernel/ao_log_mini.c diff --git a/src/core/ao_log_single.c b/src/kernel/ao_log_single.c similarity index 100% rename from src/core/ao_log_single.c rename to src/kernel/ao_log_single.c diff --git a/src/core/ao_log_telem.c b/src/kernel/ao_log_telem.c similarity index 100% rename from src/core/ao_log_telem.c rename to src/kernel/ao_log_telem.c diff --git a/src/core/ao_log_telescience.c b/src/kernel/ao_log_telescience.c similarity index 100% rename from src/core/ao_log_telescience.c rename to src/kernel/ao_log_telescience.c diff --git a/src/core/ao_log_tiny.c b/src/kernel/ao_log_tiny.c similarity index 100% rename from src/core/ao_log_tiny.c rename to src/kernel/ao_log_tiny.c diff --git a/src/core/ao_microflight.c b/src/kernel/ao_microflight.c similarity index 100% rename from src/core/ao_microflight.c rename to src/kernel/ao_microflight.c diff --git a/src/core/ao_microkalman.c b/src/kernel/ao_microkalman.c similarity index 100% rename from src/core/ao_microkalman.c rename to src/kernel/ao_microkalman.c diff --git a/src/core/ao_monitor.c b/src/kernel/ao_monitor.c similarity index 100% rename from src/core/ao_monitor.c rename to src/kernel/ao_monitor.c diff --git a/src/core/ao_mutex.c b/src/kernel/ao_mutex.c similarity index 100% rename from src/core/ao_mutex.c rename to src/kernel/ao_mutex.c diff --git a/src/core/ao_notask.c b/src/kernel/ao_notask.c similarity index 100% rename from src/core/ao_notask.c rename to src/kernel/ao_notask.c diff --git a/src/core/ao_notask.h b/src/kernel/ao_notask.h similarity index 100% rename from src/core/ao_notask.h rename to src/kernel/ao_notask.h diff --git a/src/core/ao_packet.h b/src/kernel/ao_packet.h similarity index 100% rename from src/core/ao_packet.h rename to src/kernel/ao_packet.h diff --git a/src/core/ao_panic.c b/src/kernel/ao_panic.c similarity index 100% rename from src/core/ao_panic.c rename to src/kernel/ao_panic.c diff --git a/src/core/ao_product.c b/src/kernel/ao_product.c similarity index 100% rename from src/core/ao_product.c rename to src/kernel/ao_product.c diff --git a/src/core/ao_pyro.c b/src/kernel/ao_pyro.c similarity index 100% rename from src/core/ao_pyro.c rename to src/kernel/ao_pyro.c diff --git a/src/core/ao_pyro.h b/src/kernel/ao_pyro.h similarity index 100% rename from src/core/ao_pyro.h rename to src/kernel/ao_pyro.h diff --git a/src/core/ao_quaternion.h b/src/kernel/ao_quaternion.h similarity index 100% rename from src/core/ao_quaternion.h rename to src/kernel/ao_quaternion.h diff --git a/src/core/ao_radio_cmac.c b/src/kernel/ao_radio_cmac.c similarity index 100% rename from src/core/ao_radio_cmac.c rename to src/kernel/ao_radio_cmac.c diff --git a/src/core/ao_radio_cmac.h b/src/kernel/ao_radio_cmac.h similarity index 100% rename from src/core/ao_radio_cmac.h rename to src/kernel/ao_radio_cmac.h diff --git a/src/core/ao_radio_cmac_cmd.c b/src/kernel/ao_radio_cmac_cmd.c similarity index 100% rename from src/core/ao_radio_cmac_cmd.c rename to src/kernel/ao_radio_cmac_cmd.c diff --git a/src/core/ao_radio_cmac_cmd.h b/src/kernel/ao_radio_cmac_cmd.h similarity index 100% rename from src/core/ao_radio_cmac_cmd.h rename to src/kernel/ao_radio_cmac_cmd.h diff --git a/src/core/ao_report.c b/src/kernel/ao_report.c similarity index 100% rename from src/core/ao_report.c rename to src/kernel/ao_report.c diff --git a/src/core/ao_report_micro.c b/src/kernel/ao_report_micro.c similarity index 100% rename from src/core/ao_report_micro.c rename to src/kernel/ao_report_micro.c diff --git a/src/core/ao_rssi.c b/src/kernel/ao_rssi.c similarity index 100% rename from src/core/ao_rssi.c rename to src/kernel/ao_rssi.c diff --git a/src/core/ao_sample.c b/src/kernel/ao_sample.c similarity index 100% rename from src/core/ao_sample.c rename to src/kernel/ao_sample.c diff --git a/src/core/ao_sample.h b/src/kernel/ao_sample.h similarity index 100% rename from src/core/ao_sample.h rename to src/kernel/ao_sample.h diff --git a/src/core/ao_sample_profile.c b/src/kernel/ao_sample_profile.c similarity index 100% rename from src/core/ao_sample_profile.c rename to src/kernel/ao_sample_profile.c diff --git a/src/core/ao_sample_profile.h b/src/kernel/ao_sample_profile.h similarity index 100% rename from src/core/ao_sample_profile.h rename to src/kernel/ao_sample_profile.h diff --git a/src/core/ao_send_packet.c b/src/kernel/ao_send_packet.c similarity index 100% rename from src/core/ao_send_packet.c rename to src/kernel/ao_send_packet.c diff --git a/src/core/ao_send_packet.h b/src/kernel/ao_send_packet.h similarity index 100% rename from src/core/ao_send_packet.h rename to src/kernel/ao_send_packet.h diff --git a/src/core/ao_serial.h b/src/kernel/ao_serial.h similarity index 100% rename from src/core/ao_serial.h rename to src/kernel/ao_serial.h diff --git a/src/core/ao_sqrt.c b/src/kernel/ao_sqrt.c similarity index 100% rename from src/core/ao_sqrt.c rename to src/kernel/ao_sqrt.c diff --git a/src/core/ao_state.c b/src/kernel/ao_state.c similarity index 100% rename from src/core/ao_state.c rename to src/kernel/ao_state.c diff --git a/src/core/ao_stdio.c b/src/kernel/ao_stdio.c similarity index 100% rename from src/core/ao_stdio.c rename to src/kernel/ao_stdio.c diff --git a/src/core/ao_storage.c b/src/kernel/ao_storage.c similarity index 100% rename from src/core/ao_storage.c rename to src/kernel/ao_storage.c diff --git a/src/core/ao_storage.h b/src/kernel/ao_storage.h similarity index 100% rename from src/core/ao_storage.h rename to src/kernel/ao_storage.h diff --git a/src/core/ao_task.c b/src/kernel/ao_task.c similarity index 100% rename from src/core/ao_task.c rename to src/kernel/ao_task.c diff --git a/src/core/ao_task.h b/src/kernel/ao_task.h similarity index 100% rename from src/core/ao_task.h rename to src/kernel/ao_task.h diff --git a/src/core/ao_telem.h b/src/kernel/ao_telem.h similarity index 100% rename from src/core/ao_telem.h rename to src/kernel/ao_telem.h diff --git a/src/core/ao_telemetry.c b/src/kernel/ao_telemetry.c similarity index 100% rename from src/core/ao_telemetry.c rename to src/kernel/ao_telemetry.c diff --git a/src/core/ao_telemetry.h b/src/kernel/ao_telemetry.h similarity index 100% rename from src/core/ao_telemetry.h rename to src/kernel/ao_telemetry.h diff --git a/src/core/ao_usb.h b/src/kernel/ao_usb.h similarity index 100% rename from src/core/ao_usb.h rename to src/kernel/ao_usb.h diff --git a/src/lpc/Makefile-lpc.defs b/src/lpc/Makefile-lpc.defs index fecb9135..bccea5bc 100644 --- a/src/lpc/Makefile-lpc.defs +++ b/src/lpc/Makefile-lpc.defs @@ -4,7 +4,7 @@ endif include $(TOPDIR)/Makedefs -vpath % $(TOPDIR)/lpc:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/core:$(TOPDIR)/util:$(TOPDIR)/kalman:$(TOPDIR/aes):$(TOPDIR):$(TOPDIR)/math +vpath % $(TOPDIR)/lpc:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/kernel:$(TOPDIR)/util:$(TOPDIR)/kalman:$(TOPDIR/aes):$(TOPDIR):$(TOPDIR)/math vpath make-altitude $(TOPDIR)/util vpath make-kalman $(TOPDIR)/util vpath kalman.5c $(TOPDIR)/kalman @@ -28,7 +28,7 @@ CC=$(ARM_CC) WARN_FLAGS=-Wall -Wextra -Werror -AO_CFLAGS=-I. -I$(TOPDIR)/lpc -I$(TOPDIR)/core -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR) -I$(TOPDIR)/math -I$(TOPDIR) $(PDCLIB_INCLUDES) +AO_CFLAGS=-I. -I$(TOPDIR)/lpc -I$(TOPDIR)/kernel -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR) -I$(TOPDIR)/math -I$(TOPDIR) $(PDCLIB_INCLUDES) LPC_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m0 -mthumb\ -ffreestanding -nostdlib $(AO_CFLAGS) $(WARN_FLAGS) diff --git a/src/micropeak/Makefile b/src/micropeak/Makefile index dcc32874..f4c57076 100644 --- a/src/micropeak/Makefile +++ b/src/micropeak/Makefile @@ -2,7 +2,7 @@ # Tiny AltOS build # # -vpath % ../attiny:../drivers:../core:../product:.. +vpath % ../attiny:../drivers:../kernel:../product:.. vpath ao-make-product.5c ../util vpath make-altitude-pa ../util @@ -47,7 +47,7 @@ INC=\ IDPRODUCT=0 PRODUCT=MicroPeak-v0.1 PRODUCT_DEF=-DMICROPEAK -CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../core -I.. -I../drivers -I../product +CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../kernel -I.. -I../drivers -I../product CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY NICKLE=nickle diff --git a/src/nanopeak-v0.1/Makefile b/src/nanopeak-v0.1/Makefile index 04eea902..d3779594 100644 --- a/src/nanopeak-v0.1/Makefile +++ b/src/nanopeak-v0.1/Makefile @@ -2,7 +2,7 @@ # Tiny AltOS build # # -vpath % ../attiny:../drivers:../core:../product:.. +vpath % ../attiny:../drivers:../kernel:../product:.. vpath ao-make-product.5c ../util vpath make-altitude-pa ../util @@ -47,7 +47,7 @@ INC=\ IDPRODUCT=0 PRODUCT=NanoPeak-v0.1 PRODUCT_DEF=-DNANOPEAK -CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../core -I.. -I../drivers -I../product +CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../kernel -I.. -I../drivers -I../product CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY NICKLE=nickle diff --git a/src/product/Makefile.teledongle b/src/product/Makefile.teledongle index da9bcba0..81151364 100644 --- a/src/product/Makefile.teledongle +++ b/src/product/Makefile.teledongle @@ -7,8 +7,8 @@ # TD_VER, TD_DEF and include # this file -vpath %.c ..:../core:../cc1111:../drivers:../product -vpath %.h ..:../core:../cc1111:../drivers:../product +vpath %.c ..:../kernel:../cc1111:../drivers:../product +vpath %.h ..:../kernel:../cc1111:../drivers:../product vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/product/Makefile.telelaunch b/src/product/Makefile.telelaunch index a5e2eb7f..90fe7833 100644 --- a/src/product/Makefile.telelaunch +++ b/src/product/Makefile.telelaunch @@ -4,8 +4,8 @@ # define TELELAUNCH_VER, TELELAUNCH_DEF # this file -vpath %.c ..:../core:../cc1111:../drivers:../product -vpath %.h ..:../core:../cc1111:../drivers:../product +vpath %.c ..:../kernel:../cc1111:../drivers:../product +vpath %.h ..:../kernel:../cc1111:../drivers:../product vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/product/Makefile.telemetrum b/src/product/Makefile.telemetrum index c740a483..dbbf57d8 100644 --- a/src/product/Makefile.telemetrum +++ b/src/product/Makefile.telemetrum @@ -7,8 +7,8 @@ # TM_VER, TM_DEF, TM_INC and TM_SRC and include # this file -vpath %.c .:..:../core:../cc1111:../drivers:../product -vpath %.h .:..:../core:../cc1111:../drivers:../product +vpath %.c .:..:../kernel:../cc1111:../drivers:../product +vpath %.h .:..:../kernel:../cc1111:../drivers:../product vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini index 0884079e..ff8b9d56 100644 --- a/src/product/Makefile.telemini +++ b/src/product/Makefile.telemini @@ -4,8 +4,8 @@ # Define TELEMINI_VER and TELEMINI_DEF and then # include this file -vpath %.c ..:../core:../cc1111:../drivers:../product -vpath %.h ..:../core:../cc1111:../drivers:../product +vpath %.c ..:../kernel:../cc1111:../drivers:../product +vpath %.h ..:../kernel:../cc1111:../drivers:../product vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/product/Makefile.telenano b/src/product/Makefile.telenano index c31989ee..d2fcb6d8 100644 --- a/src/product/Makefile.telenano +++ b/src/product/Makefile.telenano @@ -4,8 +4,8 @@ # Define TELENANO_VER and TELENANO_DEF and then # include this file -vpath %.c ..:../core:../cc1111:../drivers:../product -vpath %.h ..:../core:../cc1111:../drivers:../product +vpath %.c ..:../kernel:../cc1111:../drivers:../product +vpath %.h ..:../kernel:../cc1111:../drivers:../product vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/spiradio-v0.1/.sdcdbrc b/src/spiradio-v0.1/.sdcdbrc index b9f6129c..2c77e32b 100644 --- a/src/spiradio-v0.1/.sdcdbrc +++ b/src/spiradio-v0.1/.sdcdbrc @@ -1,2 +1,2 @@ ---directory=../cc1111:../product:../core:../drivers:. +--directory=../cc1111:../product:../kernel:../drivers:. diff --git a/src/spiradio-v0.1/Makefile b/src/spiradio-v0.1/Makefile index e644bc49..cd7a9cde 100644 --- a/src/spiradio-v0.1/Makefile +++ b/src/spiradio-v0.1/Makefile @@ -5,8 +5,8 @@ SPIRADIO_VER=0.1 SPIRADIO_DEF=0_1 -vpath %.c ..:../core:../cc1111:../drivers:../product -vpath %.h ..:../core:../cc1111:../drivers:../product +vpath %.c ..:../kernel:../cc1111:../drivers:../product +vpath %.h ..:../kernel:../cc1111:../drivers:../product vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/stm-bringup/Makefile b/src/stm-bringup/Makefile index 797df2d6..b0943e56 100644 --- a/src/stm-bringup/Makefile +++ b/src/stm-bringup/Makefile @@ -1,4 +1,4 @@ -vpath % ..:../core:../product:../drivers:../stm +vpath % ..:../kernel:../product:../drivers:../stm vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/stm/Makefile-flash.defs b/src/stm/Makefile-flash.defs index 3890eff1..dde51a68 100644 --- a/src/stm/Makefile-flash.defs +++ b/src/stm/Makefile-flash.defs @@ -1,4 +1,4 @@ -vpath % $(TOPDIR)/stm:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/core:$(TOPDIR)/util:$(TOPDIR) +vpath % $(TOPDIR)/stm:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/kernel:$(TOPDIR)/util:$(TOPDIR) vpath ao-make-product.5c $(TOPDIR)/util .SUFFIXES: .elf .ihx @@ -14,7 +14,7 @@ include $(TOPDIR)/Makedefs CC=$(ARM_CC) LIBS=$(PDCLIB_LIBS_M3) -lgcc -AO_CFLAGS=-I. -I$(TOPDIR)/stm -I$(TOPDIR)/core -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR) $(PDCLIB_INCLUDES) +AO_CFLAGS=-I. -I$(TOPDIR)/stm -I$(TOPDIR)/kernel -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR) $(PDCLIB_INCLUDES) STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS) LDFLAGS=-L$(TOPDIR)/stm -Wl,-Taltos-loader.ld diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs index 42adfd09..c3d2707f 100644 --- a/src/stm/Makefile.defs +++ b/src/stm/Makefile.defs @@ -1,4 +1,4 @@ -vpath % ../stm:../product:../drivers:../core:../util:../kalman:../aes:../math:.. +vpath % ../stm:../product:../drivers:../kernel:../util:../kalman:../aes:../math:.. vpath make-altitude ../util vpath make-kalman ../util vpath kalman.5c ../kalman @@ -26,7 +26,7 @@ LIBS=$(PDCLIB_LIBS_M3) -lgcc WARN_FLAGS=-Wall -Wextra -Werror -AO_CFLAGS=-I. -I../stm -I../core -I../drivers -I../math -I.. $(PDCLIB_INCLUDES) +AO_CFLAGS=-I. -I../stm -I../kernel -I../drivers -I../math -I.. $(PDCLIB_INCLUDES) STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb \ -ffreestanding -nostdlib $(AO_CFLAGS) $(WARN_FLAGS) diff --git a/src/teleballoon-v1.1/Makefile b/src/teleballoon-v1.1/Makefile index 6ff076a9..c6f6345a 100644 --- a/src/teleballoon-v1.1/Makefile +++ b/src/teleballoon-v1.1/Makefile @@ -17,8 +17,8 @@ TELEBALLOON_SRC = \ ao_gps_skytraq.c \ ao_m25.c -vpath %.c ..:../core:../cc1111:../drivers:../product:. -vpath %.h ..:../core:../cc1111:../drivers:../product:. +vpath %.c ..:../kernel:../cc1111:../drivers:../product:. +vpath %.h ..:../kernel:../cc1111:../drivers:../product:. vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/telebt-v1.0/.sdcdbrc b/src/telebt-v1.0/.sdcdbrc index b9f6129c..2c77e32b 100644 --- a/src/telebt-v1.0/.sdcdbrc +++ b/src/telebt-v1.0/.sdcdbrc @@ -1,2 +1,2 @@ ---directory=../cc1111:../product:../core:../drivers:. +--directory=../cc1111:../product:../kernel:../drivers:. diff --git a/src/telebt-v1.0/Makefile b/src/telebt-v1.0/Makefile index 40853fc3..a7797499 100644 --- a/src/telebt-v1.0/Makefile +++ b/src/telebt-v1.0/Makefile @@ -5,8 +5,8 @@ TELEBT_VER=1.0 TELEBT_DEF=1_0 -vpath %.c ..:../core:../cc1111:../drivers:../product -vpath %.h ..:../core:../cc1111:../drivers:../product +vpath %.c ..:../kernel:../cc1111:../drivers:../product +vpath %.h ..:../kernel:../cc1111:../drivers:../product vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/telefire-v0.1/.sdcdbrc b/src/telefire-v0.1/.sdcdbrc index b9f6129c..2c77e32b 100644 --- a/src/telefire-v0.1/.sdcdbrc +++ b/src/telefire-v0.1/.sdcdbrc @@ -1,2 +1,2 @@ ---directory=../cc1111:../product:../core:../drivers:. +--directory=../cc1111:../product:../kernel:../drivers:. diff --git a/src/telefire-v0.1/Makefile b/src/telefire-v0.1/Makefile index f9e11698..25267268 100644 --- a/src/telefire-v0.1/Makefile +++ b/src/telefire-v0.1/Makefile @@ -5,8 +5,8 @@ TELEFIRE_VER=0.1 TELEFIRE_DEF=0_1 -vpath %.c ..:../core:../cc1111:../drivers:../product -vpath %.h ..:../core:../cc1111:../drivers:../product +vpath %.c ..:../kernel:../cc1111:../drivers:../product +vpath %.h ..:../kernel:../cc1111:../drivers:../product vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/telefire-v0.2/.sdcdbrc b/src/telefire-v0.2/.sdcdbrc index b9f6129c..2c77e32b 100644 --- a/src/telefire-v0.2/.sdcdbrc +++ b/src/telefire-v0.2/.sdcdbrc @@ -1,2 +1,2 @@ ---directory=../cc1111:../product:../core:../drivers:. +--directory=../cc1111:../product:../kernel:../drivers:. diff --git a/src/telefire-v0.2/Makefile b/src/telefire-v0.2/Makefile index a820990a..ad5065c1 100644 --- a/src/telefire-v0.2/Makefile +++ b/src/telefire-v0.2/Makefile @@ -5,8 +5,8 @@ TELEFIRE_VER=0.2 TELEFIRE_DEF=0_2 -vpath %.c ..:../core:../cc1111:../drivers:../product -vpath %.h ..:../core:../cc1111:../drivers:../product +vpath %.c ..:../kernel:../cc1111:../drivers:../product +vpath %.h ..:../kernel:../cc1111:../drivers:../product vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/telemetrum-v1.0/.sdcdbrc b/src/telemetrum-v1.0/.sdcdbrc index fbe9a599..e9a51ea6 100644 --- a/src/telemetrum-v1.0/.sdcdbrc +++ b/src/telemetrum-v1.0/.sdcdbrc @@ -1 +1 @@ ---directory=../cc1111:../product:../core:../drivers:. +--directory=../cc1111:../product:../kernel:../drivers:. diff --git a/src/telemetrum-v1.1/.sdcdbrc b/src/telemetrum-v1.1/.sdcdbrc index fbe9a599..e9a51ea6 100644 --- a/src/telemetrum-v1.1/.sdcdbrc +++ b/src/telemetrum-v1.1/.sdcdbrc @@ -1 +1 @@ ---directory=../cc1111:../product:../core:../drivers:. +--directory=../cc1111:../product:../kernel:../drivers:. diff --git a/src/telemini-v1.0/.sdcdbrc b/src/telemini-v1.0/.sdcdbrc index b9f6129c..2c77e32b 100644 --- a/src/telemini-v1.0/.sdcdbrc +++ b/src/telemini-v1.0/.sdcdbrc @@ -1,2 +1,2 @@ ---directory=../cc1111:../product:../core:../drivers:. +--directory=../cc1111:../product:../kernel:../drivers:. diff --git a/src/telemini-v2.0/.sdcdbrc b/src/telemini-v2.0/.sdcdbrc index b9f6129c..2c77e32b 100644 --- a/src/telemini-v2.0/.sdcdbrc +++ b/src/telemini-v2.0/.sdcdbrc @@ -1,2 +1,2 @@ ---directory=../cc1111:../product:../core:../drivers:. +--directory=../cc1111:../product:../kernel:../drivers:. diff --git a/src/telemini-v2.0/Makefile b/src/telemini-v2.0/Makefile index fcac2c48..606b4f3b 100644 --- a/src/telemini-v2.0/Makefile +++ b/src/telemini-v2.0/Makefile @@ -5,8 +5,8 @@ TELEMINI_VER=2.0 TELEMINI_DEF=2_0 -vpath %.c ..:../core:../cc1111:../drivers:../product -vpath %.h ..:../core:../cc1111:../drivers:../product +vpath %.c ..:../kernel:../cc1111:../drivers:../product +vpath %.h ..:../kernel:../cc1111:../drivers:../product vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/telepyro-v0.1/Makefile b/src/telepyro-v0.1/Makefile index 025b324a..dcac03dc 100644 --- a/src/telepyro-v0.1/Makefile +++ b/src/telepyro-v0.1/Makefile @@ -2,7 +2,7 @@ # AltOS build # # -vpath % .:..:../core:../product:../drivers:../avr +vpath % .:..:../kernel:../product:../drivers:../avr vpath ao-make-product.5c ../util include ../avr/Makefile.defs @@ -45,7 +45,7 @@ PRODUCT=TelePyro-v0.1 MCU=atmega32u4 PRODUCT_DEF=-DTELEPYRO IDPRODUCT=0x0011 -CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../core -I.. +CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../kernel -I.. CFLAGS += -mmcu=$(MCU) -Wall -Wstrict-prototypes -O3 -mcall-prologues -DAVR NICKLE=nickle diff --git a/src/telescience-pwm/Makefile b/src/telescience-pwm/Makefile index de81b8d7..493bd480 100644 --- a/src/telescience-pwm/Makefile +++ b/src/telescience-pwm/Makefile @@ -2,7 +2,7 @@ # AltOS build # # -vpath % ..:../core:../product:../drivers:../avr +vpath % ..:../kernel:../product:../drivers:../avr vpath ao-make-product.5c ../util include ../avr/Makefile.defs @@ -57,7 +57,7 @@ PRODUCT=TeleScience-PWM MCU=atmega32u4 PRODUCT_DEF=-DTELESCIENCE -DTELESCIENCE_PWM IDPRODUCT=0x0011 -CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../core -I.. +CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../kernel -I.. CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O3 -mcall-prologues -DAVR NICKLE=nickle diff --git a/src/telescience-v0.1/Makefile b/src/telescience-v0.1/Makefile index 6e4eb6de..c55c48e2 100644 --- a/src/telescience-v0.1/Makefile +++ b/src/telescience-v0.1/Makefile @@ -2,7 +2,7 @@ # AltOS build # # -vpath % ..:../core:../product:../drivers:../avr +vpath % ..:../kernel:../product:../drivers:../avr vpath ao-make-product.5c ../util include ../avr/Makefile.defs @@ -56,7 +56,7 @@ PRODUCT=TeleScience-v0.1 MCU=atmega32u4 PRODUCT_DEF=-DTELESCIENCE IDPRODUCT=0x0011 -CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../core -I.. +CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../kernel -I.. CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O3 -mcall-prologues -DAVR NICKLE=nickle diff --git a/src/teleshield-v0.1/Makefile b/src/teleshield-v0.1/Makefile index e8b262ef..f54488a2 100644 --- a/src/teleshield-v0.1/Makefile +++ b/src/teleshield-v0.1/Makefile @@ -17,8 +17,8 @@ TELESHIELD_SRC = \ ao_btm.c \ ao_spi.c -vpath %.c ..:../core:../cc1111:../drivers:../product:. -vpath %.h ..:../core:../cc1111:../drivers:../product:. +vpath %.c ..:../kernel:../cc1111:../drivers:../product:. +vpath %.h ..:../kernel:../cc1111:../drivers:../product:. vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/teleterra-v0.2/.sdcdbrc b/src/teleterra-v0.2/.sdcdbrc index fbe9a599..e9a51ea6 100644 --- a/src/teleterra-v0.2/.sdcdbrc +++ b/src/teleterra-v0.2/.sdcdbrc @@ -1 +1 @@ ---directory=../cc1111:../product:../core:../drivers:. +--directory=../cc1111:../product:../kernel:../drivers:. diff --git a/src/teleterra-v0.2/Makefile b/src/teleterra-v0.2/Makefile index 88637360..826c52e5 100644 --- a/src/teleterra-v0.2/Makefile +++ b/src/teleterra-v0.2/Makefile @@ -2,8 +2,8 @@ # TeleTerra build file # -vpath %.c ..:../core:../cc1111:../drivers:../product -vpath %.h ..:../core:../cc1111:../drivers:../product +vpath %.c ..:../kernel:../cc1111:../drivers:../product +vpath %.h ..:../kernel:../cc1111:../drivers:../product vpath ao-make-product.5c ../util ifndef VERSION diff --git a/src/test/Makefile b/src/test/Makefile index c6025219..7cb86140 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -1,4 +1,4 @@ -vpath % ..:../core:../drivers:../util:../micropeak:../aes:../product +vpath % ..:../kernel:../drivers:../util:../micropeak:../aes:../product PROGS=ao_flight_test ao_flight_test_baro ao_flight_test_accel ao_flight_test_noisy_accel ao_flight_test_mm \ ao_gps_test ao_gps_test_skytraq ao_gps_test_ublox ao_convert_test ao_convert_pa_test ao_fec_test \ @@ -9,7 +9,7 @@ INCS=ao_kalman.h ao_ms5607.h ao_log.h ao_data.h altitude-pa.h altitude.h ao_quat KALMAN=make-kalman -CFLAGS=-I.. -I. -I../core -I../drivers -I../micropeak -I../product -O0 -g -Wall +CFLAGS=-I.. -I. -I../kernel -I../drivers -I../micropeak -I../product -O0 -g -Wall all: $(PROGS) ao_aprs_data.wav @@ -52,7 +52,7 @@ ao_kalman.h: $(KALMAN) (cd .. && make ao_kalman.h) ao_fec_test: ao_fec_test.c ao_fec_tx.c ao_fec_rx.c - cc $(CFLAGS) -DAO_FEC_DEBUG=1 -o $@ ao_fec_test.c ../core/ao_fec_tx.c ../core/ao_fec_rx.c -lm + cc $(CFLAGS) -DAO_FEC_DEBUG=1 -o $@ ao_fec_test.c ../kernel/ao_fec_tx.c ../kernel/ao_fec_rx.c -lm ao_aprs_test: ao_aprs_test.c ao_aprs.c cc $(CFLAGS) -o $@ ao_aprs_test.c diff --git a/src/tidongle/Makefile b/src/tidongle/Makefile index b2ba537b..0e90d744 100644 --- a/src/tidongle/Makefile +++ b/src/tidongle/Makefile @@ -2,8 +2,8 @@ # TIDongle build file # -vpath %.c ..:../core:../cc1111:../drivers:../product -vpath %.h ..:../core:../cc1111:../drivers:../product +vpath %.c ..:../kernel:../cc1111:../drivers:../product +vpath %.h ..:../kernel:../cc1111:../drivers:../product vpath ao-make-product.5c ../util ifndef VERSION -- 2.30.2