testing new smeter

Author: stdevPavelmc

fa-lcd.ino

@@ -11,68 +11,6 @@
 
 
 #ifdef LCD
- // defining the chars for the Smeter
- byte bar[8] = {
- B11111,
- B11111,
- B11111,
- B10001,
- B11111,
- B11111,
- B11111
- };
-
- byte s1[8] = {
- B11111,
- B10011,
- B11011,
- B11011,
- B11011,
- B10001,
- B11111
- };
-
- byte s3[8] = {
- B11111,
- B10001,
- B11101,
- B10001,
- B11101,
- B10001,
- B11111
- };
-
- byte s5[8] = {
- B11111,
- B10001,
- B10111,
- B10001,
- B11101,
- B10001,
- B11111
- };
-
- byte s7[8] = {
- B11111,
- B10001,
- B11101,
- B11011,
- B11011,
- B11011,
- B11111
- };
-
- byte s9[8] = {
- B11111,
- B10001,
- B10101,
- B10001,
- B11101,
- B11101,
- B11111
- };
-
-
  #ifdef ABUT
  // check some values don't go below zero
  void belowZero(long *value) {
@@ -544,77 +482,117 @@
  }
 
 
- // do you have SMETER
+ // do you have SMETER?
  #ifdef SMETER
+ // defining the chars for the Smeter
+ /** As per the LCD datasheet:
+ * Each char is a matrix of 8x8
+ * but internally they are:
+ * > 5 bits per line (lower 5 bits)
+ * > 7 lines
+ * > the underscore line
+ ***/
+
+ byte half[8] = {
+ B11000,
+ B11000,
+ B11000,
+ B11000,
+ B11000,
+ B11000,
+ B11000,
+ B00000
+ };
+
+ byte full[8] = {
+ B11011,
+ B11011,
+ B11011,
+ B11011,
+ B11011,
+ B11011,
+ B11011,
+ B00000
+ };
+
+
  // show the bar graph for the RX or TX modes
  void showBarGraph() {
  // we are working on a 2x16 and we have 13 bars to show (0-12)
+ // as we are on a double line we have 0-24 in value
  unsigned long ave = 0, i;
- volatile static byte barMax = 0;
+ volatile static byte barMax = 24;
+ byte fb, hb;
 
- // find the average
+ // pack for average
  for (i=0; i<BARGRAPH_SAMPLES; i++) ave += pep[i];
+ // reduce to mean
  ave /= BARGRAPH_SAMPLES;
 
  // set the smeter reading on the global scope for CAT readings
  sMeter = ave;
 
- // scale it down to 0-12 from word
- byte local = map(ave, 0, 1023, 0, 12);
+ // scale it down to 0-24 from word
+ byte local = map(ave, 0, 1023, 0, 24);
 
  // printing only the needed part of the bar, if growing or shrinking
  // if the same no action is required, remember we have to minimize the
  // writes to the LCD to minimize QRM
 
- // if we get a barReDraw = true; then reset to redrawn the entire bar
+ // check for the bar redraw
  if (barReDraw) {
  barMax = 0;
- // forcing the write of one line
+ // always show at least a half bar
  if (local == 0) local = 1;
  }
 
  // growing bar: print the difference
  if (local > barMax) {
- // LCD position & print the bars
- lcd.setCursor(3 + barMax, 1);
-
- // write it
- for (i = barMax; i <= local; i++) {
- switch (i) {
- case 0:
- lcd.write(byte(1));
- break;
- case 2:
- lcd.write(byte(2));
- break;
- case 4:
- lcd.write(byte(3));
- break;
- case 6:
- lcd.write(byte(4));
- break;
- case 8:
- lcd.write(byte(5));
- break;
- default:
- lcd.write(byte(0));
- break;
- }
- }
-
- // second part of the erase, preparing for the blanking
- if (barReDraw) barMax = 12;
+ // how many bars
+ fb = (local - barMax) / 2;
+ hb = (local - barMax) % 2;
+
+ // LCD position
+ lcd.setCursor(3 + (barMax/2), 1);
+
+ // full bars
+ if (fb > 0)
+ for (word i = 0; i < fb; i++)
+ lcd.write(byte(0)); // full bar
+
+ // half bars
+ // must be always just one half bar
+ if (hb > 0)
+ lcd.write(byte(1)); // half bar
  }
 
- // shrinking bar: erase the old ones print spaces to erase just the diff
+ // shrinking bar: erase the old ones
+ // just print spaces to erase just the diff
  if (barMax > local) {
- lcd.setCursor(3 + barMax, 1);
- spaces(barMax - local);
+ // base position, lower value
+ fb = local / 2; // base position
+ hb = local % 2;
+
+ // fail safe we always want a single bar even if zero
+ if (local = 0) hb = 1;
+
+ // LCD position
+ lcd.setCursor(3 + fb, 1);
+
+ // half bars
+ if (hb > 0) {
+ // must be always just one half bar
+ lcd.write(byte(1)); // half bar
+ }
+
+ // erase the next resting bars
+ spaces(((barMax + 1) - local) / 2);
  }
 
  // put the var for the next iteration
  barMax = local;
- //reset the redraw flag
+
+ // reset the bar redraw flag
  barReDraw = false;
  }
 

fc_cat.ino

@@ -81,8 +81,7 @@
 
  // get the s meter status to CAT
  byte catGetSMeter() {
- // returns a byte in wich the s-meter is scaled to 4 bits (15)
- // it's scaled already this our code
+ // returns a byte in wich the s-meter is scaled to 4 bits (1023 > 15)
  #ifdef SMETER
  return sMeter >> 6 ;
  #else

z-end.ino

@@ -32,13 +32,10 @@ void setup() {
  #ifdef LCD
  #ifdef SMETER
  // LCD init, create the custom chars first
- lcd.createChar(0, bar);
- lcd.createChar(1, s1);
- lcd.createChar(2, s3);
- lcd.createChar(3, s5);
- lcd.createChar(4, s7);
- lcd.createChar(5, s9);
+ lcd.createChar(0, full);
+ lcd.createChar(1, half);
  #endif // smeter
+
  // now load the library
  lcd.begin(16, 2);
  lcd.clear();