Update to latest PSoC Creator

AE9RB · Sep 8, 2013 · 4ea62e1 · 4ea62e1
1 parent 8f5a55e
commit 4ea62e1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/bootloader.cydsn/bootloader.cyprj b/bootloader.cydsn/bootloader.cyprj
@@ -1262,9 +1262,9 @@
 <project_current_processor v="DP8051" />
 <component_generation v="PSoC Creator  2.2 Component Pack 5" />
 <last_selected_tab v="Cypress" />
-<component_dependent_projects_generation v="(69eeda1b-ded5-4da3-a74d-3a98f2d5d4ab , 2.1PR) | (b1a3f413-e018-46a5-a51c-20818b2f118e , 2.2SP1) | (cd381074-8dad-4f43-bb88-7719b3e16126 , 2.1) | (29420278-6fcc-46a7-a651-999ec5c253d2 , 2.1) | (e95576e7-780d-474a-b944-018db0492cc9 , 2.1)" />
+<component_dependent_projects_generation v="(69eeda1b-ded5-4da3-a74d-3a98f2d5d4ab , CP6) | (b1a3f413-e018-46a5-a51c-20818b2f118e , 2.2SP1) | (cd381074-8dad-4f43-bb88-7719b3e16126 , 2.1) | (29420278-6fcc-46a7-a651-999ec5c253d2 , 2.1) | (e95576e7-780d-474a-b944-018db0492cc9 , 2.1)" />
 <WriteAppVersionLastSavedWith v="2.2.0.572" />
-<WriteAppMarketingVersionLastSavedWith v=" 2.2 Service Pack 1" />
+<WriteAppMarketingVersionLastSavedWith v=" 2.2 Component Pack 6" />
 <project_id v="d64ba6b9-11a6-45c2-93ca-29281ffb09d7" />
 <custom_data>
 <CyGuid_7a7929f8-5e3b-4f86-a093-2d4ee6513111 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtProjectCustomData" version="1">

diff --git a/peaberry.cydsn/band.c b/peaberry.cydsn/band.c
@@ -56,7 +56,10 @@ void Band_Main(void) {
             Control_Write(Control_Read() & ~CONTROL_XK);
         else
             Control_Write(Control_Read() | CONTROL_XK);
-
+
+        // Inhibit transmitter as necessary
+        if (i > 0xC866666 && i < 0xDF99999) TX_Inhibit = 1;
+        else TX_Inhibit = 0;
     }
 
 }

diff --git a/peaberry.cydsn/peaberry.cyprj b/peaberry.cydsn/peaberry.cyprj
@@ -1578,9 +1578,9 @@
 <project_current_processor v="DP8051" />
 <component_generation v="PSoC Creator  2.0 Component Pack 2" />
 <last_selected_tab v="Cypress" />
-<component_dependent_projects_generation v="(69eeda1b-ded5-4da3-a74d-3a98f2d5d4ab , 2.1PR) | (b1a3f413-e018-46a5-a51c-20818b2f118e , 2.2SP1) | (cd381074-8dad-4f43-bb88-7719b3e16126 , 2.1) | (29420278-6fcc-46a7-a651-999ec5c253d2 , 2.1) | (e95576e7-780d-474a-b944-018db0492cc9 , 2.1)" />
+<component_dependent_projects_generation v="(69eeda1b-ded5-4da3-a74d-3a98f2d5d4ab , CP6) | (b1a3f413-e018-46a5-a51c-20818b2f118e , 2.2SP1) | (cd381074-8dad-4f43-bb88-7719b3e16126 , 2.1) | (29420278-6fcc-46a7-a651-999ec5c253d2 , 2.1) | (e95576e7-780d-474a-b944-018db0492cc9 , 2.1)" />
 <WriteAppVersionLastSavedWith v="2.2.0.572" />
-<WriteAppMarketingVersionLastSavedWith v=" 2.2 Service Pack 1" />
+<WriteAppMarketingVersionLastSavedWith v=" 2.2 Component Pack 6" />
 <project_id v="36b97fed-f7e3-42cd-899d-fe38406eb7a6" />
 <custom_data>
 <CyGuid_7a7929f8-5e3b-4f86-a093-2d4ee6513111 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtProjectCustomData" version="1">

diff --git a/peaberry.cydsn/peaberry.h b/peaberry.cydsn/peaberry.h
@@ -86,6 +86,7 @@ void Settings_Main(void);
 
 // tx.c
 extern uint8 TX_Request;
+extern uint8 TX_Inhibit;
 void TX_Main(void);
 
 // t1.c

diff --git a/peaberry.cydsn/tx.c b/peaberry.cydsn/tx.c
@@ -18,14 +18,15 @@
 #define TX_LED_BLINK_OFF_MS 50
 
 uint8 TX_Request = 0;
+uint8 TX_Inhibit = 0;
 
 void TX_Main(void) {
     static uint8 state = 0, blink;
     uint8 i;
 
     switch (state) {
         case 0: // receiving
-            if (TX_Request) {
+            if (TX_Request && !TX_Inhibit) {
                 state = 1;
                 Control_Write(Control_Read() & ~CONTROL_RX);
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,6 +86,7 @@ void Settings_Main(void); @@
     // tx.c
     extern uint8 TX_Request;
+    extern uint8 TX_Inhibit;
     void TX_Main(void);
     // t1.c
@@ Expand Down @@