Permalink
Browse files

Taking watchdog into account. Blinking reset condition and timer work…

…s. Refactoring - disabled scheduler, introduced simple_timer.
  • Loading branch information...
1 parent 7aecd26 commit 5efcd2a38477b56e8093d26e00fa95b9bcea8a1d Anton committed May 5, 2012
Showing with 39,897 additions and 66,102 deletions.
  1. +18 −3 AntonAvrLib/AntonAvrLib.cproj
  2. +19 −5 AntonAvrLib/Debug/Makefile
  3. +92 −13 AntonAvrLib/Debug/button.i
  4. +75 −46 AntonAvrLib/Debug/button.s
  5. +96 −13 AntonAvrLib/Debug/dms_scheduler.i
  6. +170 −132 AntonAvrLib/Debug/dms_scheduler.s
  7. +91 −12 AntonAvrLib/Debug/external_interrupts.i
  8. +83 −54 AntonAvrLib/Debug/external_interrupts.s
  9. +156 −15 AntonAvrLib/Debug/hardware_reset.i
  10. +194 −83 AntonAvrLib/Debug/hardware_reset.s
  11. +9 −3 AntonAvrLib/Debug/kernel/TWI/twi_raw.d
  12. BIN AntonAvrLib/Debug/kernel/TWI/twi_raw.o
  13. +1 −0 AntonAvrLib/Debug/kernel/TWI/twi_rpc.d
  14. BIN NIBObeeLibTests/Debug/first.o → AntonAvrLib/Debug/kernel/TWI/twi_rpc.o
  15. +9 −3 AntonAvrLib/Debug/kernel/devices/button.d
  16. BIN AntonAvrLib/Debug/kernel/devices/button.o
  17. +9 −3 AntonAvrLib/Debug/kernel/devices/external_interrupts.d
  18. BIN AntonAvrLib/Debug/kernel/devices/external_interrupts.o
  19. +10 −10 AntonAvrLib/Debug/kernel/devices/led.d
  20. BIN AntonAvrLib/Debug/kernel/devices/led.o
  21. +9 −3 AntonAvrLib/Debug/kernel/devices/motor.d
  22. BIN AntonAvrLib/Debug/kernel/devices/motor.o
  23. +9 −3 AntonAvrLib/Debug/kernel/devices/port.d
  24. BIN AntonAvrLib/Debug/kernel/devices/port.o
  25. +9 −3 AntonAvrLib/Debug/kernel/devices/timer.d
  26. BIN AntonAvrLib/Debug/kernel/devices/timer.o
  27. +13 −4 AntonAvrLib/Debug/kernel/hardware_reset.d
  28. BIN AntonAvrLib/Debug/kernel/hardware_reset.o
  29. +26 −35 NIBObeeLib/Debug/line.d → AntonAvrLib/Debug/kernel/millisecond_clock.d
  30. BIN AntonAvrLib/Debug/kernel/millisecond_clock.o
  31. +9 −3 AntonAvrLib/Debug/kernel/processes/DMS/dms_scheduler.d
  32. BIN AntonAvrLib/Debug/kernel/processes/DMS/dms_scheduler.o
  33. +9 −3 AntonAvrLib/Debug/kernel/processes/RoundRobin/rr_scheduler.d
  34. BIN AntonAvrLib/Debug/kernel/processes/RoundRobin/rr_scheduler.o
  35. +6 −0 AntonAvrLib/Debug/kernel/processes/scheduler.d
  36. BIN AntonAvrLib/Debug/kernel/processes/scheduler.o
  37. +9 −3 AntonAvrLib/Debug/kernel/reset_condition.d
  38. BIN AntonAvrLib/Debug/kernel/reset_condition.o
  39. +93 −92 AntonAvrLib/Debug/led.i
  40. +258 −288 AntonAvrLib/Debug/led.s
  41. BIN AntonAvrLib/Debug/libAntonAvrLib.a
  42. +4 −0 AntonAvrLib/Debug/makedep.mk
  43. +3,039 −0 AntonAvrLib/Debug/millisecond_clock.i
  44. +5,753 −0 AntonAvrLib/Debug/millisecond_clock.s
  45. +91 −12 AntonAvrLib/Debug/motor.i
  46. +164 −135 AntonAvrLib/Debug/motor.s
  47. +91 −12 AntonAvrLib/Debug/port.i
  48. +160 −131 AntonAvrLib/Debug/port.s
  49. +91 −12 AntonAvrLib/Debug/reset_condition.i
  50. +84 −55 AntonAvrLib/Debug/reset_condition.s
  51. +91 −12 AntonAvrLib/Debug/rr_scheduler.i
  52. +225 −195 AntonAvrLib/Debug/rr_scheduler.s
  53. +80 −1 AntonAvrLib/Debug/scheduler.i
  54. +80 −51 AntonAvrLib/Debug/scheduler.s
  55. +91 −12 AntonAvrLib/Debug/timer.i
  56. +148 −119 AntonAvrLib/Debug/timer.s
  57. +92 −12 AntonAvrLib/Debug/twi_raw.i
  58. +104 −79 AntonAvrLib/Debug/twi_raw.s
  59. +319 −0 AntonAvrLib/Debug/twi_rpc.i
  60. +1,050 −0 AntonAvrLib/Debug/twi_rpc.s
  61. +1 −0 AntonAvrLib/anton_std.h
  62. +1 −0 AntonAvrLib/kernel/TWI/twi_raw.h
  63. +1 −0 AntonAvrLib/kernel/TWI/twi_rpc.c
  64. +17 −0 AntonAvrLib/kernel/TWI/twi_rpc.h
  65. +6 −0 AntonAvrLib/kernel/TWI/twi_rpc.kernel.h
  66. +1 −1 AntonAvrLib/kernel/devices/button.h
  67. +2 −2 AntonAvrLib/kernel/devices/led.c
  68. +4 −3 AntonAvrLib/kernel/hardware_reset.c
  69. +11 −0 AntonAvrLib/kernel/millisecond_clock.c
  70. +5 −2 AntonAvrLib/kernel/millisecond_clock.h
  71. +10 −6 AntonAvrLib/kernel/processes/scheduler.kernel.h
  72. +0 −27 AntonAvrLib/kernel/processes/timed_scheduler.kernel.h
  73. +12 −0 AntonAvrLib/kernel/reset_condition.kernel.h
  74. +11 −0 AntonAvrLib/kernel/simple_timer.kernel.h
  75. +36 −0 AntonAvrLib/kernel/timer_base.kernel.h
  76. BIN Kernel-NIBObee/Debug/libKernel-NIBObee.a
  77. +37 −102 Kernel-NIBObee/Debug/nibobee_kernel.d
  78. +257 −623 Kernel-NIBObee/Debug/nibobee_kernel.i
  79. BIN Kernel-NIBObee/Debug/nibobee_kernel.o
  80. +4,403 −8,432 Kernel-NIBObee/Debug/nibobee_kernel.s
  81. +47 −44 Kernel-NIBObee/Kernel-NIBObee.cproj
  82. +2 −0 Kernel-NIBObee/kernel.h
  83. +1 −1 Kernel-NIBObee/nibobee_led.kernel.h
  84. +25 −29 Kernel-NIBObee/shared/base.kernel.h
  85. +8 −6 Kernel-NIBObee/shared/kernel_base.h
  86. +17 −20 Kernel-NIBObee/shared/scheduler.kernel.h
  87. +30 −0 Kernel-NIBObee/shared/timer.kernel.h
  88. BIN Kernel-Simulator/Debug/libKernel-Simulator.a
  89. +0 −166 Kernel-Simulator/Debug/simulator_kernel.d
  90. +307 −549 Kernel-Simulator/Debug/simulator_kernel.i
  91. BIN Kernel-Simulator/Debug/simulator_kernel.o
  92. +2,229 −6,334 Kernel-Simulator/Debug/simulator_kernel.s
  93. +12 −0 Kernel-Simulator/Kernel-Simulator.cproj
  94. +2 −0 Kernel-Simulator/kernel.h
  95. +56 −0 Kernel-Simulator/shared/base.kernel.h
  96. +8 −6 Kernel-Simulator/shared/kernel_base.h
  97. +27 −0 Kernel-Simulator/shared/scheduler.kernel.h
  98. +30 −0 Kernel-Simulator/shared/timer.kernel.h
  99. +4 −53 Kernel-Simulator/simulator_kernel.c
  100. +2 −0 Kernel-Simulator/twi.kernel.h
  101. BIN Kernel-Tank-IO/Debug/libKernel-Tank-IO.a
  102. +212 −499 Kernel-Tank-IO/Debug/tank_kernel_IO.i
  103. +5,195 −9,444 Kernel-Tank-IO/Debug/tank_kernel_IO.s
  104. +48 −45 Kernel-Tank-IO/Kernel-Tank-IO.cproj
  105. +2 −0 Kernel-Tank-IO/kernel.h
  106. +25 −29 Kernel-Tank-IO/shared/base.kernel.h
  107. +8 −6 Kernel-Tank-IO/shared/kernel_base.h
  108. +17 −20 Kernel-Tank-IO/shared/scheduler.kernel.h
  109. +30 −0 Kernel-Tank-IO/shared/timer.kernel.h
  110. +1 −1 Kernel-Tank-IO/tank_button.kernel.h
  111. BIN Kernel-Tank-MASTER/Debug/libKernel-Tank-MASTER.a
  112. +191 −485 Kernel-Tank-MASTER/Debug/tank_kernel_MASTER.i
  113. +4,040 −8,191 Kernel-Tank-MASTER/Debug/tank_kernel_MASTER.s
  114. +47 −44 Kernel-Tank-MASTER/Kernel-Tank-MASTER.cproj
  115. +2 −0 Kernel-Tank-MASTER/kernel.h
  116. +25 −29 Kernel-Tank-MASTER/shared/base.kernel.h
  117. +8 −6 Kernel-Tank-MASTER/shared/kernel_base.h
  118. +17 −20 Kernel-Tank-MASTER/shared/scheduler.kernel.h
  119. +30 −0 Kernel-Tank-MASTER/shared/timer.kernel.h
  120. BIN Main-NIBObee/Debug/Main-NIBObee.elf
  121. +336 −515 Main-NIBObee/Debug/Main-NIBObee.hex
  122. +2,553 −4,387 Main-NIBObee/Debug/Main-NIBObee.lss
  123. +411 −626 Main-NIBObee/Debug/Main-NIBObee.map
  124. +14 −29 Main-NIBObee/Debug/Main.d
  125. +123 −162 Main-NIBObee/Debug/Main.i
  126. BIN Main-NIBObee/Debug/Main.o
  127. +219 −416 Main-NIBObee/Debug/Main.s
  128. +73 −66 Main-NIBObee/Main-NIBObee.cproj
  129. +0 −56 Main-NIBObee/src/asf.h
  130. +0 −1 Main-Simulator/Debug/Main-Simulator.eep
  131. BIN Main-Simulator/Debug/Main-Simulator.elf
  132. +0 −350 Main-Simulator/Debug/Main-Simulator.hex
  133. +0 −3,778 Main-Simulator/Debug/Main-Simulator.lss
  134. +0 −923 Main-Simulator/Debug/Main-Simulator.map
  135. +0 −126 Main-Simulator/Debug/Main.d
  136. +172 −97 Main-Simulator/Debug/Main.i
  137. BIN Main-Simulator/Debug/Main.o
  138. +1,193 −67 Main-Simulator/Debug/Main.s
  139. +0 −1 Main-Tank-IO/Debug/Main-Tank-IO.eep
  140. BIN Main-Tank-IO/Debug/Main-Tank-IO.elf
  141. +0 −492 Main-Tank-IO/Debug/Main-Tank-IO.hex
  142. +0 −5,217 Main-Tank-IO/Debug/Main-Tank-IO.lss
  143. +0 −1,027 Main-Tank-IO/Debug/Main-Tank-IO.map
  144. +176 −98 Main-Tank-IO/Debug/Main.i
  145. +510 −658 Main-Tank-IO/Debug/Main.s
  146. +0 −1 Main-Tank-MASTER/Debug/Main-Tank-MASTER.eep
  147. +0 −460 Main-Tank-MASTER/Debug/Main-Tank-MASTER.hex
  148. +0 −4,956 Main-Tank-MASTER/Debug/Main-Tank-MASTER.lss
  149. +0 −951 Main-Tank-MASTER/Debug/Main-Tank-MASTER.map
  150. +0 −150 Main-Tank-MASTER/Debug/Main.d
  151. +170 −97 Main-Tank-MASTER/Debug/Main.i
  152. BIN Main-Tank-MASTER/Debug/Main.o
  153. +112 −77 Main-Tank-MASTER/Debug/Main.s
  154. +319 −0 Main/Debug/Main.i
  155. +319 −0 Main/Debug/Main_test_AllLeds.i
  156. +1,050 −0 Main/Debug/Main_test_AllLeds.s
  157. +319 −0 Main/Debug/Main_test_NIBObee_Buttons.i
  158. +1,050 −0 Main/Debug/Main_test_NIBObee_Buttons.s
  159. +2 −0 Main/Debug/device_tests/Main_test_AllLeds.d
  160. BIN NIBObeeLibTests/Debug/program2.o → Main/Debug/device_tests/Main_test_AllLeds.o
  161. +3 −0 Main/Debug/device_tests/Main_test_NIBObee_Buttons.d
  162. BIN Main/Debug/device_tests/{Main_test_blink_AllLeds.o → Main_test_NIBObee_Buttons.o}
  163. +0 −3 Main/Debug/device_tests/Main_test_blink_AllLeds.d
  164. +2 −2 Main/Main.c
  165. +9 −11 Main/device_tests/Main_test_blink_AllLeds.c
  166. +3 −0 Main/device_tests/Main_test_blink_reset_condition.c
  167. BIN NIBObee.atsuo
  168. +0 −52 NIBObeeLib/Debug/clock.d
  169. BIN NIBObeeLib/Debug/clock.o
  170. +0 −19 NIBObeeLib/Debug/delay.d
  171. BIN NIBObeeLib/Debug/delay.o
  172. +0 −58 NIBObeeLib/Debug/i2cmaster.d
  173. BIN NIBObeeLib/Debug/i2cmaster.o
  174. +0 −46 NIBObeeLib/Debug/led.d
  175. BIN NIBObeeLib/Debug/led.o
  176. BIN NIBObeeLib/Debug/libNIBObeeLib.a
  177. BIN NIBObeeLib/Debug/line.o
  178. +0 −58 NIBObeeLib/Debug/motpid.d
  179. BIN NIBObeeLib/Debug/motpid.o
  180. +0 −49 NIBObeeLib/Debug/motpwm.d
  181. BIN NIBObeeLib/Debug/motpwm.o
  182. +0 −46 NIBObeeLib/Debug/odometry.d
  183. BIN NIBObeeLib/Debug/odometry.o
  184. +0 −46 NIBObeeLib/Debug/sens.d
  185. BIN NIBObeeLib/Debug/sens.o
  186. +0 −46 NIBObeeLib/Debug/usart.d
  187. BIN NIBObeeLib/Debug/usart.o
  188. +0 −66 NIBObeeLibTests/Debug/Main.d
  189. BIN NIBObeeLibTests/Debug/Main.o
  190. +0 −1 NIBObeeLibTests/Debug/NIBObeeLibTests.eep
  191. +0 −182 NIBObeeLibTests/Debug/NIBObeeLibTests.hex
  192. +0 −1,958 NIBObeeLibTests/Debug/NIBObeeLibTests.lss
  193. +0 −753 NIBObeeLibTests/Debug/NIBObeeLibTests.map
  194. +0 −2 NIBObeeLibTests/Debug/bgx1_test_gfx.d
  195. BIN NIBObeeLibTests/Debug/bgx1_test_gfx.o
  196. +0 −2 NIBObeeLibTests/Debug/bgx1_test_io.d
  197. BIN NIBObeeLibTests/Debug/bgx1_test_io.o
  198. +0 −2 NIBObeeLibTests/Debug/bgx1_test_term.d
  199. BIN NIBObeeLibTests/Debug/bgx1_test_term.o
  200. +0 −2 NIBObeeLibTests/Debug/calibration.d
  201. BIN NIBObeeLibTests/Debug/calibration.o
  202. +0 −1 NIBObeeLibTests/Debug/first.d
  203. +0 −2 NIBObeeLibTests/Debug/program1.d
  204. BIN NIBObeeLibTests/Debug/program1.o
  205. +0 −2 NIBObeeLibTests/Debug/program2.d
  206. +0 −2 NIBObeeLibTests/Debug/program3.d
  207. BIN NIBObeeLibTests/Debug/program3.o
  208. +0 −2 NIBObeeLibTests/Debug/program4.d
  209. BIN NIBObeeLibTests/Debug/program4.o
  210. +0 −2 NIBObeeLibTests/Debug/program5.d
  211. BIN NIBObeeLibTests/Debug/program5.o
  212. +0 −2 NIBObeeLibTests/Debug/program6.d
  213. BIN NIBObeeLibTests/Debug/program6.o
  214. +0 −2 NIBObeeLibTests/Debug/program7.d
  215. BIN NIBObeeLibTests/Debug/program7.o
  216. +0 −2 NIBObeeLibTests/Debug/program8.d
  217. BIN NIBObeeLibTests/Debug/program8.o
  218. +0 −2 NIBObeeLibTests/Debug/program9.d
  219. BIN NIBObeeLibTests/Debug/program9.o
@@ -90,6 +90,9 @@
<Compile Include="kernel\hardware_reset.h">
<SubType>compile</SubType>
</Compile>
+ <Compile Include="kernel\millisecond_clock.c">
+ <SubType>compile</SubType>
+ </Compile>
<Compile Include="kernel\millisecond_clock.h">
<SubType>compile</SubType>
</Compile>
@@ -183,6 +186,12 @@
<Compile Include="kernel\reset_condition.h">
<SubType>compile</SubType>
</Compile>
+ <Compile Include="kernel\simple_timer.kernel.h">
+ <SubType>compile</SubType>
+ </Compile>
+ <Compile Include="kernel\timer_base.kernel.h">
+ <SubType>compile</SubType>
+ </Compile>
<Compile Include="kernel\TWI\twi_raw.c">
<SubType>compile</SubType>
</Compile>
@@ -192,6 +201,15 @@
<Compile Include="kernel\TWI\twi_raw.kernel.h">
<SubType>compile</SubType>
</Compile>
+ <Compile Include="kernel\TWI\twi_rpc.h">
+ <SubType>compile</SubType>
+ </Compile>
+ <Compile Include="kernel\TWI\twi_rpc.c">
+ <SubType>compile</SubType>
+ </Compile>
+ <Compile Include="kernel\TWI\twi_rpc.kernel.h">
+ <SubType>compile</SubType>
+ </Compile>
</ItemGroup>
<ItemGroup>
<None Include="kernel\devices\port_m1284P.kernel.h">
@@ -221,9 +239,6 @@
<None Include="kernel\processes\scheduler.kernel.h">
<SubType>compile</SubType>
</None>
- <None Include="kernel\processes\timed_scheduler.kernel.h">
- <SubType>compile</SubType>
- </None>
</ItemGroup>
<Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\AvrGCC.targets" />
</Project>
@@ -43,6 +43,7 @@ SUBDIRS := \
# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
../kernel/hardware_reset.c \
+../kernel/millisecond_clock.c \
../kernel/devices/button.c \
../kernel/devices/external_interrupts.c \
../kernel/devices/led.c \
@@ -53,7 +54,8 @@ C_SRCS += \
../kernel/processes/RoundRobin/rr_scheduler.c \
../kernel/processes/scheduler.c \
../kernel/reset_condition.c \
-../kernel/TWI/twi_raw.c
+../kernel/TWI/twi_raw.c \
+../kernel/TWI/twi_rpc.c
PREPROCESSING_SRCS +=
@@ -64,6 +66,7 @@ ASM_SRCS +=
OBJS += \
kernel/hardware_reset.o \
+kernel/millisecond_clock.o \
kernel/devices/button.o \
kernel/devices/external_interrupts.o \
kernel/devices/led.o \
@@ -74,11 +77,13 @@ kernel/processes/DMS/dms_scheduler.o \
kernel/processes/RoundRobin/rr_scheduler.o \
kernel/processes/scheduler.o \
kernel/reset_condition.o \
-kernel/TWI/twi_raw.o
+kernel/TWI/twi_raw.o \
+kernel/TWI/twi_rpc.o
OBJS_AS_ARGS += \
kernel/hardware_reset.o \
+kernel/millisecond_clock.o \
kernel/devices/button.o \
kernel/devices/external_interrupts.o \
kernel/devices/led.o \
@@ -89,11 +94,13 @@ kernel/processes/DMS/dms_scheduler.o \
kernel/processes/RoundRobin/rr_scheduler.o \
kernel/processes/scheduler.o \
kernel/reset_condition.o \
-kernel/TWI/twi_raw.o
+kernel/TWI/twi_raw.o \
+kernel/TWI/twi_rpc.o
C_DEPS += \
kernel/hardware_reset.d \
+kernel/millisecond_clock.d \
kernel/devices/button.d \
kernel/devices/external_interrupts.d \
kernel/devices/led.d \
@@ -104,11 +111,13 @@ kernel/processes/DMS/dms_scheduler.d \
kernel/processes/RoundRobin/rr_scheduler.d \
kernel/processes/scheduler.d \
kernel/reset_condition.d \
-kernel/TWI/twi_raw.d
+kernel/TWI/twi_raw.d \
+kernel/TWI/twi_rpc.d
C_DEPS_AS_ARGS += \
kernel/hardware_reset.d \
+kernel/millisecond_clock.d \
kernel/devices/button.d \
kernel/devices/external_interrupts.d \
kernel/devices/led.d \
@@ -119,7 +128,8 @@ kernel/processes/DMS/dms_scheduler.d \
kernel/processes/RoundRobin/rr_scheduler.d \
kernel/processes/scheduler.d \
kernel/reset_condition.d \
-kernel/TWI/twi_raw.d
+kernel/TWI/twi_raw.d \
+kernel/TWI/twi_rpc.d
OUTPUT_FILE_PATH +=libAntonAvrLib.a
@@ -156,6 +166,10 @@ OUTPUT_FILE_DEP:= ./makedep.mk
+
+
+
+
kernel/%.o: ../kernel/%.c
@echo Building file: $<
@echo Invoking: AVR/GNU C Compiler
@@ -978,17 +978,12 @@ extern char *dtostre(double __val, char *__s, unsigned char __prec,
extern char *dtostrf(double __val, signed char __width,
unsigned char __prec, char *__s);
# 16 "../kernel/devices/../../anton_std.h" 2
-# 1 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/io.h" 1 3
-# 97 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/io.h" 3
-#define _AVR_IO_H_
-
-# 1 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/sfr_defs.h" 1 3
-# 36 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/sfr_defs.h" 3
-#define _AVR_SFR_DEFS_H_ 1
-# 121 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/sfr_defs.h" 3
-#define _SFR_ASM_COMPAT 0
+# 1 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay.h" 1 3
+# 36 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay.h" 3
+#define _UTIL_DELAY_H_ 1
+#define __HAS_DELAY_CYCLES 1
# 1 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/inttypes.h" 1 3
@@ -1309,7 +1304,91 @@ typedef uint32_t uint_farptr_t;
#define SCNxPTR SCNx16
-# 127 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/sfr_defs.h" 2 3
+# 43 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay.h" 2 3
+# 1 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay_basic.h" 1 3
+# 35 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay_basic.h" 3
+#define _UTIL_DELAY_BASIC_H_ 1
+
+
+
+
+static inline void _delay_loop_1(uint8_t __count) __attribute__((always_inline));
+static inline void _delay_loop_2(uint16_t __count) __attribute__((always_inline));
+# 80 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay_basic.h" 3
+void
+_delay_loop_1(uint8_t __count)
+{
+ __asm__ volatile (
+ "1: dec %0" "\n\t"
+ "brne 1b"
+ : "=r" (__count)
+ : "0" (__count)
+ );
+}
+# 102 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay_basic.h" 3
+void
+_delay_loop_2(uint16_t __count)
+{
+ __asm__ volatile (
+ "1: sbiw %0,1" "\n\t"
+ "brne 1b"
+ : "=w" (__count)
+ : "0" (__count)
+ );
+}
+# 44 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay.h" 2 3
+# 83 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay.h" 3
+static inline void _delay_us(double __us) __attribute__((always_inline));
+static inline void _delay_ms(double __ms) __attribute__((always_inline));
+# 131 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay.h" 3
+void
+_delay_ms(double __ms)
+{
+ uint16_t __ticks;
+ double __tmp ;
+
+ uint32_t __ticks_dc;
+ extern void __builtin_avr_delay_cycles(unsigned long);
+ __tmp = ((20000000) / 1e3) * __ms;
+# 149 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay.h" 3
+ __ticks_dc = (uint32_t)(ceil(fabs(__tmp)));
+
+
+ __builtin_avr_delay_cycles(__ticks_dc);
+# 174 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay.h" 3
+}
+# 208 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay.h" 3
+void
+_delay_us(double __us)
+{
+ uint8_t __ticks;
+ double __tmp ;
+
+ uint32_t __ticks_dc;
+ extern void __builtin_avr_delay_cycles(unsigned long);
+ __tmp = ((20000000) / 1e6) * __us;
+# 226 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay.h" 3
+ __ticks_dc = (uint32_t)(ceil(fabs(__tmp)));
+
+
+ __builtin_avr_delay_cycles(__ticks_dc);
+# 244 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/util/delay.h" 3
+}
+# 17 "../kernel/devices/../../anton_std.h" 2
+# 1 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/io.h" 1 3
+# 97 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/io.h" 3
+#define _AVR_IO_H_
+
+# 1 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/sfr_defs.h" 1 3
+# 36 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/sfr_defs.h" 3
+#define _AVR_SFR_DEFS_H_ 1
+# 121 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/sfr_defs.h" 3
+#define _SFR_ASM_COMPAT 0
+
+
+
+
+
#define _MMIO_BYTE(mem_addr) (*(volatile uint8_t *)(mem_addr))
#define _MMIO_WORD(mem_addr) (*(volatile uint16_t *)(mem_addr))
@@ -2832,7 +2911,7 @@ typedef struct
# 237 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/lock.h" 3
#define LOCKBITS_DEFAULT (0xFF)
# 545 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/io.h" 2 3
-# 17 "../kernel/devices/../../anton_std.h" 2
+# 18 "../kernel/devices/../../anton_std.h" 2
# 1 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/interrupt.h" 1 3
# 36 "c:\\program files (x86)\\atmel\\atmel studio 6.0\\extensions\\atmel\\avrgcc\\3.3.2.31\\avrtoolchain\\bin\\../lib/gcc/avr/4.5.1/../../../../avr/include/avr/interrupt.h" 3
#define _AVR_INTERRUPT_H_
@@ -2865,7 +2944,7 @@ typedef struct
#define ISR_NOBLOCK __attribute__((interrupt))
#define ISR_NAKED __attribute__((naked))
#define ISR_ALIASOF(v) __attribute__((alias(__STRINGIFY(v))))
-# 18 "../kernel/devices/../../anton_std.h" 2
+# 19 "../kernel/devices/../../anton_std.h" 2
typedef enum {
FALSE,
@@ -2932,7 +3011,7 @@ BOOL readPin(PPin pin);
# 12 "../kernel/devices/button.h" 2
-#define BUTTON_NORMAL
+#define BUTTON_NORMAL 0
#define BUTTON_INVERTED (1 << 1)
#define BUTTON_NEEDS_PULLUP (1 << 2)
Oops, something went wrong.

0 comments on commit 5efcd2a

Please sign in to comment.