HAPO WS22 / Mbed 2 deprecated HAPO_WS22_Labor3_1

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   mbed

Diff: main.cpp

Revision:
12:bd1417475c5f
Parent:
11:d08f264a6be1
Child:
13:b1d6b2285b13
--- a/main.cpp	Sun Dec 04 14:56:59 2022 +0000
+++ b/main.cpp	Sun Dec 04 15:21:17 2022 +0000
@@ -31,7 +31,7 @@
 DigitalIn   pinS2(A2);
 DigitalIn   pinS3(A3);
 
-BusOut      bLedShield(D10, D11, D12, D13);
+//BusOut      bLedShield(D10, D11, D12, D13);
 
 /* Anschlüsse der Schieberegister */
 DigitalOut  pinSdo(PA_9);
@@ -46,7 +46,7 @@
 *   Defines und Makros                                                       *
 ***************************************************************************/
 #define nTastShort  20      /* Taste 50 Millisekunden gedrückt */    
-#define nTastLong   600     /* Taste 1.5 Sekunden gedrückt */ 
+#define nTastLong   240     /* Taste 0.6 Sekunden gedrückt */ 
 #define nCircleTime 2500    /* Laufzeit der Main in us */
 
 #define nSegA           0x01
@@ -175,7 +175,7 @@
 
 /* Bitmuster */
 const byte abZiffer[] = {nZiffer0, nZiffer1, nZiffer2, nZiffer3, nZiffer4, nZiffer5, nZiffer6, nZiffer7, nZiffer8, nZiffer9, nZifferA, nZifferB, nZifferC, nZifferD, nZifferE, nZifferF, nZifferOff};
-const byte abBargraph[] = {~Bit0, ~(Bit0|Bit1), ~(Bit0|Bit1|Bit2), ~(Bit0|Bit1|Bit2|Bit3), 0x0f};
+//const byte abBargraph[] = {~Bit0, ~(Bit0|Bit1), ~(Bit0|Bit1|Bit2), ~(Bit0|Bit1|Bit2|Bit3), 0x0f};
 
 
 void vShiftLoad(word wLoad){
@@ -349,7 +349,7 @@
                 bTimeLong = 1;
                 if(wVorgabeWert <=100) wVorgabeWert = 0;
                 else wVorgabeWert = wVorgabeWert - 100;
-                bS2Timer = bS2Timer - 40;
+                bS3Timer = bS3Timer - 40;
                 }
             bS3Timer++;
             }
@@ -419,16 +419,10 @@
         nDiffWert = wVorgabeWert - wPotiWert;
         switch(bMainState) {
             case enSchwellenwert:
-                /*
-                if(wVorgabeWert>3300){
-                    wVorgabeWert=3300;
-                }
-                if(wVorgabeWert<0){
-                    wVorgabeWert=0;
-                }
-                */
+                pinBeep = 1;
                 break;
             case enPotiAnzeige:
+                pinBeep = 1;
                 break;
             case enVergleich:
                 if(nDiffWert<0) pinBeep=0;