friday commit

3xThermo1xHT/idiBusFiles/IDIBUS_IMPL_Custom.c

@@ -91,12 +91,9 @@ ISR(TIMER2_COMPA_vect) {
 		
 		case GEN_Send: {		
 			CurrentState = GEN_Wait;
-			// À ÍÀÄÎ ËÈ???????????????
 			TimerTime = 100; // Îãðàíè÷åíèå ïî âðåìåíè - 150 ìñ
 			
-			//_delay_ms(10);
 			STMReset();
-			//_delay_ms(10);
 			
 			if ((PINC)&(1<<PORTC3)) {  // STM ãîòîâ ê ïðèåìó
 				_delay_ms(10);
@@ -104,7 +101,6 @@ ISR(TIMER2_COMPA_vect) {
 					SPI_MasterTransmit(data_to_send[i]);
 				}
 			}
-			
 			TimerStartTick;
 			break;
 		}

STM/Debug/makefile

@@ -60,8 +60,8 @@ all: main-build
 main-build: STM_gen.elf secondary-outputs
 
 # Tool invocations
-STM_gen.elf STM_gen.map: $(OBJS) $(USER_OBJS) C:\Users\Katya\Desktop\29\ 09\STM32F407VETX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS)
+STM_gen.elf STM_gen.map: $(OBJS) $(USER_OBJS) C:\Users\Katya\Desktop\GEN1\STM\STM32F407VETX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS)
-	arm-none-eabi-gcc -o "STM_gen.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"C:\Users\Katya\Desktop\29 09\STM32F407VETX_FLASH.ld" --specs=nosys.specs -Wl,-Map="STM_gen.map" -Wl,--gc-sections -static --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Wl,--start-group -lc -lm -Wl,--end-group
+	arm-none-eabi-gcc -o "STM_gen.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"C:\Users\Katya\Desktop\GEN1\STM\STM32F407VETX_FLASH.ld" --specs=nosys.specs -Wl,-Map="STM_gen.map" -Wl,--gc-sections -static --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Wl,--start-group -lc -lm -Wl,--end-group
 	@echo 'Finished building target: $@'
 	@echo ' '