Преглед изворни кода

change 6702/6706/6708 -> 6703/6707/6709

balbekova пре 5 година
родитељ
комит
c62baed8bb

+ 8 - 8
.cproject

@@ -73,32 +73,32 @@
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="HARDWARE=bt6702 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+			<target name="HARDWARE=bt6703 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
-				<buildTarget>HARDWARE=bt6702 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A</buildTarget>
+				<buildTarget>HARDWARE=bt6703 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="HARDWARE=bt6706 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+			<target name="HARDWARE=bt6707 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments/>
-				<buildTarget>HARDWARE=bt6706 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A</buildTarget>
+				<buildTarget>HARDWARE=bt6707 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="debug_bt_6702" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+			<target name="debug_bt_6703" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
-				<buildTarget>HARDWARE=bt6702 VERBOSE=1 DEBUG=1 PRINTF=custom MAC=EC-4C-4D-00-00-0A</buildTarget>
+				<buildTarget>HARDWARE=bt6703 VERBOSE=1 DEBUG=1 PRINTF=custom MAC=EC-4C-4D-00-00-0A</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="HARDWARE=bt6708 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+			<target name="HARDWARE=bt6709 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments/>
-				<buildTarget>HARDWARE=bt6708 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A</buildTarget>
+				<buildTarget>HARDWARE=bt6709 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-00-0A</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>

+ 9 - 1
.vscode/settings.json

@@ -11,6 +11,14 @@
         "trap_params.h": "c",
         "parameters.h": "c",
         "netconf.h": "c",
-        "common_config.h": "c"
+        "common_config.h": "c",
+        "functional": "c",
+        "ratio": "c",
+        "system_error": "c",
+        "array": "c",
+        "tuple": "c",
+        "type_traits": "c",
+        "utility": "c",
+        "chrono": "c"
     }
 }

+ 2 - 2
Makefile

@@ -7,7 +7,7 @@ all: config $(TARGETS)
 
 CFLAGS += -DHARDWARE_$(HARDWARE)
 
-bt6702:
+bt6703:
 	@$(MAKE) HARDWARE=$@
 
 $(TARGETS):
@@ -25,7 +25,7 @@ openocd_ups:
 	$(shell openocd -f projects/gcc/configs/stm32f4discovery.cfg)
 
 gdb:
-	$(shell arm-none-eabi-gdb build/stm32bt6702/stm32bt6702.elf)
+	$(shell arm-none-eabi-gdb build/stm32bt6703/stm32bt6703.elf)
 
 reset:
 	st-flash --reset read /dev/null 0x8000000 1

+ 2 - 2
config/board_bt6707.h

@@ -1,5 +1,5 @@
 /*
- * board_bt6706.h
+ * board_bt6707.h
  *
  *  Created on: 08.11.2017
  *      Author: balbekova
@@ -64,4 +64,4 @@ WDG_PIN(X)
 #define MAX_IRQ_HANDLERS 4
 
 
-#endif /* BOARD_BT6706_H_ */
+#endif /* BOARD_BT6707_H_ */

+ 1 - 1
modules/Ethernet/private_mib_bt6707.c

@@ -124,7 +124,7 @@ static const struct snmp_node* const signals_nodes[] = {
 };
 static const struct snmp_tree_node signals_node = SNMP_CREATE_TREE_NODE(1, signals_nodes);
 
-// bt_6702 .1.3.6.1.4.1.41752.911.7
+// bt_6707 .1.3.6.1.4.1.41752.911.7
 static const struct snmp_node* const bt6707_nodes[] = {
   &signals_node.node
 };

+ 1 - 1
modules/Ethernet/private_mib_bt6709.c

@@ -227,7 +227,7 @@ static const struct snmp_node* const signals_nodes[] = {
 };
 static const struct snmp_tree_node signals_node = SNMP_CREATE_TREE_NODE(1, signals_nodes);
 
-// bt_6702 .1.3.6.1.4.1.41752.911.8
+// bt_6703 .1.3.6.1.4.1.41752.911.8
 static const struct snmp_node* const bt6709_nodes[] = {
   &signals_node.node
 };

+ 3 - 3
projects/gcc/tools/version.sh

@@ -4,13 +4,13 @@ INCLUDES=$2
 BIN=tmp
 
 
-if [ "$1" = "bt6702" ];
+if [ "$1" = "bt6703" ];
 then
 SRC=$'#define HARDWARE_BT6703 1\r\n#include <stdio.h>\r\n#include "common_config.h"\r\n'
-elif [ "$1" = "bt6706" ];
+elif [ "$1" = "bt6707" ];
 then
 SRC=$'#define HARDWARE_BT6707 1\r\n#include <stdio.h>\r\n#include "common_config.h"\r\n'
-elif [ "$1" = "bt6708" ];
+elif [ "$1" = "bt6709" ];
 then
 SRC=$'#define HARDWARE_BT6709 1\r\n#include <stdio.h>\r\n#include "common_config.h"\r\n'
 fi