Просмотр исходного кода

comment: first char "!" or ";"

vad7 2 лет назад
Родитель
Сommit
91698abf86
3 измененных файлов с 13 добавлено и 7 удалено
  1. 6 0
      Distr/nrf24batch/Kitchen Vent Dimmer.txt
  2. 6 6
      application.fam
  3. 1 1
      nrf24batch.c

+ 6 - 0
Distr/nrf24batch/Kitchen Vent Dimmer.txt

@@ -71,6 +71,11 @@ W: SSR2_PulseWidth,us*2=,32,WROM2
 R: DamperOpenTime=34
 W: DamperOpenTime=,34
 
+!R: FanCookSpIdxDnKey=35
+!W: FanCookSpIdxDnKey=,35
+!R: FanCookSpIdxUpKey=36
+!W: FanCookSpIdxUpKey=,36
+
 R: IRRemotes=35
 W: IRRemotes=,35
 
@@ -150,6 +155,7 @@ WBatch: Init(Cook2spd,Lamp-F2.2): RxAddr=0xC1;Ch=122;CO2 level={870,930,1000};Fa
 WBatch: IRRemotes clear: IRRemotes=0
 WBatch: IRRemotes 1 kitchen: IRRemotes=1;IRRemotesHash={0x6DA5,0xFCA5,0x7CA5,0xB425,0x3425,0x1625,0x8525}
 WBatch: Fans Speeds: Fan speeds=3;FanSpeed={10,12,16};FanCook speeds=3;FanCookSpeed={12,16,32}
+WBatch: FanCooker Down/Up key idx: FanCookSpIdxDnKey=2;FanCookSpIdxUpKey=3
 WBatch: LED Warning: _LED Warning=0x10
 WBatch: OSCCAL: _OSCCAL=146
 WBatch: CO2 Level: CO2 level={750,850,1000}

+ 6 - 6
application.fam

@@ -1,13 +1,13 @@
 App(
-    appid="nrf24_scanner",
-    name="[NRF24] Scanner",
+    appid="nrf24_batch",
+    name="[NRF24] Batch",
     apptype=FlipperAppType.EXTERNAL,
-    entry_point="nrf24scan_app",
-    cdefines=["APP_NRF24SCAN"],
+    entry_point="nrf24batch_app",
+    cdefines=["APP_NRF24BATCH"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=60,
-    fap_icon="nrf24scan_10px.png",
+    fap_icon="nrf24batch_10px.png",
     fap_category="GPIO",
     fap_private_libs=[
         Lib(
@@ -17,4 +17,4 @@ App(
             ],
         ),
     ],
-)
+)

+ 1 - 1
nrf24batch.c

@@ -850,7 +850,7 @@ static uint8_t load_settings_file() {
 	NRF_INITED = false;
 	while(stream_read_line(file_stream, str)) {
 		char *p = (char*)furi_string_get_cstr(str);
-		if(*p <= ' ') continue;
+		if(*p <= '!' || *p == ';') continue;
 		//char* delim_eq = strchr(p, '=');
 		char *delim_col = strchr(p, ':');
 		if(delim_col == NULL) { // Constant found - no ':'