Allow reset of power and freq by 0

Author: gitandy

src/hamcc/hamcc.py

@@ -442,11 +442,19 @@ def evaluate_numeric(self, seq: str) -> str:
             self.__time__ = t
             self.__cur_qso__['TIME_ON'] = self.__time__
         elif seq.endswith('f'):
-            self.__freq__ = f'{float(seq[:-1]) / 1000:0.6f}'.rstrip('0').rstrip('.')
-            self.__cur_qso__['FREQ'] = self.__freq__
+            if seq[:-1] != '0':
+                self.__freq__ = f'{float(seq[:-1]) / 1000:0.6f}'.rstrip('0').rstrip('.')
+                self.__cur_qso__['FREQ'] = self.__freq__
+            else:
+                self.__freq__ = ''
+                self.__cur_qso__.pop('FREQ')
         elif seq.endswith('p'):
-            self.__pwr__ = seq[:-1]
-            self.__cur_qso__['TX_POWER'] = self.__pwr__
+            if seq[:-1] != '0':
+                self.__pwr__ = seq[:-1]
+                self.__cur_qso__['TX_POWER'] = self.__pwr__
+            else:
+                self.__pwr__ = ''
+                self.__cur_qso__.pop('TX_POWER')
         else:
             return 'Error: Unknown number format'
         return ''

test/test_evaluate.py

@@ -26,11 +26,15 @@ def test_020_numeric(self):
 
         self.assertEqual('', self.cc.evaluate('12p'))
         self.assertEqual('12', self.cc.current_qso['TX_POWER'])
+        self.assertEqual('', self.cc.evaluate('0p'))
+        self.assertNotIn('TX_POWER', self.cc.current_qso)
 
         self.assertEqual('', self.cc.evaluate('14312f'))
         self.assertEqual('14.312', self.cc.current_qso['FREQ'])
         self.assertEqual('', self.cc.evaluate('145312.5f'))
         self.assertEqual('145.3125', self.cc.current_qso['FREQ'])
+        self.assertEqual('', self.cc.evaluate('0f'))
+        self.assertNotIn('FREQ', self.cc.current_qso)
 
     def test_022_numeric_time(self):
         self.assertEqual('Error: Wrong time format', self.cc.evaluate('1t'))