fix iap

Makefile

@@ -1,4 +1,4 @@
-TARGETS = iap modules 
+TARGETS = iap projects/gcc/tools modules 
 BUILDDIR = build
 
 .PHONY: all config $(TARGETS) tools distclean

iap/Modules/gpio_io.c

@@ -34,7 +34,7 @@ void IO_Init(void)
 	  GPIO_InitStructure.GPIO_PuPd  = GPIO_PuPd_NOPULL;
 
 	  /* BUTTON DEFAULT - " " */
-	  GPIO_InitStructure.GPIO_Pin   = GPIO_Pin_10;
+	  GPIO_InitStructure.GPIO_Pin   = GPIO_Pin_7;
 	  GPIO_Init(GPIOE, &GPIO_InitStructure);
 }
 
@@ -43,6 +43,6 @@ void IO_Init(void)
   */
 bool IO_BtnDefaultPressed(void)
 {
-  	return !GPIO_ReadInputDataBit(GPIOE, GPIO_Pin_10);  // BUTTON DEFAULT
+  	return !GPIO_ReadInputDataBit(GPIOE, GPIO_Pin_7);  // BUTTON DEFAULT
 }
 /********************************* (C) РОТЕК **********************************/

modules/Makefile

@@ -114,5 +114,6 @@ postbuild: $(BUILDDIR)/$(TARGET).bin
 	@echo "FW CRC address: $(FW_FLASH_CRC)"
 	@echo "Copying to: $(OUTPUTDIR)/$(FW_NAME).bin"
 	@cp $(BUILDDIR)/$(TARGET).bin $(OUTPUTDIR)/$(FW_NAME).bin
+	@$(BUILDDIR)/../../tools/cortex_crc $(OUTPUTDIR)/$(FW_NAME).bin $(FW_FLASH_START) $(FW_FLASH_CRC)
 	
 	

projects/gcc/stm32_flash.ld

@@ -45,7 +45,8 @@ MEMORY
   BOOTLOADER_P1 (rx) : ORIGIN = 0x08000000, LENGTH = 16K
   SETTINGS      (rx) : ORIGIN = 0x08004000, LENGTH = 16K
   BOOTLOADER    (rx) : ORIGIN = 0x08008000, LENGTH = 96K
-  FLASH         (rx) : ORIGIN = 0x08020000, LENGTH = 640K
+  FLASH         (rx) : ORIGIN = 0x08020000, LENGTH = 384K
+  CRC           (rx) : ORIGIN = 0x0807FFFC, LENGTH = 4
   RAM          (xrw) : ORIGIN = 0x20000000, LENGTH = 128K
   MEMORY_B1     (rx) : ORIGIN = 0x10000000, LENGTH = 64K
 }
@@ -126,6 +127,21 @@ SECTIONS
     _edata = .;        /* define a global symbol at data end */
   } >RAM
 
+   .fill LOADADDR(.data) + SIZEOF(.data) :
+  {
+    FILL(0xFFFFFFFF);
+    /* . = ORIGIN(FLASH) + LENGTH(FLASH) - 4 - 1; */
+    . = ORIGIN(CRC) - 1;
+    BYTE(0xFF)
+    /* PROVIDE_HIDDEN (__fini_array_end = .); */
+  } > FLASH
+  .crc :
+  {
+   . = ALIGN(4);
+   KEEP(*(.crc))
+   . = ALIGN(4);
+  }>CRC
+
   /* Uninitialized data section */
   . = ALIGN(4);
   .bss :