started reorganizing code into subfolders.

avr/att84_base.asm

@@ -38,9 +38,9 @@
 .equ clock=1000000 ; Define the clock frequency
 
 
-.include "utils_wait.asm"
-.include "com2_defs.asm"
-.include "comproto_defs.asm"
+.include "common/utils_wait.asm"
+.include "modules/com2/com2_defs.asm"
+.include "modules/comproto/comproto_defs.asm"
 
 
 
@@ -159,13 +159,12 @@ main:
 ; ***************************************************************************
 ; includes
 
-.include "com2_lowlevel.asm"
-.include "com2_crc.asm"
-.include "com2_packets.asm"
-.include "crc8.asm"
-.include "flash.asm"
-.include "flashproto.asm"
-.include "watchdog.asm"
+.include "modules/com2/com2_lowlevel.asm"
+.include "modules/com2/com2_crc.asm"
+.include "modules/com2/com2_packets.asm"
+.include "common/crc8.asm"
+.include "modules/flash/flash.asm"
+.include "modules/flash/flashproto.asm"
 
 
 

avr/att84_temp1.asm

@@ -49,6 +49,7 @@
 
 .equ clock=1000000 ; Define the clock frequency
 
+.include "common/utils_wait.asm"
 
 
 ; ---------------------------------------------------------------------------
@@ -203,42 +204,43 @@ firmwareStart:   rjmp main
 ; ***************************************************************************
 ; includes
 
-.include "utils.asm"
-.include "crc8.asm"
-.include "watchdog.asm"
+.include "common/utils.asm"
+.include "common/crc8.asm"
 
 #ifdef MODULES_TIMER
-  .include "timer.asm"
+  .include "modules/timer/timer.asm"
 #endif
 #ifdef MODULES_LED
-.include "led.asm"
+.include "modules/led/led.asm"
 #endif
 #ifdef MODULES_COM
-  .include "com2.asm"
+  .include "modules/com2/com2_defs.asm"
+  .include "modules/com2/com2.asm"
   #ifdef MODULES_COM_WITH_ADDR_PROTO
-    .include "comproto.asm"
-    .include "comproto_addr.asm"
-    .include "comproto_recvstats.asm"
-    .include "comproto_sendstats.asm"
-    .include "comproto_sysstats.asm"
-    .include "comproto_memstats.asm"
-    .include "comproto_pong.asm"
-    .include "comproto_values.asm"
-    .include "comproto_device.asm"
-    .include "comproto_reboot.asm"
+    .include "modules/comproto/comproto_defs.asm"
+    .include "modules/comproto/comproto.asm"
+    .include "modules/comproto/comproto_addr.asm"
+    .include "modules/comproto/comproto_recvstats.asm"
+    .include "modules/comproto/comproto_sendstats.asm"
+    .include "modules/comproto/comproto_sysstats.asm"
+    .include "modules/comproto/comproto_memstats.asm"
+    .include "modules/comproto/comproto_pong.asm"
+    .include "modules/comproto/comproto_values.asm"
+    .include "modules/comproto/comproto_device.asm"
+    .include "modules/comproto/comproto_reboot.asm"
   #endif
 #endif
 #ifdef MODULES_TWI_MASTER
-  .include "twimaster.asm"
+  .include "modules/twimaster/twimaster.asm"
 #endif
 #ifdef MODULES_LCD
-  .include "lcd.asm"
+  .include "modules/lcd/lcd.asm"
 #endif
 #ifdef MODULES_SI7021
-  .include "si7021.asm"
+  .include "modules/si7021/si7021.asm"
 #endif
 #ifdef MODULES_STATS
-  .include "stats.asm"
+  .include "modules/stats/stats.asm"
 #endif
 
 

avr/common/utils.asm

@@ -11,14 +11,6 @@
 
 
 
-; ***************************************************************************
-; macros
-
-.include "utils_wait.asm"
-
-
-
-
 ; ***************************************************************************
 ; data
 

avr/main.asm

@@ -41,7 +41,7 @@ main:
   ldi r16, Low(RAMEND)
   out SPL, r16             ; init LSB stack pointer
 
-  rcall watchdogOff        ; turn off watchdog timer (sometimes it stays on after reboot)
+;  rcall watchdogOff        ; turn off watchdog timer (sometimes it stays on after reboot)
   
   rcall initModules
 

avr/modules/com2/com2.asm

@@ -9,14 +9,6 @@
 
 
 
-; ***************************************************************************
-; defines
-
-.include "com2_defs.asm"
-
-
-
-
 ; ***************************************************************************
 ; data
 
@@ -428,10 +420,10 @@ com2IsrPcint0_end:
 
 
 
-.include "com2_packets.asm"
-.include "com2_lowlevel.asm"
-.include "com2_buffer.asm"
-.include "com2_crc.asm"
+.include "modules/com2/com2_packets.asm"
+.include "modules/com2/com2_lowlevel.asm"
+.include "modules/com2/com2_buffer.asm"
+.include "modules/com2/com2_crc.asm"
 
 
 

avr/modules/comproto/comproto.asm

@@ -12,13 +12,6 @@
 
 
 
-; ***************************************************************************
-; defines
-
-.include "comproto_defs.asm"
-
-
-
 ; ***************************************************************************
 ; data
 

avr/modules/comproto/comproto_addr.asm

@@ -425,8 +425,8 @@ cproSendAddressPacket:
 
 
 
-.include "comproto_addr1.asm"
-.include "comproto_addr2.asm"
+.include "modules/comproto/comproto_addr1.asm"
+.include "modules/comproto/comproto_addr2.asm"
 
 
 #endif ; MODULES_COM_WITH_ADDR_PROTO